Talos edit, remove guns, change sprite RO cap/uniform (#111)

* обновление корпсам улучшенный дефиб, замена пери+ квиклот+ на базовые аналоги, переработка наполнения поучей и поясов * фикс лодаута пофиксил ошибку в лодауте фк и корпса * Переделал говнокод * Update defibrillator.dm Signed-off-by: Kirill <[email protected]> * исправления по ревью * исправление advanced у перчаток * Обновление корпсов №2 баф инжекторов, баф инжектор поуча * корректировка цен * поднял цены на инжекторы * Обновочки по талосу Добавил таноководов и их игрушки, расширил зону тада * Фикс формата * все навалом Удалил лишние файлы, добавил все вендоры на Талос, поменял спрайты шмотью РО, снизил количество гранат, убрал пушки маров из вендора, добавил артиллерию в персональные поинты, убрал боеприпасы убранных пушек из карго * Update marine_vending.dm Signed-off-by: Kirill <[email protected]> * вернул ап и хп патроны Signed-off-by: Kirill <[email protected]> * Update marine_vending.dm Signed-off-by: Kirill <[email protected]> * Update marine_vending.dm Signed-off-by: Kirill <[email protected]> * Update marine_vending.dm Signed-off-by: Kirill <[email protected]> * Update marine_vending.dm Signed-off-by: Kirill <[email protected]> --------- Signed-off-by: Kirill <[email protected]>
PMC-Unga-Marines · Aug 24, 2024 · 4bb3211 · 4bb3211
1 parent 4aee141
commit 4bb3211
Show file tree

Hide file tree

Showing 14 changed files with 206 additions and 135 deletions.
diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm
diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
@@ -65,6 +65,9 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list(
 	/obj/item/explosive/grenade/sticky = list(CAT_MARINE, "M40 adhesive charge grenade", 2, "orange3"),
 	/obj/item/explosive/grenade/incendiary = list(CAT_MARINE, "M40 HIDP incendiary grenade", 2, "orange3"),
 	/obj/item/explosive/grenade/m15 = list(CAT_MARINE, "M15 fragmentation grenade", 3, "orange3"),
+	/obj/structure/closet/crate/mortar_ammo/mortar_kit = list(CAT_MARINE, "Mortar kit", 35, "orange3"),
+	/obj/structure/closet/crate/mortar_ammo/howitzer_kit = list(CAT_MARINE, "Howitzer kit", 35, "orange3"),
+	/obj/structure/closet/crate/mortar_ammo/mlrs_kit = list(CAT_MARINE, "MLRS kit", 35, "orange3"),
 	/obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 5, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjecto", 10, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/synaptizine	 = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"),

diff --git a/code/game/objects/machinery/mortar.dm b/code/game/objects/machinery/mortar.dm
@@ -812,6 +812,21 @@
 	new /obj/item/encryptionkey/cas(src)
 	new /obj/item/hud_tablet/artillery(src)
 
+/obj/structure/closet/crate/mortar_ammo/mlrs_kit
+	name = "\improper Катюша kit"
+	desc = "Ящик с РСЗО Катюшка и запасом боеприпасов к ней. Играй, славянка!"
+
+/obj/structure/closet/crate/mortar_ammo/mlrs_kit/PopulateContents()
+	new /obj/item/mortar_kit/mlrs(src)
+	new /obj/item/storage/box/mlrs_rockets(src)
+	new /obj/item/storage/box/mlrs_rockets(src)
+	new /obj/item/encryptionkey/engi(src)
+	new /obj/item/encryptionkey/engi(src)
+	new /obj/item/binoculars/tactical/range(src)
+	new /obj/item/encryptionkey/cas(src)
+	new /obj/item/encryptionkey/cas(src)
+	new /obj/item/encryptionkey/cas(src)
+	new /obj/item/hud_tablet/artillery(src)
 
 /obj/structure/closet/crate/mortar_ammo/howitzer_kit
 	name = "\improper TA-100Y howitzer kit"

diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm
@@ -14,39 +14,25 @@
 			/obj/item/ammo_magazine/rifle/standard_assaultrifle = -1,
 			/obj/item/ammo_magazine/rifle/standard_assaultrifle/ap = -1,
 			/obj/item/ammo_magazine/rifle/standard_assaultrifle/hp = -1,
-			/obj/item/weapon/gun/rifle/standard_carbine = -1,
-			/obj/item/ammo_magazine/rifle/standard_carbine = -1,
-			/obj/item/ammo_magazine/rifle/standard_carbine/ap = -1,
-			/obj/item/ammo_magazine/rifle/standard_carbine/hp = -1,
-			/obj/item/weapon/gun/rifle/standard_skirmishrifle = -1,
-			/obj/item/ammo_magazine/rifle/standard_skirmishrifle = -1,
-			/obj/item/ammo_magazine/rifle/standard_skirmishrifle/ap = -1,
-			/obj/item/ammo_magazine/rifle/standard_skirmishrifle/hp = -1,
-			/obj/item/weapon/gun/rifle/tx11 = -1,
-			/obj/item/ammo_magazine/rifle/tx11 = -1,
 			/obj/item/weapon/gun/shotgun/pump/lever/repeater = -1,
 			/obj/item/ammo_magazine/packet/p4570 = -1,
 		),
 		"SMGs" = list(
-			/obj/item/weapon/gun/smg/standard_smg = -1,
-			/obj/item/ammo_magazine/smg/standard_smg = -1,
-			/obj/item/weapon/gun/smg/standard_machinepistol = 5,
-			/obj/item/ammo_magazine/smg/standard_machinepistol = -1,
-		),
+			/obj/item/weapon/gun/smg/vector = -1,
+			/obj/item/ammo_magazine/smg/vector = -1,
+			/obj/item/ammo_magazine/smg/vector/ap = -1,
+			/obj/item/ammo_magazine/smg/vector/hp = -1,
+),
 		"Marksman" = list(
 			/obj/item/weapon/gun/rifle/standard_dmr = -1,
 			/obj/item/ammo_magazine/rifle/standard_dmr = -1,
-			/obj/item/weapon/gun/rifle/standard_br = -1,
-			/obj/item/ammo_magazine/rifle/standard_br = -1,
 			/obj/item/weapon/gun/rifle/chambered = -1,
 			/obj/item/ammo_magazine/rifle/chamberedrifle = -1,
 			/obj/item/weapon/gun/shotgun/pump/bolt = -1,
 			/obj/item/ammo_magazine/rifle/boltclip = -1,
 			/obj/item/ammo_magazine/rifle/bolt = -1,
 			/obj/item/weapon/gun/shotgun/double/martini = -1,
 			/obj/item/ammo_magazine/rifle/martini = -1,
-			/obj/item/weapon/gun/revolver/standard_revolver/coltrifle = -1,
-			/obj/item/ammo_magazine/revolver/rifle = -1,
 		),
 		"Shotgun" = list(
 			/obj/item/weapon/gun/shotgun/pump/t35 = -1,
@@ -62,8 +48,6 @@
 			/obj/item/storage/holster/belt/ts34/full = 5,
 		),
 		"Machinegun" = list(
-			/obj/item/weapon/gun/rifle/standard_lmg = -1,
-			/obj/item/ammo_magazine/standard_lmg = -1,
 			/obj/item/weapon/gun/rifle/standard_gpmg = -1,
 			/obj/item/ammo_magazine/standard_gpmg = -1,
 			/obj/item/weapon/gun/standard_mmg = 5,
@@ -85,14 +69,8 @@
 			/obj/item/weapon/combat_knife/harvester = 12,
 		),
 		"Sidearm" = list(
-			/obj/item/weapon/gun/pistol/standard_pistol = -1,
-			/obj/item/ammo_magazine/pistol/standard_pistol = -1,
-			/obj/item/weapon/gun/pistol/standard_heavypistol = -1,
-			/obj/item/ammo_magazine/pistol/standard_heavypistol = -1,
 			/obj/item/weapon/gun/revolver/standard_revolver = 5,
 			/obj/item/ammo_magazine/revolver/standard_revolver = -1,
-			/obj/item/weapon/gun/revolver/standard_magnum = 5,
-			/obj/item/ammo_magazine/revolver/standard_magnum = -1,
 			/obj/item/storage/box/t500case = 10,
 			/obj/item/ammo_magazine/revolver/t500 = -1,
 			/obj/item/weapon/gun/pistol/standard_pocketpistol = -1,
@@ -112,18 +90,18 @@
 			/obj/item/ammo_magazine/rifle/tx54/incendiary = 4,
 			/obj/item/ammo_magazine/rifle/tx54/smoke = 4,
 			/obj/item/ammo_magazine/rifle/tx54/smoke/tangle = 2,
-			/obj/item/explosive/grenade = 50,
-			/obj/item/explosive/grenade/m15 = 10,
-			/obj/item/explosive/grenade/sticky = 25,
-			/obj/item/explosive/grenade/sticky/trailblazer = 75,
-			/obj/item/explosive/grenade/incendiary = 50,
-			/obj/item/explosive/grenade/smokebomb = 25,
-			/obj/item/explosive/grenade/smokebomb/cloak = 25,
-			/obj/item/explosive/grenade/sticky/cloaker = 25,
-			/obj/item/explosive/grenade/smokebomb/drain = 25,
-			/obj/item/explosive/grenade/mirage = 100,
-			/obj/item/storage/box/m94 = 200,
-			/obj/item/storage/box/m94/cas = 30,
+			/obj/item/explosive/grenade = 20,
+			/obj/item/explosive/grenade/m15 = 15,
+			/obj/item/explosive/grenade/sticky = 5,
+			/obj/item/explosive/grenade/sticky/trailblazer = 5,
+			/obj/item/explosive/grenade/incendiary = 20,
+			/obj/item/explosive/grenade/smokebomb = 10,
+			/obj/item/explosive/grenade/smokebomb/cloak = 5,
+			/obj/item/explosive/grenade/sticky/cloaker = 5,
+			/obj/item/explosive/grenade/smokebomb/drain = 5,
+			/obj/item/explosive/grenade/mirage = 10,
+			/obj/item/storage/box/m94 = -1,
+			/obj/item/storage/box/m94/cas = -1,
 		),
 		"Specialized" = list(
 			/obj/item/weapon/gun/rifle/pepperball = 4,
@@ -138,8 +116,6 @@
 			/obj/item/mortal_shell/knee = 40,
 		),
 		"Heavy Weapons" = list(
-			/obj/structure/closet/crate/mortar_ammo/mortar_kit = 1,
-			/obj/structure/closet/crate/mortar_ammo/howitzer_kit = 1,
 			/obj/item/storage/box/crate/sentry = 4,
 			/obj/item/storage/box/tl102 = 1,
 			/obj/item/weapon/gun/heavymachinegun = 1,
@@ -176,27 +152,22 @@
 			/obj/item/ammo_magazine/rifle/pepperball/pepperball_mini = -1,
 			/obj/item/attachable/stock/t76 = -1,
 			/obj/item/attachable/flamer_nozzle = -1,
-			/obj/item/attachable/flamer_nozzle/wide = -1,
 			/obj/item/attachable/flamer_nozzle/long = -1,
 		),
 		"Boxes" = list(
 			/obj/item/cell/lasgun/lasrifle = -1,
 			/obj/item/ammo_magazine/packet/p9mm = -1,
 			/obj/item/ammo_magazine/packet/p9mmap = -1,
-			/obj/item/ammo_magazine/packet/p9mmhp = -1,
 			/obj/item/ammo_magazine/packet/acp = -1,
 			/obj/item/ammo_magazine/packet/pthreeightyacp = -1,
 			/obj/item/ammo_magazine/packet/magnum = -1,
-			/obj/item/ammo_magazine/packet/standard_magnum = -1,
 			/obj/item/ammo_magazine/packet/t500 = -1,
 			/obj/item/ammo_magazine/packet/t500/qk = -1,
 			/obj/item/ammo_magazine/packet/p10x20mm = -1,
 			/obj/item/ammo_magazine/packet/p10x24mm = -1,
 			/obj/item/ammo_magazine/packet/p10x24mm/ap = -1,
 			/obj/item/ammo_magazine/packet/p10x24mm/hp = -1,
 			/obj/item/ammo_magazine/packet/p10x25mm = -1,
-			/obj/item/ammo_magazine/packet/p10x25mm/ap = -1,
-			/obj/item/ammo_magazine/packet/p10x25mm/hp = -1,
 			/obj/item/ammo_magazine/packet/p10x26mm = -1,
 			/obj/item/ammo_magazine/packet/p10x265mm = -1,
 			/obj/item/ammo_magazine/packet/p10x27mm = -1,
@@ -247,16 +218,6 @@
 			/obj/item/ammo_magazine/rifle/standard_assaultrifle = -1,
 			/obj/item/ammo_magazine/rifle/standard_assaultrifle/ap = -1,
 			/obj/item/ammo_magazine/rifle/standard_assaultrifle/hp = -1,
-			/obj/item/weapon/gun/rifle/standard_carbine = -1,
-			/obj/item/ammo_magazine/rifle/standard_carbine = -1,
-			/obj/item/ammo_magazine/rifle/standard_carbine/ap = -1,
-			/obj/item/ammo_magazine/rifle/standard_carbine/hp = -1,
-			/obj/item/weapon/gun/rifle/standard_skirmishrifle = -1,
-			/obj/item/ammo_magazine/rifle/standard_skirmishrifle = -1,
-			/obj/item/ammo_magazine/rifle/standard_skirmishrifle/ap = -1,
-			/obj/item/ammo_magazine/rifle/standard_skirmishrifle/hp = -1,
-			/obj/item/weapon/gun/rifle/tx11 = -1,
-			/obj/item/ammo_magazine/rifle/tx11 = -1,
 			/obj/item/weapon/gun/shotgun/pump/lever/repeater = -1,
 			/obj/item/ammo_magazine/packet/p4570 = -1,
 		),
@@ -270,16 +231,14 @@
 			/obj/item/weapon/gun/energy/lasgun/lasrifle/tesla = 2,
 		),
 		"SMGs" = list(
-			/obj/item/weapon/gun/smg/standard_smg = -1,
-			/obj/item/ammo_magazine/smg/standard_smg = -1,
-			/obj/item/weapon/gun/smg/standard_machinepistol = 5,
-			/obj/item/ammo_magazine/smg/standard_machinepistol = -1,
+			/obj/item/weapon/gun/smg/vector = -1,
+			/obj/item/ammo_magazine/smg/vector = -1,
+			/obj/item/ammo_magazine/smg/vector/ap = -1,
+			/obj/item/ammo_magazine/smg/vector/hp = -1,
 		),
 		"Marksman" = list(
 			/obj/item/weapon/gun/rifle/standard_dmr = -1,
 			/obj/item/ammo_magazine/rifle/standard_dmr = -1,
-			/obj/item/weapon/gun/rifle/standard_br = -1,
-			/obj/item/ammo_magazine/rifle/standard_br = -1,
 			/obj/item/weapon/gun/rifle/chambered = -1,
 			/obj/item/ammo_magazine/rifle/chamberedrifle = -1,
 			/obj/item/weapon/gun/shotgun/pump/bolt = -1,
@@ -303,8 +262,6 @@
 			/obj/item/storage/holster/belt/ts34/full = 5,
 		),
 		"Machinegun" = list(
-			/obj/item/weapon/gun/rifle/standard_lmg = -1,
-			/obj/item/ammo_magazine/standard_lmg = -1,
 			/obj/item/weapon/gun/rifle/standard_gpmg = -1,
 			/obj/item/ammo_magazine/standard_gpmg = -1,
 			/obj/item/weapon/gun/standard_mmg = 5,
@@ -327,14 +284,8 @@
 			/obj/item/weapon/combat_knife/harvester = 12,
 		),
 		"Sidearm" = list(
-			/obj/item/weapon/gun/pistol/standard_pistol = -1,
-			/obj/item/ammo_magazine/pistol/standard_pistol = -1,
-			/obj/item/weapon/gun/pistol/standard_heavypistol = -1,
-			/obj/item/ammo_magazine/pistol/standard_heavypistol = -1,
 			/obj/item/weapon/gun/revolver/standard_revolver = 5,
 			/obj/item/ammo_magazine/revolver/standard_revolver = -1,
-			/obj/item/weapon/gun/revolver/standard_magnum = 5,
-			/obj/item/ammo_magazine/revolver/standard_magnum = -1,
 			/obj/item/storage/box/t500case = 10,
 			/obj/item/ammo_magazine/revolver/t500 = -1,
 			/obj/item/weapon/gun/pistol/standard_pocketpistol = -1,
@@ -413,7 +364,6 @@
 			/obj/item/ammo_magazine/rifle/pepperball/pepperball_mini = -1,
 			/obj/item/attachable/stock/t76 = -1,
 			/obj/item/attachable/flamer_nozzle = -1,
-			/obj/item/attachable/flamer_nozzle/wide = -1,
 			/obj/item/attachable/flamer_nozzle/long = -1,
 		),
 		"Boxes" = list(
@@ -423,16 +373,11 @@
 			/obj/item/ammo_magazine/packet/acp = -1,
 			/obj/item/ammo_magazine/packet/pthreeightyacp = -1,
 			/obj/item/ammo_magazine/packet/magnum = -1,
-			/obj/item/ammo_magazine/packet/standard_magnum = -1,
 			/obj/item/ammo_magazine/packet/t500 = -1,
 			/obj/item/ammo_magazine/packet/t500/qk = -1,
 			/obj/item/ammo_magazine/packet/p10x20mm = -1,
 			/obj/item/ammo_magazine/packet/p10x24mm = -1,
-			/obj/item/ammo_magazine/packet/p10x24mm/ap = -1,
-			/obj/item/ammo_magazine/packet/p10x24mm/hp = -1,
 			/obj/item/ammo_magazine/packet/p10x25mm = -1,
-			/obj/item/ammo_magazine/packet/p10x25mm/ap = -1,
-			/obj/item/ammo_magazine/packet/p10x25mm/hp = -1,
 			/obj/item/ammo_magazine/packet/p10x26mm = -1,
 			/obj/item/ammo_magazine/packet/p10x265mm = -1,
 			/obj/item/ammo_magazine/packet/p10x27mm = -1,
@@ -484,18 +429,6 @@
 			/obj/item/ammo_magazine/rifle/standard_assaultrifle = -1,
 			/obj/item/ammo_magazine/rifle/standard_assaultrifle/ap = -1,
 			/obj/item/ammo_magazine/rifle/standard_assaultrifle/hp = -1,
-			/obj/item/weapon/gun/rifle/standard_carbine = -1,
-			/obj/item/ammo_magazine/rifle/standard_carbine = -1,
-			/obj/item/ammo_magazine/rifle/standard_carbine/ap = -1,
-			/obj/item/ammo_magazine/rifle/standard_carbine/hp = -1,,
-			/obj/item/weapon/gun/rifle/standard_skirmishrifle = -1,
-			/obj/item/ammo_magazine/rifle/standard_skirmishrifle = -1,
-			/obj/item/ammo_magazine/rifle/standard_skirmishrifle/ap = -1,
-			/obj/item/ammo_magazine/rifle/standard_skirmishrifle/hp = -1,
-			/obj/item/weapon/gun/rifle/tx55 = -1,
-			/obj/item/ammo_magazine/rifle/standard_carbine,
-			/obj/item/weapon/gun/rifle/tx11 = -1,
-			/obj/item/ammo_magazine/rifle/tx11 = -1,
 			/obj/item/weapon/gun/shotgun/pump/lever/repeater = -1,
 			/obj/item/ammo_magazine/packet/p4570 = -1,
 		),
@@ -509,16 +442,14 @@
 			/obj/item/weapon/gun/energy/lasgun/lasrifle/tesla = -1,
 		),
 		"SMGs" = list(
-			/obj/item/weapon/gun/smg/standard_smg = -1,
-			/obj/item/ammo_magazine/smg/standard_smg = -1,
-			/obj/item/weapon/gun/smg/standard_machinepistol = -1,
-			/obj/item/ammo_magazine/smg/standard_machinepistol = -1,
+			/obj/item/weapon/gun/smg/vector = -1,
+			/obj/item/ammo_magazine/smg/vector = -1,
+			/obj/item/ammo_magazine/smg/vector/ap = -1,
+			/obj/item/ammo_magazine/smg/vector/hp = -1,
 		),
 		"Marksman" = list(
 			/obj/item/weapon/gun/rifle/standard_dmr = -1,
 			/obj/item/ammo_magazine/rifle/standard_dmr = -1,
-			/obj/item/weapon/gun/rifle/standard_br = -1,
-			/obj/item/ammo_magazine/rifle/standard_br = -1,
 			/obj/item/weapon/gun/rifle/chambered = -1,
 			/obj/item/ammo_magazine/rifle/chamberedrifle = -1,
 			/obj/item/weapon/gun/shotgun/pump/bolt = -1,
@@ -544,8 +475,6 @@
 			/obj/item/storage/holster/belt/ts34/full = -1,
 		),
 		"Machinegun" = list(
-			/obj/item/weapon/gun/rifle/standard_lmg = -1,
-			/obj/item/ammo_magazine/standard_lmg = -1,
 			/obj/item/weapon/gun/rifle/standard_gpmg = -1,
 			/obj/item/ammo_magazine/standard_gpmg = -1,
 			/obj/item/weapon/gun/standard_mmg = -1,
@@ -568,14 +497,8 @@
 			/obj/item/weapon/combat_knife/harvester = -1,
 		),
 		"Sidearm" = list(
-			/obj/item/weapon/gun/pistol/standard_pistol = -1,
-			/obj/item/ammo_magazine/pistol/standard_pistol = -1,
-			/obj/item/weapon/gun/pistol/standard_heavypistol = -1,
-			/obj/item/ammo_magazine/pistol/standard_heavypistol = -1,
 			/obj/item/weapon/gun/revolver/standard_revolver = -1,
 			/obj/item/ammo_magazine/revolver/standard_revolver = -1,
-			/obj/item/weapon/gun/revolver/standard_magnum = -1,
-			/obj/item/ammo_magazine/revolver/standard_magnum = -1,
 			/obj/item/storage/box/t500case = -1,
 			/obj/item/ammo_magazine/revolver/t500 = -1,
 			/obj/item/weapon/gun/pistol/standard_pocketpistol = -1,
@@ -628,7 +551,7 @@
 			/obj/structure/closet/crate/mortar_ammo/howitzer_kit = -1,
 			/obj/structure/largecrate/supply/weapons/standard_atgun = -1,
 			/obj/item/storage/box/crate/sentry = -1,
-			/obj/item/sentry_upgrade_kit = -1,
+            /obj/item/sentry_upgrade_kit = -1,
 			/obj/item/storage/box/tl102 = -1,
 			/obj/item/weapon/gun/heavymachinegun = -1,
 			/obj/item/ammo_magazine/heavymachinegun = -1,
@@ -670,7 +593,6 @@
 			/obj/item/ammo_magazine/rifle/pepperball/pepperball_mini = -1,
 			/obj/item/attachable/stock/t76 = -1,
 			/obj/item/attachable/flamer_nozzle = -1,
-			/obj/item/attachable/flamer_nozzle/wide = -1,
 			/obj/item/attachable/flamer_nozzle/long = -1,
 		),
 		"Boxes" = list(
@@ -849,20 +771,14 @@
 			/obj/item/storage/box/visual/magazine/compact/standard_pocketpistol/full = -1,
 			/obj/item/storage/box/visual/magazine/compact/vp70/full = -1,
 			/obj/item/storage/box/visual/magazine/compact/plasma_pistol/full = -1,
-			/obj/item/storage/box/visual/magazine/compact/standard_smg/full = -1,
-			/obj/item/storage/box/visual/magazine/compact/standard_machinepistol/full = -1,
 			/obj/item/storage/box/visual/magazine/compact/standard_assaultrifle/full = -1,
-			/obj/item/storage/box/visual/magazine/compact/standard_carbine/full = -1,
-			/obj/item/storage/box/visual/magazine/compact/standard_skirmishrifle/full = -1,
 			/obj/item/storage/box/visual/magazine/compact/martini/full = -1,
 			/obj/item/storage/box/visual/magazine/compact/ar11/full = -1,
 			/obj/item/storage/box/visual/magazine/compact/lasrifle/marine/full = -1,
 			/obj/item/storage/box/visual/magazine/compact/sh15/flechette/full = -1,
 			/obj/item/storage/box/visual/magazine/compact/sh15/slug/full = -1,
 			/obj/item/storage/box/visual/magazine/compact/standard_dmr/full = -1,
-			/obj/item/storage/box/visual/magazine/compact/standard_br/full = -1,
 			/obj/item/storage/box/visual/magazine/compact/chamberedrifle/full = -1,
-			/obj/item/storage/box/visual/magazine/compact/standard_lmg/full = -1,
 			/obj/item/storage/box/visual/magazine/compact/standard_gpmg/full = -1,
 			/obj/item/storage/box/visual/magazine/compact/standard_mmg/full = -1,
 		),
@@ -1376,6 +1292,7 @@
 			/obj/item/clothing/head/garrisoncap = -1,
 			/obj/item/clothing/head/serviceberet = -1,
 			/obj/item/clothing/head/servicecap = -1,
+			/obj/item/clothing/head/strawhat = -1,
 		),
 		"Masks" = list(
 			/obj/item/clothing/mask/rebreather/scarf = -1,

diff --git a/icons/RO_caps_onmob.dmi b/icons/RO_caps_onmob.dmi
diff --git a/icons/RO_cloth_new.dmi b/icons/RO_cloth_new.dmi
diff --git a/icons/drill_cap.dmi b/icons/drill_cap.dmi
diff --git a/icons/mob/clothing/headwear/marine_hats.dmi b/icons/mob/clothing/headwear/marine_hats.dmi
diff --git a/icons/mob/clothing/headwear/marine_helmets.dmi b/icons/mob/clothing/headwear/marine_helmets.dmi
diff --git a/icons/mob/clothing/uniforms/marine_uniforms.dmi b/icons/mob/clothing/uniforms/marine_uniforms.dmi
diff --git a/icons/RO_caps.dmi → icons/obj/clothing/headwear/RO_caps.dmi b/icons/RO_caps.dmi → icons/obj/clothing/headwear/RO_caps.dmi
diff --git a/icons/obj/clothing/headwear/marine_hats.dmi b/icons/obj/clothing/headwear/marine_hats.dmi
diff --git a/icons/obj/clothing/headwear/marine_helmets.dmi b/icons/obj/clothing/headwear/marine_helmets.dmi
diff --git a/icons/obj/clothing/uniforms/marine_uniforms.dmi b/icons/obj/clothing/uniforms/marine_uniforms.dmi