diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm
index 95bc2211f9d..7b7e910134e 100644
--- a/_maps/map_files/Talos/TGS_Talos.dmm
+++ b/_maps/map_files/Talos/TGS_Talos.dmm
@@ -195,6 +195,10 @@
 /obj/effect/turf_decal/tile/transparent/random/diagonal_centre,
 /turf/open/floor/mainship/metal,
 /area/mainship/squads/charlie)
+"afR" = (
+/obj/machinery/marine_selector/gear/marine,
+/turf/open/floor/mainship/emerald,
+/area/mainship/squads/charlie)
 "afS" = (
 /obj/machinery/light/mainship/small{
 	dir = 1
@@ -5842,6 +5846,13 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
 /turf/open/floor/plating,
 /area/mainship/hull/port_hull)
+"doR" = (
+/obj/structure/window{
+	dir = 8
+	},
+/obj/machinery/marine_selector/gear/marine,
+/turf/open/floor/mainship/metal,
+/area/mainship/squads/alpha)
 "dpc" = (
 /obj/structure/closet/crate/supply,
 /turf/open/floor/plating,
@@ -6790,6 +6801,13 @@
 	},
 /turf/open/floor/mainship/metal/lino,
 /area/mainship/living/starboard_emb)
+"dSv" = (
+/obj/structure/window{
+	dir = 4
+	},
+/obj/machinery/marine_selector/gear/marine,
+/turf/open/floor/mainship/metal,
+/area/mainship/squads/alpha)
 "dSw" = (
 /obj/effect/turf_decal/woodsiding{
 	dir = 1
@@ -9162,6 +9180,13 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/mainship/hull/starboard_hull)
+"fgE" = (
+/obj/structure/window{
+	dir = 4
+	},
+/obj/machinery/marine_selector/gear/robo,
+/turf/open/floor/mainship/blue,
+/area/mainship/squads/delta)
 "fgN" = (
 /obj/machinery/light/mainship/small{
 	dir = 8
@@ -11118,6 +11143,15 @@
 /obj/machinery/marine_selector/clothes/medic,
 /turf/open/floor/mainship/metal,
 /area/mainship/squads/charlie)
+"gCP" = (
+/obj/structure/window{
+	dir = 4
+	},
+/obj/machinery/marine_selector/gear/robo,
+/turf/open/floor/mainship/orange{
+	dir = 1
+	},
+/area/mainship/squads/bravo)
 "gCR" = (
 /obj/structure/barricade/metal{
 	dir = 8
@@ -11276,6 +11310,10 @@
 	},
 /turf/open/floor/wood,
 /area/mainship/squads/charlie)
+"gHr" = (
+/obj/machinery/marine_selector/gear/marine,
+/turf/open/floor/mainship/metal,
+/area/mainship/squads/alpha)
 "gHX" = (
 /obj/effect/turf_decal/siding/metal{
 	dir = 8
@@ -12712,6 +12750,15 @@
 /obj/structure/bed/chair,
 /turf/open/floor/wood,
 /area/mainship/hallways/aft_hallway)
+"hHV" = (
+/obj/structure/window{
+	dir = 4
+	},
+/obj/machinery/marine_selector/gear/marine,
+/turf/open/floor/mainship/orange{
+	dir = 1
+	},
+/area/mainship/squads/bravo)
 "hIa" = (
 /obj/effect/turf_decal/siding/dark/end,
 /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
@@ -12794,6 +12841,13 @@
 	},
 /turf/open/floor/plating/plating_catwalk/dark,
 /area/mainship/hallways/hangar/droppod)
+"hKi" = (
+/obj/structure/window{
+	dir = 8
+	},
+/obj/machinery/marine_selector/gear/robo,
+/turf/open/floor/mainship/metal,
+/area/mainship/squads/alpha)
 "hKu" = (
 /obj/effect/turf_decal/warning_stripes/thin{
 	dir = 8
@@ -13334,6 +13388,13 @@
 	},
 /turf/open/floor/mainship_hull,
 /area/mainship/command/cic)
+"igh" = (
+/obj/structure/window{
+	dir = 4
+	},
+/obj/machinery/marine_selector/gear/marine,
+/turf/open/floor/mainship/blue,
+/area/mainship/squads/delta)
 "igt" = (
 /obj/machinery/door/poddoor/shutters/mainship/selfdestruct{
 	dir = 1
@@ -14259,6 +14320,13 @@
 	color = "#53876F"
 	},
 /area/mainship/medical/lounge)
+"iKo" = (
+/obj/structure/window{
+	dir = 8
+	},
+/obj/machinery/marine_selector/gear/robo,
+/turf/open/floor/mainship/blue,
+/area/mainship/squads/delta)
 "iKN" = (
 /obj/machinery/light/mainship{
 	dir = 8
@@ -18396,6 +18464,13 @@
 	},
 /turf/open/floor/mainship/metal,
 /area/mainship/medical/chemistry)
+"ldH" = (
+/obj/structure/window{
+	dir = 4
+	},
+/obj/machinery/marine_selector/gear/marine,
+/turf/open/floor/mainship/emerald,
+/area/mainship/squads/charlie)
 "lew" = (
 /obj/structure/table/mainship,
 /obj/effect/spawner/random/engineering/cable,
@@ -21225,10 +21300,10 @@
 /obj/effect/turf_decal/woodsiding{
 	dir = 6
 	},
-/obj/effect/spawner/random/misc/plant,
 /obj/machinery/air_alarm{
 	dir = 8
 	},
+/obj/structure/lamarr,
 /turf/open/floor/carpet,
 /area/mainship/command/corporateliaison)
 "mFt" = (
@@ -23885,6 +23960,22 @@
 	},
 /turf/open/floor/stairs/dark/left,
 /area/mainship/hull/port_hull)
+"oeS" = (
+/obj/structure/window{
+	dir = 8
+	},
+/obj/machinery/marine_selector/gear/robo,
+/turf/open/floor/mainship/emerald,
+/area/mainship/squads/charlie)
+"ofo" = (
+/obj/structure/window{
+	dir = 8
+	},
+/obj/machinery/marine_selector/gear/robo,
+/turf/open/floor/mainship/orange{
+	dir = 1
+	},
+/area/mainship/squads/bravo)
 "ofG" = (
 /obj/effect/ai_node,
 /obj/machinery/camera/autoname/alt,
@@ -24277,6 +24368,13 @@
 /obj/effect/turf_decal/warning_stripes/cargo/arrow,
 /turf/open/floor/plating,
 /area/mainship/hull/starboard_hull)
+"osc" = (
+/obj/structure/window{
+	dir = 4
+	},
+/obj/machinery/marine_selector/gear/robo,
+/turf/open/floor/mainship/metal,
+/area/mainship/squads/alpha)
 "osA" = (
 /obj/effect/decal/cleanable/cobweb{
 	dir = 1
@@ -28376,6 +28474,10 @@
 /obj/effect/ai_node,
 /turf/open/floor/wood,
 /area/mainship/squads/bravo)
+"qNu" = (
+/obj/machinery/marine_selector/gear/robo,
+/turf/open/floor/mainship/metal,
+/area/mainship/squads/alpha)
 "qNx" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
 	dir = 8
@@ -30710,6 +30812,13 @@
 	},
 /turf/open/floor/plating/plating_catwalk/light,
 /area/mainship/living/cafeteria)
+"sks" = (
+/obj/structure/window{
+	dir = 8
+	},
+/obj/machinery/marine_selector/gear/marine,
+/turf/open/floor/mainship/blue,
+/area/mainship/squads/delta)
 "skF" = (
 /obj/machinery/light/mainship{
 	dir = 4
@@ -33963,6 +34072,13 @@
 	},
 /turf/open/floor/mainship/metal,
 /area/mainship/hallways/bow_hallway)
+"uoQ" = (
+/obj/machinery/marine_selector/gear/marine,
+/obj/structure/window{
+	dir = 8
+	},
+/turf/open/floor/mainship/emerald,
+/area/mainship/squads/charlie)
 "upc" = (
 /obj/structure/largecrate/supply,
 /obj/effect/decal/cleanable/dirt,
@@ -36264,6 +36380,13 @@
 	},
 /turf/open/floor/mainship/metal,
 /area/mainship/hallways/hangar/droppod)
+"vNS" = (
+/obj/machinery/marine_selector/gear/robo,
+/obj/structure/window{
+	dir = 4
+	},
+/turf/open/floor/mainship/emerald,
+/area/mainship/squads/charlie)
 "vOb" = (
 /obj/machinery/door/airlock/mainship/command/FCDRquarters{
 	dir = 8
@@ -36926,6 +37049,15 @@
 	},
 /turf/open/floor/plating/plating_catwalk/dark,
 /area/mainship/squads/delta)
+"whJ" = (
+/obj/structure/window{
+	dir = 8
+	},
+/obj/machinery/marine_selector/gear/marine,
+/turf/open/floor/mainship/orange{
+	dir = 1
+	},
+/area/mainship/squads/bravo)
 "whL" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,
@@ -37657,6 +37789,10 @@
 /obj/structure/barricade/metal,
 /turf/open/floor/grass,
 /area/mainship/shipboard/firing_range)
+"wHM" = (
+/obj/machinery/marine_selector/gear/robo,
+/turf/open/floor/mainship/emerald,
+/area/mainship/squads/charlie)
 "wJC" = (
 /obj/effect/turf_decal/woodsiding{
 	dir = 4
@@ -78609,7 +78745,7 @@ aRv
 uwt
 iiD
 xhq
-bMC
+hKi
 cNf
 oiX
 qcr
@@ -78672,7 +78808,7 @@ tkN
 ryM
 gFw
 lAY
-slT
+oeS
 tkN
 rgx
 qwP
@@ -78866,7 +79002,7 @@ uwt
 uwt
 iiD
 xhq
-cqy
+qNu
 lDx
 uQy
 aIf
@@ -78875,7 +79011,7 @@ eyN
 sRd
 pTc
 xhq
-dnb
+ofo
 iBJ
 uda
 uUX
@@ -78920,7 +79056,7 @@ eWU
 xqG
 rGm
 wlu
-oDo
+iKo
 tkN
 eDY
 wSm
@@ -78929,7 +79065,7 @@ xCy
 uzQ
 dfA
 eiA
-jsH
+wHM
 tkN
 uni
 qwP
@@ -79123,7 +79259,7 @@ mcj
 mcj
 efd
 xhq
-bMC
+osc
 soT
 foZ
 xKQ
@@ -79132,7 +79268,7 @@ qvh
 dNU
 nJh
 xhq
-vbh
+gCP
 xZI
 vKg
 dcs
@@ -79177,7 +79313,7 @@ awb
 oEl
 pjn
 ccE
-kAV
+fgE
 tkN
 mgh
 xfr
@@ -79186,7 +79322,7 @@ kss
 lNt
 gFw
 pdq
-slT
+vNS
 tkN
 aCb
 pSR
@@ -79380,7 +79516,7 @@ xhq
 xhq
 xhq
 xhq
-cqy
+doR
 lDx
 mqq
 hlJ
@@ -79443,7 +79579,7 @@ dhK
 sEo
 cGP
 eiA
-jsH
+uoQ
 tkN
 tkN
 tkN
@@ -79637,7 +79773,7 @@ qQU
 jxP
 eay
 xhq
-bMC
+gHr
 soT
 srv
 qcr
@@ -79700,7 +79836,7 @@ tkN
 ryM
 wBM
 pdq
-slT
+afR
 tkN
 nCz
 hzg
@@ -79894,7 +80030,7 @@ kHX
 psm
 trV
 xhq
-cqy
+dSv
 lDx
 oiX
 xap
@@ -79903,7 +80039,7 @@ xhq
 xhq
 xhq
 xhq
-dnb
+ofo
 sXV
 sFX
 uUX
@@ -79948,7 +80084,7 @@ eWU
 xqG
 aDy
 knz
-oDo
+iKo
 tkN
 tkN
 tkN
@@ -79957,7 +80093,7 @@ tkN
 vYM
 gFw
 eiA
-jsH
+ldH
 tkN
 cLd
 ePH
@@ -80160,7 +80296,7 @@ ocr
 vkP
 lzs
 xhq
-vbh
+hHV
 xZI
 sFX
 jfJ
@@ -80205,7 +80341,7 @@ eWU
 lZo
 aDy
 ccE
-kAV
+igh
 tkN
 nvT
 ulr
@@ -80931,7 +81067,7 @@ ocr
 vkP
 cPL
 xhq
-dnb
+whJ
 sXV
 vKg
 onW
@@ -80976,7 +81112,7 @@ eOW
 hVO
 pjn
 knz
-oDo
+sks
 tkN
 cNg
 ulr
@@ -81188,7 +81324,7 @@ xhq
 xhq
 xhq
 xhq
-vbh
+hHV
 xZI
 vGV
 xiz
@@ -81233,7 +81369,7 @@ hSO
 enB
 ipe
 ccE
-kAV
+igh
 tkN
 tkN
 tkN
diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
index ce21c1875c5..c1987061b61 100644
--- 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
index d49b9ac3b33..0784fed527e 100644
--- 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
index bee5af1a8ff..b362a6277ee 100644
--- a/code/game/objects/machinery/vending/marine_vending.dm
+++ b/code/game/objects/machinery/vending/marine_vending.dm
@@ -14,30 +14,18 @@
 			/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,
@@ -45,8 +33,6 @@
 			/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,18 +152,15 @@
 			/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,
@@ -195,8 +168,6 @@
 			/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
deleted file mode 100644
index c9071fcfe49..00000000000
Binary files a/icons/RO_caps_onmob.dmi and /dev/null differ
diff --git a/icons/RO_cloth_new.dmi b/icons/RO_cloth_new.dmi
deleted file mode 100644
index 95d2eef963b..00000000000
Binary files a/icons/RO_cloth_new.dmi and /dev/null differ
diff --git a/icons/drill_cap.dmi b/icons/drill_cap.dmi
deleted file mode 100644
index bf776d63d29..00000000000
Binary files a/icons/drill_cap.dmi and /dev/null differ
diff --git a/icons/mob/clothing/headwear/marine_hats.dmi b/icons/mob/clothing/headwear/marine_hats.dmi
index e1ceeeedf62..96f0758c9e0 100644
Binary files a/icons/mob/clothing/headwear/marine_hats.dmi and b/icons/mob/clothing/headwear/marine_hats.dmi differ
diff --git a/icons/mob/clothing/headwear/marine_helmets.dmi b/icons/mob/clothing/headwear/marine_helmets.dmi
index 8707127bf98..65e02c670d8 100644
Binary files a/icons/mob/clothing/headwear/marine_helmets.dmi and b/icons/mob/clothing/headwear/marine_helmets.dmi differ
diff --git a/icons/mob/clothing/uniforms/marine_uniforms.dmi b/icons/mob/clothing/uniforms/marine_uniforms.dmi
index 9cc221bb6c9..25417ac7f72 100644
Binary files a/icons/mob/clothing/uniforms/marine_uniforms.dmi and b/icons/mob/clothing/uniforms/marine_uniforms.dmi differ
diff --git a/icons/RO_caps.dmi b/icons/obj/clothing/headwear/RO_caps.dmi
similarity index 100%
rename from icons/RO_caps.dmi
rename to 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
index 29dd8e5b96b..0449ccb9b29 100644
Binary files a/icons/obj/clothing/headwear/marine_hats.dmi and b/icons/obj/clothing/headwear/marine_hats.dmi differ
diff --git a/icons/obj/clothing/headwear/marine_helmets.dmi b/icons/obj/clothing/headwear/marine_helmets.dmi
index c1cbbf2f206..841de89d592 100644
Binary files a/icons/obj/clothing/headwear/marine_helmets.dmi and b/icons/obj/clothing/headwear/marine_helmets.dmi differ
diff --git a/icons/obj/clothing/uniforms/marine_uniforms.dmi b/icons/obj/clothing/uniforms/marine_uniforms.dmi
index 3e3d2698c17..e469fa66000 100644
Binary files a/icons/obj/clothing/uniforms/marine_uniforms.dmi and b/icons/obj/clothing/uniforms/marine_uniforms.dmi differ