diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
index c4d2925d1a..11bc0fc093 100644
--- a/code/__DEFINES/job.dm
+++ b/code/__DEFINES/job.dm
@@ -8,9 +8,9 @@
 #define SQUAD_MARINE_3 "Charlie"
 #define SQUAD_MARINE_4 "Delta"
 #define SQUAD_MARINE_5 "Echo"
-#define SQUAD_MARINE_CRYO "Foxtrot"
+#define SQUAD_MARINE_CRYO "Duskmen"
 #define SQUAD_MARINE_INTEL "Intel"
-#define SQUAD_SOF "SOF"
+#define SQUAD_SOF "Raiders"
 #define SQUAD_CBRN "CBRN"
 #define SQUAD_UPP "Red Dawn"
 #define SQUAD_LRRP "Snake Eaters"
@@ -26,19 +26,19 @@
 #define JOB_SQUAD_ROLES /datum/timelock/squad
 #define JOB_SQUAD_ROLES_LIST list(JOB_SQUAD_MARINE, JOB_SQUAD_LEADER, JOB_SQUAD_ENGI, JOB_SQUAD_MEDIC, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_TEAM_LEADER)
 
-#define JOB_SQUAD_MARINE_UPP "UPP Rifleman"
-#define JOB_SQUAD_LEADER_UPP "UPP Platoon Sergeant"
-#define JOB_SQUAD_MEDIC_UPP "UPP Sanitar"
-#define JOB_SQUAD_TEAM_LEADER_UPP "UPP Squad Sergeant"
-#define JOB_SQUAD_SMARTGUN_UPP "UPP Machinegunner"
-#define JOB_SO_UPP "UPP Platoon Commander"
+#define JOB_SQUAD_MARINE_UPP "Rifleman"
+#define JOB_SQUAD_LEADER_UPP "Platoon Sergeant"
+#define JOB_SQUAD_MEDIC_UPP "Sanitar"
+#define JOB_SQUAD_TEAM_LEADER_UPP "Squad Sergeant"
+#define JOB_SQUAD_SMARTGUN_UPP "Machinegunner"
+#define JOB_SO_UPP "Platoon Commander"
 
-#define JOB_SQUAD_TEAM_LEADER_FORECON "FORECON Assistant Squad Leader"
-#define JOB_SQUAD_LEADER_FORECON  "FORECON Squad Leader"
-#define JOB_SQUAD_MEDIC_FORECON "FORECON Squad Corpsman"
+#define JOB_SQUAD_TEAM_LEADER_FORECON "Assistant Squad Leader"
+#define JOB_SQUAD_LEADER_FORECON  "Squad Leader"
+#define JOB_SQUAD_MEDIC_FORECON "Squad Corpsman"
 #define JOB_SQUAD_RTO "Radio Telephone Operator"
-#define JOB_SQUAD_MARINE_FORECON "FORECON Rifleman"
-#define JOB_SQUAD_SMARTGUN_FORECON "FORECON Smartgunner"
+#define JOB_SQUAD_MARINE_FORECON "Rifleman"
+#define JOB_SQUAD_SMARTGUN_FORECON "Smartgunner"
 
 var/global/list/job_squad_roles = JOB_SQUAD_ROLES_LIST
 
@@ -152,37 +152,6 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 	. = ..(L);\
 }
 
-//-------------WO roles---------------
-
-#define JOB_WO_CO "Ground Commander"
-#define JOB_WO_XO "Lieutenant Commander"
-#define JOB_WO_CHIEF_POLICE "Honor Guard Squad Leader"
-#define JOB_WO_SO "Veteran Honor Guard"
-#define JOB_WO_CREWMAN "Honor Guard Weapons Specialist"
-#define JOB_WO_POLICE "Honor Guard"
-
-#define JOB_WO_PILOT "Mortar Crew"
-
-#define JOB_WO_CHIEF_ENGINEER "Bunker Crew Master"
-#define JOB_WO_ORDNANCE_TECH "Bunker Crew"
-
-#define JOB_WO_CHIEF_REQUISITION "Bunker Quartermaster"
-#define JOB_WO_REQUISITION "Bunker Crew Logistics"
-
-#define JOB_WO_CMO "Head Surgeon"
-#define JOB_WO_DOCTOR "Field Doctor"
-#define JOB_WO_RESEARCHER "Chemist"
-
-#define JOB_WO_CORPORATE_LIAISON "Combat Reporter"
-#define JOB_WO_SYNTH "Support Synthetic"
-
-#define JOB_WO_SQUAD_MARINE "Dust Raider Squad Rifleman"
-#define JOB_WO_SQUAD_MEDIC "Dust Raider Squad Hospital Corpsman"
-#define JOB_WO_SQUAD_ENGINEER "Dust Raider Squad Combat Technician"
-#define JOB_WO_SQUAD_SMARTGUNNER "Dust Raider Squad Smartgunner"
-#define JOB_WO_SQUAD_SPECIALIST "Dust Raider Squad Weapons Specialist"
-#define JOB_WO_SQUAD_LEADER "Dust Raider Squad Leader"
-
 //------------------------------------
 
 //-------- PMC --------//
@@ -301,7 +270,7 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 
 //-------- CLF --------//
 #define JOB_CLF "CLF Guerilla"
-#define JOB_CLF "CLF Rifleman"
+#define JOB_CLF_SOLDIER "CLF Rifleman"
 #define JOB_CLF_ENGI "CLF Field Technician"
 #define JOB_CLF_MEDIC "CLF Field Medic"
 #define JOB_CLF_SPECIALIST "CLF Field Specialist"
diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
index 6456a40aa9..fe294b5755 100644
--- a/code/__DEFINES/mode.dm
+++ b/code/__DEFINES/mode.dm
@@ -115,13 +115,13 @@ var/global/list/ROLES_COMMAND = list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFIC
 
 //Marine roles
 #define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
-var/global/list/ROLES_CIC = list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO)
-var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT)
-var/global/list/ROLES_MISC = list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH)
+var/global/list/ROLES_CIC = list(JOB_CO, JOB_XO, JOB_SO)
+var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF)
+var/global/list/ROLES_MISC = list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT)
 var/global/list/ROLES_POLICE = list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
-var/global/list/ROLES_ENGINEERING = list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH)
-var/global/list/ROLES_REQUISITION = list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION)
-var/global/list/ROLES_MEDICAL = list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR)
+var/global/list/ROLES_ENGINEERING = list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH)
+var/global/list/ROLES_REQUISITION = list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH)
+var/global/list/ROLES_MEDICAL = list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE)
 var/global/list/ROLES_MARINES = list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE, JOB_SQUAD_RTO)
 var/global/list/ROLES_SQUAD_ALL = list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MARINE_3, SQUAD_MARINE_4, SQUAD_MARINE_5, SQUAD_MARINE_CRYO, SQUAD_MARINE_INTEL, SQUAD_UPP, SQUAD_LRRP)
 
@@ -130,7 +130,7 @@ var/global/list/ROLES_XENO = list(JOB_XENOMORPH_QUEEN, JOB_XENOMORPH)
 var/global/list/ROLES_WHITELISTED = list(JOB_SYNTH_SURVIVOR, JOB_CO_SURVIVOR, JOB_PREDATOR)
 var/global/list/ROLES_SPECIAL = list(JOB_SURVIVOR)
 
-var/global/list/ROLES_USCM = ROLES_CIC + ROLES_POLICE + ROLES_AUXIL_SUPPORT + ROLES_MISC + ROLES_ENGINEERING + ROLES_REQUISITION + ROLES_MEDICAL + ROLES_MARINES - ROLES_WO
+var/global/list/ROLES_USCM = ROLES_CIC + ROLES_POLICE + ROLES_AUXIL_SUPPORT + ROLES_MISC + ROLES_ENGINEERING + ROLES_REQUISITION + ROLES_MEDICAL + ROLES_MARINES
 var/global/list/ROLES_GROUND = ROLES_XENO + ROLES_SPECIAL + ROLES_WHITELISTED
 
 var/global/list/ROLES_DISTRESS_SIGNAL = ROLES_USCM + ROLES_GROUND
@@ -141,15 +141,13 @@ var/global/list/ROLES_UNASSIGNED = list(JOB_SQUAD_MARINE)
 var/global/list/ROLES_AI = list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE)
 var/global/list/ROLES_AI_UPP = list(JOB_SO_UPP, JOB_SQUAD_LEADER_UPP, JOB_SQUAD_MEDIC_UPP, JOB_SQUAD_TEAM_LEADER_UPP, JOB_SQUAD_SMARTGUN_UPP, JOB_SQUAD_MARINE_UPP)
 var/global/list/ROLES_AI_FORECON = list(JOB_SQUAD_LEADER_FORECON, JOB_SQUAD_MEDIC_FORECON, JOB_SQUAD_TEAM_LEADER_FORECON, JOB_SQUAD_SMARTGUN_FORECON, JOB_SQUAD_MARINE_FORECON, JOB_SQUAD_RTO)
-var/global/list/ROLES_WO = list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER)
 //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc.
-#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\
-						JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE
+#define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_SEA, JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE
 #define BLURB_USCM_FLIGHT JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF
 #define BLURB_USCM_MP JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE
-#define BLURB_USCM_ENGI JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_PILOT
-#define BLURB_USCM_MEDICAL JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR
-#define BLURB_USCM_REQ JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION
+#define BLURB_USCM_ENGI JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH
+#define BLURB_USCM_MEDICAL JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE
+#define BLURB_USCM_REQ JOB_CHIEF_REQUISITION, JOB_CARGO_TECH
 #define BLURB_USCM_WY JOB_CORPORATE_LIAISON
 
 //=================================================
diff --git a/code/datums/factions/uscm.dm b/code/datums/factions/uscm.dm
index e6aad56a05..88551845e7 100644
--- a/code/datums/factions/uscm.dm
+++ b/code/datums/factions/uscm.dm
@@ -152,29 +152,6 @@
 				marine_rk = "rmp"
 			if(JOB_RIOT_CHIEF)
 				marine_rk = "crmp"
-			// Whiskey Outpost
-			if(JOB_WO_CO)
-				marine_rk = "wo_co"
-			if(JOB_WO_XO)
-				marine_rk = "wo_xo"
-			if(JOB_WO_CHIEF_POLICE)
-				marine_rk = "hgsl"
-			if(JOB_WO_SO)
-				marine_rk = "vhg"
-			if(JOB_WO_CREWMAN)
-				marine_rk = "hgspec"
-			if(JOB_WO_POLICE)
-				marine_rk = "hg"
-			if(JOB_WO_CMO)
-				marine_rk = "wo_cmo"
-			if(JOB_WO_DOCTOR)
-				marine_rk = "wo_doctor"
-			if(JOB_WO_RESEARCHER)
-				marine_rk = "wo_chemist"
-			if(JOB_WO_CHIEF_REQUISITION)
-				marine_rk = "wo_ro"
-			if(JOB_WO_PILOT)
-				marine_rk = "wo_mcrew"
 			// Colonial Marshals
 			if(JOB_CMB_TL)
 				marine_rk = "mar"
diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm
index f0629ea7b7..630879b3c7 100644
--- a/code/datums/supply_packs/black_market.dm
+++ b/code/datums/supply_packs/black_market.dm
@@ -663,12 +663,6 @@ USCM spare items, miscellaneous gear that's too niche and distant (or restricted
 	contains = list(/obj/item/storage/box/guncase/nsg23_marine)
 	containertype = /obj/structure/largecrate/black_market
 
-/datum/supply_packs/contraband/surplus/m3717
-	name = "surplus M37-17 pump shotgun case"
-	dollar_cost = 80
-	contains = list(/obj/item/storage/box/guncase/m3717)
-	containertype = /obj/structure/largecrate/black_market
-
 /datum/supply_packs/contraband/surplus/m1911
 	name = "surplus M1911 service pistol case"
 	dollar_cost = 10
@@ -987,15 +981,15 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro
 		// Elite recovered gear.
 			var/list/armor_to_pick = list(
 				// Y8 Miner (default)
-				/obj/item/clothing/under/marine/veteran/mercenary/miner,
+				/obj/item/clothing/under/marine/opfor/mercenary/miner,
 				/obj/item/clothing/suit/storage/marine/veteran/mercenary/miner,
 				/obj/item/clothing/head/helmet/marine/veteran/mercenary/miner,
 				// K12 Ceramic (Heavy-ish)
-				/obj/item/clothing/under/marine/veteran/mercenary,
+				/obj/item/clothing/under/marine/opfor/mercenary,
 				/obj/item/clothing/suit/storage/marine/veteran/mercenary,
 				/obj/item/clothing/head/helmet/marine/veteran/mercenary,
 				// Z7 Support (Support)
-				/obj/item/clothing/under/marine/veteran/mercenary,
+				/obj/item/clothing/under/marine/opfor/mercenary,
 				/obj/item/clothing/suit/storage/marine/veteran/mercenary/support,
 				/obj/item/clothing/head/helmet/marine/veteran/mercenary/support/engineer
 				// You get three random pieces. If you want to complete the set you need to keep rolling the dice!
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index e35fde6130..4d47d40e7b 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -250,7 +250,6 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 	var/list/deleteall = list(/obj/item/clothing/mask/cigarette, \
 	/obj/item/clothing/glasses/sunglasses, \
 	/obj/item/clothing/glasses/mgoggles, \
-	/obj/item/clothing/head/beret/marine/mp, \
 	/obj/item/clothing/gloves/black, \
 	/obj/item/weapon/baton, \
 	/obj/item/weapon/gun/energy/taser, \
diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm
index 16ff9c8b6d..9d3d0d98cb 100644
--- a/code/game/machinery/vending/vending_types.dm
+++ b/code/game/machinery/vending/vending_types.dm
@@ -241,11 +241,8 @@
 		/obj/item/reagent_container/food/snacks/donut/normal = 12,
 		/obj/item/storage/box/evidence = 6,
 		/obj/item/clothing/head/helmet/marine/MP = 6,
-		/obj/item/clothing/head/beret/marine/mp/mppeaked = 6,
-		/obj/item/clothing/head/beret/marine/mp/mpcap = 6,
 		/obj/item/clothing/under/marine = 2,
 		/obj/item/storage/belt/security/MP = 6,
-		/obj/item/clothing/head/beret/marine/mp = 6,
 		/obj/item/clothing/glasses/sunglasses/sechud = 3,
 		/obj/item/device/radio/headset = 6,
 		/obj/item/tape/regulation = 5,
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
index eb71da93ba..5470ebbcaf 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
@@ -110,7 +110,7 @@
 	listed_products = list(
 		list("STANDARD EQUIPMENT", -1, null, null, null),
 		list("Military Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine/upp, VENDOR_ITEM_REGULAR),
-		list("UPP Uniform", round(scale * 15), /obj/item/clothing/under/marine/veteran/UPP, VENDOR_ITEM_REGULAR),
+		list("UPP Uniform", round(scale * 15), /obj/item/clothing/under/marine/opfor/UPP, VENDOR_ITEM_REGULAR),
 		list("Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR),
 		list("UM4 Pattern Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine/veteran/UPP, VENDOR_ITEM_REGULAR),
 		list("Radio Headset", round(scale * 15), /obj/item/device/radio/headset/distress/UPP, VENDOR_ITEM_REGULAR),
diff --git a/code/game/objects/effects/spawners/random.dm b/code/game/objects/effects/spawners/random.dm
index fc3f7da6c5..f7a0519dcb 100644
--- a/code/game/objects/effects/spawners/random.dm
+++ b/code/game/objects/effects/spawners/random.dm
@@ -465,7 +465,6 @@
 		/obj/item/weapon/gun/lever_action/r4t = /obj/item/ammo_magazine/lever_action,
 		/obj/item/weapon/gun/lever_action/r4t = /obj/item/ammo_magazine/lever_action,
 		/obj/item/weapon/gun/shotgun/merc = null,
-		/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717 = null,
 	) //no ammotypes needed as it spawns random 12g boxes. Apart from the r4t. why is the r4t in the shotgun pool? fuck you, that's why.
 
 /obj/effect/spawner/random/gun/shotgun/lowchance
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 2b6ae446d8..4f4a34e52d 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -384,7 +384,7 @@
 
 /obj/item/card/id/dogtag
 	name = "dog tag"
-	desc = "A marine dog tag."
+	desc = "A dog tag."
 	icon_state = "dogtag"
 	item_state = "dogtag"
 	pinned_on_uniform = FALSE
diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm
index a2d23ff834..adc30a90b5 100644
--- a/code/game/objects/items/toys/toys.dm
+++ b/code/game/objects/items/toys/toys.dm
@@ -624,32 +624,7 @@
 	name = "\improper XX-121 therapy plush"
 	desc = "Don't be sad! Be glad (that you're alive)!"
 	icon_state = "runner"
-	/// If the runner is wearing a beret
-	var/beret = FALSE
 
-/obj/item/toy/plush/runner/Initialize(mapload, ...)
-	. = ..()
-	if(beret)
-		update_icon()
-
-/obj/item/toy/plush/runner/attackby(obj/item/attacking_object, mob/user)
-	. = ..()
-	if(beret)
-		return
-	if(!istypestrict(attacking_object, /obj/item/clothing/head/beret/marine/mp))
-		return
-	var/beret_attack = attacking_object
-	to_chat(user, SPAN_NOTICE("You put [beret_attack] on [src]."))
-	qdel(beret_attack)
-	beret = TRUE
-	update_icon()
-
-/obj/item/toy/plush/runner/update_icon()
-	. = ..()
-	if(beret)
-		icon_state = "runner_beret"
-		return
-	icon_state = "runner"
 
 /obj/item/toy/plush/shark/alt
 	icon_state = "shark_alt"
diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm
index 9f77faeae8..ea7ab75176 100644
--- a/code/modules/clothing/head/head.dm
+++ b/code/modules/clothing/head/head.dm
@@ -26,10 +26,6 @@
 		WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
 	)
 
-/obj/item/clothing/head/cmbandana/Initialize(mapload, ...)
-	. = ..()
-	select_gamemode_skin(/obj/item/clothing/head/cmbandana)
-
 /obj/item/clothing/head/cmbandana/tan
 	icon_state = "band2"
 
@@ -52,64 +48,6 @@
 /obj/item/clothing/head/beanie/tan
 	icon_state = "beanietan"
 
-/obj/item/clothing/head/beret/cm
-	name = "\improper USCM beret"
-	desc = "A hat typically worn by the field-officers of the USCM. Occasionally they find their way down the ranks into the hands of squad-leaders and decorated grunts."
-	icon = 'icons/obj/items/clothing/cm_hats.dmi'
-	icon_state = "beret"
-	item_icons = list(
-		WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
-	)
-
-/obj/item/clothing/head/beret/cm/Initialize(mapload, ...)
-	. = ..()
-	select_gamemode_skin(/obj/item/clothing/head/beret/cm)
-
-/obj/item/clothing/head/beret/cm/tan
-	icon_state = "berettan"
-
-/obj/item/clothing/head/beret/cm/tan/Initialize(mapload, ...)
-	. = ..()
-	select_gamemode_skin(/obj/item/clothing/head/beret/cm/tan)
-
-/obj/item/clothing/head/beret/cm/red
-	icon_state = "beretred"
-
-/obj/item/clothing/head/beret/cm/white
-	icon_state = "s_beret"
-
-/obj/item/clothing/head/beret/cm/black
-	icon_state = "beret_black"
-
-/obj/item/clothing/head/beret/cm/alpha
-	desc = "Often found atop heads, slightly less found on those still attached."
-	icon_state = "beret_alpha"
-
-/obj/item/clothing/head/beret/cm/bravo
-	desc = "It has quite a lot of debris on it, the person wearing this probably moves less than a wall."
-	icon_state = "beret_bravo"
-
-/obj/item/clothing/head/beret/cm/charlie
-	desc = "Still has some morning toast crumbs on it."
-	icon_state = "beret_charlie"
-
-/obj/item/clothing/head/beret/cm/delta
-	desc = "Hard to consider protection, but these types of people don't seek protection."
-	icon_state = "beret_delta"
-
-/obj/item/clothing/head/beret/cm/echo
-	desc = "Tightly Woven, as it should be."
-	icon_state = "beret_echo"
-
-/obj/item/clothing/head/beret/cm/foxtrot
-	desc = "Looks and feels starched, cold to the touch."
-	icon_state = "beret_foxtrot"
-
-/obj/item/clothing/head/beret/cm/intel
-	desc = "Looks more intellegent than the person wearing it."
-	icon_state = "beret_intel"
-
-
 /obj/item/clothing/head/headband
 	name = "headband"
 	desc = "A rag typically worn by the less-orthodox weapons operators. While it offers no protection, it is certainly comfortable to wear compared to the standard helmet. Comes in two stylish colors."
@@ -187,7 +125,7 @@
 
 /obj/item/clothing/head/cmcap
 	name = "patrol cap"
-	desc = "A casual cap issued as part of the non-combat uniform. While it only protects from the sun, it's much more comfortable than a helmet."
+	desc = "A comfortable patrol cap. It offers no defensive properties."
 	icon_state = "cap"
 	icon = 'icons/obj/items/clothing/cm_hats.dmi'
 	var/helmet_overlays[]
@@ -327,47 +265,12 @@
 
 	update_clothing_icon()
 
-/obj/item/clothing/head/cmcap/boonie
-	name = "\improper USCM boonie hat"
-	desc = "A floppy bush hat. Protects only from the sun and rain, but very comfortable."
-	icon_state = "booniehat"
-	flipping_message = list(
-		"flipped" = "You tuck the hat's chinstrap away. Hopefully the wind doesn't nick it...",
-		"unflipped" = "You hook the hat's chinstrap under your chin. Peace of mind is worth a little embarassment."
-		)
-
-/obj/item/clothing/head/cmcap/boonie/tan
-	icon_state = "booniehattan"
-	flags_atom = FPRINT|NO_SNOW_TYPE
-
-/obj/item/clothing/head/cmcap/co
-	name = "\improper USCM Commanding officer cap"
-	icon_state = "cocap"
-	desc = "A hat usually worn by senior officers in the USCM. While it provides no protection, some officers wear it in the field to make themselves more recognisable."
-
-/obj/item/clothing/head/cmcap/co/formal
-	name = "\improper USCM formal Commanding Officer's white cap"
-	icon_state = "co_formalhat_white"
-	desc = "A formal cover worn by senior officers of the USCM."
-	flags_marine_hat = HAT_GARB_OVERLAY
-	flags_atom = FPRINT|NO_SNOW_TYPE
-
-/obj/item/clothing/head/cmcap/co/formal/black
-	name = "\improper USCM formal Commanding Officer's black cap"
-	icon_state = "co_formalhat_black"
-
-/obj/item/clothing/head/cmcap/req/ro
-	name = "\improper USCM quartermaster cap"
-	desc = "It's a fancy hat for a not-so-fancy military supply clerk."
+/obj/item/clothing/head/cmcap/khaki
+	name = "patrol cap"
+	desc = "A comfortable khaki patrol cap. It offers no defensive properties."
 	icon_state = "rocap"
 	flags_atom = NO_SNOW_TYPE
 
-/obj/item/clothing/head/cmcap/req
-	name = "\improper USCM requisition cap"
-	desc = "It's a not-so-fancy hat for a not-so-fancy military supply clerk."
-	icon_state = "cargocap"
-	flags_atom = FPRINT|NO_SNOW_TYPE
-
 /obj/item/clothing/head/cmcap/bridge
 	name = "\improper USCM officer cap"
 	desc = "A hat usually worn by officers in the USCM. While it provides no protection, some officers wear it in the field to make themselves more recognisable."
@@ -390,153 +293,25 @@
 	flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
 	flags_marine_hat = HAT_GARB_OVERLAY
 
-/obj/item/clothing/head/cmo
-	name = "\improper Chief Medical Officer's Peaked Cap"
-	desc = "A peaked cap given to high-ranking civilian medical officers. Looks just a touch silly."
-	icon = 'icons/obj/items/clothing/cm_hats.dmi'
-	icon_state = "cmohat"
-	item_icons = list(
-		WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
-	)
-
-//============================//BERETS\\=================================\\
-//=======================================================================\\
-//Berets DO NOT have armor, so they have their own category. PMC caps are helmets, so they're in helmets.dm.
-/obj/item/clothing/head/beret/marine
-	name = "marine officer beret"
-	desc = "A beret with the USCM insignia emblazoned on it. It radiates respect and authority."
-	icon_state = "beret_badge"
-
-/obj/item/clothing/head/beret/marine/mp
-	name = "\improper USCM MP beret"
-	icon_state = "beretred"
-	desc = "A beret with the USCM Military Police insignia emblazoned on it."
-	icon = 'icons/obj/items/clothing/cm_hats.dmi'
-	item_icons = list(
-		WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
-	)
-	black_market_value = 25
-
-/obj/item/clothing/head/beret/marine/mp/warden
-	name = "\improper USCM MP warden peaked cap"
-	icon_state = "warden"
-	desc = "A peaked cap with the USCM Military Police Lieutenant insignia emblazoned on it. It is typically used by Wardens on USCM ships."
-
-/obj/item/clothing/head/beret/marine/mp/cmp
-	name = "\improper USCM chief MP beret"
-	desc = "A beret with the USCM Military Police First Lieutenant insignia emblazoned on it. It shines with the glow of corrupt authority and a smudge of doughnut."
-	icon_state = "beretwo"
-	black_market_value = 30
-
-/obj/item/clothing/head/beret/marine/mp/mppeaked
-	name = "\improper USCM MP peaked cap"
-	desc = "A peaked cap worn by the USCM's Military Police. Something about it reminds you of an event you once read about in a history book."
-	icon_state = "mppeaked"
-
-/obj/item/clothing/head/beret/marine/mp/mpcap
-	name = "\improper USCM MP ball-cap"
-	desc = "A ball-cap, typically worn by the more casual of the USCM's Military Police."
-	icon_state = "mpcap"
-
-/obj/item/clothing/head/beret/marine/mp/provost
-	name = "\improper USCM provost beret"
-	icon_state = "beretwo"
-	desc = "A beret with the USCM Military Police insignia emblazoned on it."
-
-/obj/item/clothing/head/beret/marine/mp/provost/senior
-	name = "\improper USCM senior provost beret"
-	icon_state = "coblackberet"
-	desc = "A beret with the USCM Military Police insignia emblazoned on it."
-
-/obj/item/clothing/head/beret/marine/mp/tis
-	name = "\improper UAAC-TIS Special Agent Beret"
-	icon_state = "berettis"
-	desc = "A beret with the UAAC-TIS insignia emblazoned on it. A mark of a TIS Special Agent, these berets are one of the only pieces of equipment that the TIS actually manufactures for itself and earning one is one of the rare signs of achievement the Three Eyes allows."
-
-/obj/item/clothing/head/beret/marine/commander
-	name = "marine commanding officer beret"
-	desc = "A beret with the commanding officer's insignia emblazoned on it. Wearer may suffer the heavy weight of responsibility upon their head and shoulders."
-	icon = 'icons/obj/items/clothing/cm_hats.dmi'
-	icon_state = "coberet"
-	item_icons = list(
-		WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
-	)
-	black_market_value = 30
-
-/obj/item/clothing/head/beret/marine/commander/dress
-	name = "marine major white beret"
-	icon_state = "codressberet"
-	desc = "A white beret with the Major insignia emblazoned on it. Its dazzling white color commands power and exudes class."
-
-/obj/item/clothing/head/beret/marine/commander/black
-	name = "marine major black beret"
-	icon_state = "coblackberet"
-	desc = "A black beret with the Major insignia emblazoned on it. Its sleek black color commands power and exudes class."
-
-/obj/item/clothing/head/beret/marine/commander/council
-	name = "marine colonel beret"
-	desc = "A blue beret with the Lieutenant Colonel's insignia emblazoned on it. Its blue color symbolizes loyalty, confidence, and politics - the core components of a true Colonel."
-	icon_state = "cdreberet"
+/obj/item/clothing/head/cmcap/boonie
+	name = "\improper USCM boonie hat"
+	desc = "A floppy bush hat. Protects only from the sun and rain, but very comfortable."
+	icon_state = "booniehat"
+	flipping_message = list(
+		"flipped" = "You tuck the hat's chinstrap away. Hopefully the wind doesn't nick it...",
+		"unflipped" = "You hook the hat's chinstrap under your chin. Peace of mind is worth a little embarassment."
+		)
 
-/obj/item/clothing/head/beret/marine/commander/councilchief
-	name = "marine colonel beret"
-	desc = "A dark blue, custom-tailored beret signifying The Colonel. Definitely not an alias for a General."
-	icon_state = "cdrechiefberet"
+/obj/item/clothing/head/cmcap/boonie/tan
+	icon_state = "booniehattan"
+	flags_atom = FPRINT|NO_SNOW_TYPE
 
 /obj/item/clothing/head/marine/peaked
-	name = "marine peaked cap"
-	desc = "A peaked cap. Wearer may suffer the heavy weight of responsibility upon their head and shoulders."
-	icon = 'icons/obj/items/clothing/cm_hats.dmi'
-	icon_state = "marine_formal"
-	item_icons = list(
-		WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
-	)
-
-/obj/item/clothing/head/marine/peaked/service
-	name = "marine service peaked cap"
-	desc = "A peaked cap. Wearer may suffer the heavy weight of responsibility upon their head and shoulders."
-	icon = 'icons/obj/items/clothing/cm_hats.dmi'
+	name = "\improper USCM service cap"
+	desc = "A USCM service uniform peaked cap."
+	icon = 'icons/mob/humans/onmob/head-layer/head_marine.dmi'
 	icon_state = "marine_service"
-	item_icons = list(
-		WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
-	)
-
-/obj/item/clothing/head/marine/peaked/captain
-	name = "marine commanding officer peaked cap"
-	desc = "A peaked cap with the commanding officer's insignia emblazoned on it. Wearer may suffer the heavy weight of responsibility upon their head and shoulders."
-	icon = 'icons/obj/items/clothing/cm_hats.dmi'
-	icon_state = "copeaked"
-	item_icons = list(
-		WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
-	)
-	black_market_value = 30
-
-/obj/item/clothing/head/marine/peaked/service
-
-	name = "commanding officer's dress white peaked cap"
-	desc = "A white, Navy-style peaked cap for the Commanding Officer. Wearer may suffer the heavy weight of responsibility upon their head."
-	icon_state = "co_peakedcap_white"
-
-/obj/item/clothing/head/marine/peaked/captain/black
-	name = "commanding officer's dress black peaked cap"
-	desc = "A black, Navy-style peaked cap for the Commanding Officer. Wearer may suffer the heavy weight of responsibility upon their head."
-	icon_state = "co_peakedcap_black"
-
-/obj/item/clothing/head/beret/marine/chiefofficer
-	name = "chief officer beret"
-	desc = "A beret with the lieutenant-commander insignia emblazoned on it. It emits a dark aura and may corrupt the soul."
-	icon_state = "hosberet"
-
-/obj/item/clothing/head/beret/marine/techofficer
-	name = "technical officer beret"
-	desc = "A beret with the lieutenant insignia emblazoned on it. There's something inexplicably efficient about it..."
-	icon_state = "e_beret_badge"
-
-/obj/item/clothing/head/beret/marine/logisticsofficer
-	name = "logistics officer beret"
-	desc = "A beret with the lieutenant insignia emblazoned on it. It inspires a feeling of respect."
-	icon_state = "beret_badge"
-
+	item_icons = "marine_service"
 //==========================//PROTECTIVE\\===============================\\
 //=======================================================================\\
 
@@ -730,7 +505,7 @@
 
 /obj/item/clothing/head/drillhat
 	name = "\improper USCM drill hat"
-	desc = "A formal hat worn by drill sergeants. Police that moustache."
+	desc = "A formal hat worn by drill instructors. Police that moustache."
 	icon_state = "drillhat"
 	icon = 'icons/obj/items/clothing/cm_hats.dmi'
 	item_icons = list(
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index bf73b2b490..472071f833 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -77,93 +77,6 @@
 	armor_internaldamage = CLOTHING_ARMOR_MEDIUM
 	siemens_coefficient = 0.5
 
-/obj/item/clothing/head/helmet/HoS
-	name = "Head of Security Hat"
-	desc = "The hat of the Head of Security. For showing the officers who's in charge."
-	icon_state = "hoscap"
-	armor_melee = CLOTHING_ARMOR_MEDIUM
-	armor_bullet = CLOTHING_ARMOR_MEDIUM
-	armor_laser = CLOTHING_ARMOR_MEDIUM
-	armor_energy = CLOTHING_ARMOR_MEDIUM
-	armor_bomb = CLOTHING_ARMOR_MEDIUM
-	armor_bio = CLOTHING_ARMOR_MEDIUM
-	armor_rad = CLOTHING_ARMOR_MEDIUM
-	armor_internaldamage = CLOTHING_ARMOR_MEDIUM
-	flags_inventory = COVEREYES
-	flags_inv_hide = HIDEEARS
-	flags_armor_protection = 0
-	siemens_coefficient = 0.8
-
-/obj/item/clothing/head/helmet/HoS/dermal
-	name = "Dermal Armor Patch"
-	desc = "You're not quite sure how you manage to take it on and off, but it implants nicely in your head."
-	icon_state = "dermal"
-	item_state = "dermal"
-	siemens_coefficient = 0.6
-
-/obj/item/clothing/head/helmet/warden
-	name = "warden's hat"
-	desc = "It's a special helmet issued to the Warden of a security force. Protects the head from impacts."
-	icon_state = "policehelm"
-	flags_inventory = NO_FLAGS
-	flags_inv_hide = NO_FLAGS
-	flags_armor_protection = 0
-
-/obj/item/clothing/head/helmet/hop
-	name = "crew resource's hat"
-	desc = "A stylish hat that both protects you from enraged former-crewmembers and gives you a false sense of authority."
-	icon_state = "hopcap"
-	flags_inventory = NO_FLAGS
-	flags_inv_hide = NO_FLAGS
-	flags_armor_protection = 0
-
-/obj/item/clothing/head/helmet/formalcaptain
-	name = "parade hat"
-	desc = "No one in a commanding position should be without a perfect, white hat of ultimate authority."
-	icon_state = "officercap"
-	flags_inventory = NO_FLAGS
-	flags_inv_hide = NO_FLAGS
-	flags_armor_protection = 0
-
-/obj/item/clothing/head/helmet/swat
-	name = "\improper SWAT helmet"
-	desc = "They're often used by highly trained Swat Members."
-	icon_state = "swat"
-	item_state = "swat"
-	armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
-	armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
-	armor_laser = CLOTHING_ARMOR_MEDIUM
-	armor_energy = CLOTHING_ARMOR_MEDIUM
-	armor_bomb = CLOTHING_ARMOR_MEDIUM
-	armor_bio = CLOTHING_ARMOR_MEDIUM
-	armor_rad = CLOTHING_ARMOR_MEDIUM
-	armor_internaldamage = CLOTHING_ARMOR_MEDIUM
-	flags_inventory = COVEREYES|BLOCKSHARPOBJ
-	flags_inv_hide = HIDEEARS|HIDEEYES
-	flags_cold_protection = BODY_FLAG_HEAD
-	min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROT
-	siemens_coefficient = 0.5
-	anti_hug = 1
-
-/obj/item/clothing/head/helmet/thunderdome
-	name = "\improper Thunderdome helmet"
-	desc = "<i>'Let the battle commence!'</i>"
-	icon_state = "thunderdome"
-	flags_inventory = COVEREYES|BLOCKSHARPOBJ
-	flags_inv_hide = HIDEEARS|HIDEEYES
-	item_state = "thunderdome"
-	armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
-	armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
-	armor_laser = CLOTHING_ARMOR_MEDIUM
-	armor_energy = CLOTHING_ARMOR_MEDIUM
-	armor_bomb = CLOTHING_ARMOR_MEDIUM
-	armor_bio = CLOTHING_ARMOR_MEDIUM
-	armor_rad = CLOTHING_ARMOR_MEDIUM
-	armor_internaldamage = CLOTHING_ARMOR_MEDIUM
-	flags_cold_protection = BODY_FLAG_HEAD
-	min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROT
-	siemens_coefficient = 1
-
 /obj/item/clothing/head/helmet/gladiator
 	name = "gladiator helmet"
 	desc = "Ave, Imperator, morituri te salutant."
@@ -181,25 +94,6 @@
 	armor_rad = CLOTHING_ARMOR_LOW
 	armor_internaldamage = CLOTHING_ARMOR_MEDIUM
 
-/obj/item/clothing/head/helmet/tactical
-	name = "tactical helmet"
-	desc = "An armored helmet capable of being fitted with a multitude of attachments."
-	icon_state = "swathelm"
-	item_state = "helmet"
-	flags_inventory = COVEREYES|BLOCKSHARPOBJ
-	flags_inv_hide = HIDEEARS|HIDEEYES
-	anti_hug = 1
-	armor_melee = CLOTHING_ARMOR_MEDIUM
-	armor_bullet = CLOTHING_ARMOR_MEDIUM
-	armor_laser = CLOTHING_ARMOR_MEDIUMLOW
-	armor_energy = CLOTHING_ARMOR_MEDIUMLOW
-	armor_bomb = CLOTHING_ARMOR_LOW
-	armor_bio = CLOTHING_ARMOR_LOW
-	armor_rad = CLOTHING_ARMOR_LOW
-	armor_internaldamage = CLOTHING_ARMOR_MEDIUM
-	siemens_coefficient = 0.7
-
-
 //===========================//MARINES HELMETS\\=================================\\
 //=======================================================================\\
 
@@ -727,34 +621,11 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	button.overlays.Cut()
 	button.overlays += image('icons/obj/items/clothing/helmet_visors.dmi', button, action_icon_state)
 
-/obj/item/clothing/head/helmet/marine/tech
-	name = "\improper M10 technician helmet"
-	desc = "A modified M10 marine helmet for ComTechs. Features a toggleable welding screen for eye protection."
-	icon_state = "tech_helmet"
-	specialty = "M10 technician"
-	built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/welding_visor)
-
-/obj/item/clothing/head/helmet/marine/grey
-	desc = "A standard M10 Pattern Helmet. This one has not had a camouflage pattern applied to it yet. There is a built-in camera on the right side."
-	icon_state = "c_helmet"
-	item_state = "c_helmet"
-	flags_atom = NO_SNOW_TYPE
-
 /obj/item/clothing/head/helmet/marine/jungle
 	icon_state = "helmet"
 	item_state = "helmet"
 	flags_atom = NO_SNOW_TYPE
 
-/obj/item/clothing/head/helmet/marine/snow
-	icon_state = "s_helmet"
-	item_state = "s_helmet"
-	flags_atom = NO_SNOW_TYPE
-
-/obj/item/clothing/head/helmet/marine/desert
-	icon_state = "d_helmet"
-	item_state = "d_helmet"
-	flags_atom = NO_SNOW_TYPE
-
 /obj/item/clothing/head/helmet/marine/tech/tanker
 	name = "\improper Mk20 tanker helmet"
 	desc = "The older Mk20 Advanced Armored Crew Helmet is a variant of the precursor program to the Mk30, with a flipdown welding visor attached. Camera on the side and biometric transmitter ties into the sensor matrix."
@@ -807,11 +678,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	specialty = "M12 pattern"
 	max_inserted_visors = 2
 
-/obj/item/clothing/head/helmet/marine/rto/intel
-	name = "\improper XM12 pattern intelligence helmet"
-	desc = "An experimental brain-bucket. A dust ruffle hangs from back. Moderately better at deflecting blunt objects at the cost of humiliation, can also hold a second visor optic. But who will be laughing at the memorial? Not you, you'll be busy getting medals for your intel work."
-	specialty = "XM12 pattern intel"
-
 /obj/item/clothing/head/helmet/marine/specialist
 	name = "\improper B18 helmet"
 	desc = "Helmet and faceplate component of the B18 armor system. Nanobonded carbonfiber laminated with ultrahigh molecular density polymer, with an integral rebreather and heads up display."
@@ -927,29 +793,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	specialty = "M10 pattern military police"
 	built_in_visors = list(new /obj/item/device/helmet_visor/security)
 
-/obj/item/clothing/head/helmet/marine/MP/WO
-	name = "\improper M3 pattern chief MP helmet"
-	desc = "A well-crafted variant of the M10 Helmet typically distributed to Chief MPs. Useful for letting your men know who is in charge."
-	icon_state = "cmp_helmet"
-	item_state = "cmp_helmet"
-	specialty = "M10 pattern chief MP"
-
-/obj/item/clothing/head/helmet/marine/MP/SO
-	name = "\improper M10 pattern Officer Helmet"
-	desc = "A special variant of the M10 Pattern Helmet worn by Officers of the USCM, attracting the attention of the grunts and sniper fire alike."
-	icon_state = "helmet"
-	item_state = "helmet"
-	specialty = "M10 pattern officer"
-	built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced)
-
-/obj/item/clothing/head/helmet/marine/mp/provost/marshal
-	name = "\improper Provost Marshal Cap"
-	desc = "The expensive headwear of a Provost Marshal. Venlar lined, boron carbide tiled, tailored to wear semi-comfortably."
-	icon_state = "pvmarshalhat"
-	item_state = "pvmarshalhat"
-	flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
-	flags_inventory = BLOCKSHARPOBJ|FULL_DECAP_PROTECTION
-
 /obj/item/clothing/head/helmet/marine/sof
 	name = "\improper M09 Custom Helmet"
 	desc = "Partially due to old stocks, partially due to preference. USCM MARSOC commando ballistic helmet, customized and updated to mission requirements."
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 98b0c6980a..6c6b7cb6e1 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -1,61 +1,12 @@
-/obj/item/clothing/head/soft
-	name = "cargo cap"
-	desc = "It's a baseball hat in a tasteless yellow color."
-	icon_state = "cargosoft"
-	flags_inventory = COVEREYES
-	item_state = "helmet"
-	var/cap_color = "cargo"
-	var/flipped = 0
-	siemens_coefficient = 0.9
-	flags_armor_protection = 0
-
-/obj/item/clothing/head/soft/dropped()
-	icon_state = "[cap_color]soft"
-	flipped=0
-	..()
-
-/obj/item/clothing/head/soft/verb/flip()
-	set category = "Object"
-	set name = "Flip cap"
-	set src in usr
-	if(!usr.is_mob_incapacitated())
-		src.flipped = !src.flipped
-		if(src.flipped)
-			icon_state = "[cap_color]soft_flipped"
-			to_chat(usr, "You flip the hat backwards.")
-		else
-			icon_state = "[cap_color]soft"
-			to_chat(usr, "You flip the hat back in normal position.")
-		update_clothing_icon() //so our mob-overlays update
-
-/obj/item/clothing/head/soft/ferret
-	name = "\improper Ferret Heavy Industries trucker hat"
-	desc = "It's a trucker hat. They're becoming collector items since Ferret went under in 2180."
-	icon_state = "ferretsoft"
-	cap_color = "ferret"
-	black_market_value = 25
 
 /obj/item/clothing/head/soft/trucker
-	name = "\improper blue trucker hat"
+	name = "trucker hat"
 	desc = "It's a blue trucker hat."
 	icon_state = "truckercap_bluesoft"
 	cap_color = "truckercap_blue"
 
 /obj/item/clothing/head/soft/trucker/red
-	name = "\improper red trucker hat"
+	name = "trucker hat"
 	desc = "It's a red trucker hat."
 	icon_state = "truckercap_redsoft"
 	cap_color = "truckercap_red"
-
-/obj/item/clothing/head/soft/sec
-	name = "security cap"
-	desc = "It's baseball hat in tasteful red color."
-	icon_state = "secsoft"
-	cap_color = "sec"
-
-/obj/item/clothing/head/soft/sec/corp
-	name = "corporate security cap"
-	desc = "It's baseball hat in corporate colors."
-	icon_state = "corpsoft"
-	cap_color = "corp"
-
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 5b8d8f6b29..2b3e2842f9 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -39,7 +39,7 @@
 	item_state = "cbrn_hood"
 	flags_inv_hide = HIDEEARS|HIDEFACE|HIDEALLHAIR
 	item_icons = list(
-		WEAR_FACE = 'icons/mob/humans/onmob/head_1.dmi'
+		WEAR_FACE = 'icons/mob/humans/onmob/head-layer/head_marine.dmi'
 	)
 
 /obj/item/clothing/mask/gas/pmc
diff --git a/code/modules/clothing/suits/civilian_suit.dm b/code/modules/clothing/suits/civilian_suit.dm
index 1b564bf787..b64bd068ff 100644
--- a/code/modules/clothing/suits/civilian_suit.dm
+++ b/code/modules/clothing/suits/civilian_suit.dm
@@ -312,11 +312,11 @@
 	icon_state = "hazard_blue"
 	item_state = "hazard_blue"
 
-/obj/item/clothing/suit/storage/hazardvest/yellow
-	name = "yellow hazard vest"
-	desc = "A yellow high-visibility vest used in work zones."
-	icon_state = "hazard_yellow"
-	item_state = "hazard_yellow"
+/obj/item/clothing/suit/storage/hazardvest/weymart
+	name = "\improper WeyMart vest"
+	desc = "A WeyMart employee vest."
+	icon_state = "hazard_weymart"
+	item_state = "hazard_weymart"
 
 /obj/item/clothing/suit/storage/hazardvest/black
 	name = "black hazard vest"
diff --git a/code/modules/clothing/suits/clf_suit.dm b/code/modules/clothing/suits/clf_suit.dm
index 553e4d66b1..ef87918d4b 100644
--- a/code/modules/clothing/suits/clf_suit.dm
+++ b/code/modules/clothing/suits/clf_suit.dm
@@ -29,7 +29,7 @@
 		/obj/item/device/motiondetector,
 		/obj/item/device/walkman,
 	)
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/mercenary)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/mercenary)
 	item_state_slots = list(WEAR_JACKET = "mercenary_heavy_armor")
 
 /obj/item/clothing/suit/storage/marine/veteran/mercenary/heavy
@@ -64,7 +64,7 @@
 		/obj/item/device/motiondetector,
 		/obj/item/device/walkman,
 	)
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/mercenary)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/mercenary)
 	item_state_slots = list(WEAR_JACKET = "mercenary_miner_armor")
 
 /obj/item/clothing/suit/storage/marine/veteran/mercenary/support
@@ -83,7 +83,7 @@
 	armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
 	armor_energy = CLOTHING_ARMOR_MEDIUMLOW
 	storage_slots = 2
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/freelancer)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/freelancer)
 
 //this one is for CLF
 /obj/item/clothing/suit/storage/militia
diff --git a/code/modules/clothing/suits/gimmick_suit.dm b/code/modules/clothing/suits/gimmick_suit.dm
index c1225b84d7..531a91e03c 100644
--- a/code/modules/clothing/suits/gimmick_suit.dm
+++ b/code/modules/clothing/suits/gimmick_suit.dm
@@ -8,7 +8,7 @@
 	armor_rad = CLOTHING_ARMOR_MEDIUM
 	storage_slots = 2
 	slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/bear)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/bear)
 
 /obj/item/clothing/suit/storage/marine/veteran/dutch
 	name = "\improper D2 armored vest"
@@ -23,7 +23,7 @@
 	storage_slots = 2
 	light_range = 7
 	slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/dutch)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/dutch)
 
 /obj/item/clothing/suit/armor/gimmick/dutch
 	name = "armored jacket"
@@ -64,7 +64,7 @@
 	slowdown = SLOWDOWN_ARMOR_LIGHT
 	storage_slots = 2
 	movement_compensation = SLOWDOWN_ARMOR_LIGHT
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/van_bandolier)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/van_bandolier)
 	allowed = list(
 		/obj/item/weapon/gun,
 		/obj/item/tank/emergency_oxygen,
@@ -136,7 +136,7 @@
 	armor_bio = CLOTHING_ARMOR_LOW
 	armor_rad = CLOTHING_ARMOR_LOW
 	armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/dutch)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/dutch)
 
 /obj/item/clothing/suit/gimmick/jason
 	name = "musty jacket"
diff --git a/code/modules/clothing/suits/upp_suit.dm b/code/modules/clothing/suits/upp_suit.dm
index 8459b9a0a7..f392ff15ce 100644
--- a/code/modules/clothing/suits/upp_suit.dm
+++ b/code/modules/clothing/suits/upp_suit.dm
@@ -31,7 +31,7 @@
 	armor_rad = CLOTHING_ARMOR_MEDIUMLOW
 	armor_internaldamage = CLOTHING_ARMOR_HIGH
 	storage_slots = 3
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP, /obj/item/clothing/under/marine/veteran/UPP/medic, /obj/item/clothing/under/marine/veteran/UPP/engi)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/UPP, /obj/item/clothing/under/marine/opfor/UPP/medic, /obj/item/clothing/under/marine/opfor/UPP/engi)
 
 /obj/item/clothing/suit/storage/marine/faction/UPP/support
 	name = "\improper UL6 personal armor"
@@ -91,7 +91,7 @@
 	armor_rad = CLOTHING_ARMOR_LOW
 	armor_internaldamage = CLOTHING_ARMOR_LOW
 	storage_slots = 3
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP/officer)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/UPP/officer)
 
 /obj/item/clothing/suit/storage/marine/faction/UPP/kapitan
 	name = "\improper UL4 senior officer jacket"
@@ -107,7 +107,7 @@
 	armor_internaldamage = CLOTHING_ARMOR_LOW
 	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
 	storage_slots = 4
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP/officer)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/UPP/officer)
 
 /obj/item/clothing/suit/storage/marine/faction/UPP/mp
 	name = "\improper UL4 camouflaged jacket"
@@ -123,7 +123,7 @@
 	armor_rad = CLOTHING_ARMOR_LOW
 	armor_internaldamage = CLOTHING_ARMOR_LOW
 	storage_slots = 4
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/UPP)
 	valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL)
 	restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)
 
@@ -156,7 +156,7 @@
 	armor_bio = CLOTHING_ARMOR_MEDIUM
 	armor_rad = CLOTHING_ARMOR_MEDIUMLOW
 	armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP, /obj/item/clothing/under/marine/veteran/UPP/medic, /obj/item/clothing/under/marine/veteran/UPP/engi)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/UPP, /obj/item/clothing/under/marine/opfor/UPP/medic, /obj/item/clothing/under/marine/opfor/UPP/engi)
 	allowed = list(
 		/obj/item/tank/emergency_oxygen,
 		/obj/item/device/flashlight,
diff --git a/code/modules/clothing/suits/weyland_suit.dm b/code/modules/clothing/suits/weyland_suit.dm
index c379ce6a9c..b38df6ea0a 100644
--- a/code/modules/clothing/suits/weyland_suit.dm
+++ b/code/modules/clothing/suits/weyland_suit.dm
@@ -31,7 +31,7 @@
 		/obj/item/tool/crew_monitor,
 		/obj/item/device/walkman,
 	)
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/pmc)
 	item_state_slots = list(WEAR_JACKET = "pmc_armor")
 
 /obj/item/clothing/suit/storage/marine/veteran/pmc/light
@@ -70,7 +70,7 @@
 	name = "\improper M4 pattern PMC leader armor"
 	desc = "A modification of the standard Armat Systems M3 armor. Designed for high-profile security operators and corporate mercenaries in mind. This particular suit looks like it belongs to a high-ranking officer."
 	icon_state = "officer_armor"
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc/leader)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/pmc/leader)
 	item_state_slots = list(WEAR_JACKET = "officer_armor")
 
 /obj/item/clothing/suit/storage/marine/veteran/pmc/sniper
@@ -132,7 +132,7 @@
 	armor_rad = CLOTHING_ARMOR_MEDIUMHIGH
 	armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
 	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc/commando)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/pmc/commando)
 	item_state_slots = list(WEAR_JACKET = "commando_armor")
 	unacidable = TRUE
 
@@ -150,6 +150,6 @@
 	armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
 	flags_inventory = BLOCK_KNOCKDOWN
 	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET
-	uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc/commando)
+	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/pmc/commando)
 	item_state_slots = list(WEAR_JACKET = "commando_armor")
 	unacidable = TRUE
diff --git a/code/modules/clothing/under/civilian_uniform.dm b/code/modules/clothing/under/civilian_uniform.dm
index 005aef445c..e66ebb51f5 100644
--- a/code/modules/clothing/under/civilian_uniform.dm
+++ b/code/modules/clothing/under/civilian_uniform.dm
@@ -53,31 +53,27 @@
 	worn_state = "workwear_grey"
 
 /obj/item/clothing/under/workwear/khaki
-	name = "workwear"
 	desc = "A pair of jeans paired with a khaki workshirt."
 	icon_state = "workwear_khaki"
 	worn_state = "workwear_khaki"
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
 
 /obj/item/clothing/under/workwear/pink
-	name = "workwear"
 	desc = "A pair of jeans paired with a pink workshirt."
 	icon_state = "workwear_pink"
 	worn_state = "workwear_pink"
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
 
 /obj/item/clothing/under/workwear/alt
-	name = "workwear"
 	desc = "A pair of brown canvas workpants paired with a dark blue workshirt."
 	icon_state = "workwear_alt"
 	worn_state = "workwear_alt"
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
 
 /obj/item/clothing/under/workwear/blue
-	name = "workwear"
 	desc = "A pair of jeans paired with a light blue workshirt."
-	icon_state = "workwear_green"
-	worn_state = "workwear_green"
+	icon_state = "workwear_blue"
+	worn_state = "workwear_blue"
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
 
 /obj/item/clothing/under/workwear/cuppajoe
diff --git a/code/modules/clothing/under/gimmick.dm b/code/modules/clothing/under/gimmick.dm
index ccf6c4d513..82c3ec5dab 100644
--- a/code/modules/clothing/under/gimmick.dm
+++ b/code/modules/clothing/under/gimmick.dm
@@ -32,7 +32,7 @@
 	flags_cold_protection = BODY_FLAG_LEGS|BODY_FLAG_GROIN
 	flags_heat_protection = BODY_FLAG_LEGS|BODY_FLAG_GROIN
 
-/obj/item/clothing/under/marine/veteran/dutch
+/obj/item/clothing/under/marine/opfor/dutch
 	name = "\improper Dutch's Dozen uniform"
 	desc = "A comfortable uniform worn by the Dutch's Dozen mercenaries. It's seen some definite wear and tear, but is still in good condition."
 	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS
@@ -44,10 +44,10 @@
 	suit_restricted = list(/obj/item/clothing/suit/storage/marine/veteran/dutch, /obj/item/clothing/suit/armor/vest/dutch)
 
 
-/obj/item/clothing/under/marine/veteran/dutch/ranger
+/obj/item/clothing/under/marine/opfor/dutch/ranger
 	icon_state = "dutch_jumpsuit2"
 
-/obj/item/clothing/under/marine/veteran/van_bandolier
+/obj/item/clothing/under/marine/opfor/van_bandolier
 	name = "hunting clothes"
 	desc = "A set of tailored clothes, made from fine but sturdy reinforced fabrics. Protects from thorns, weather, and the cuts and scrapes that forever bedevil outdoorsmen."
 	icon_state = "van_bandolier"
diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm
index 9970eeca06..bcf573fa34 100644
--- a/code/modules/clothing/under/marine_uniform.dm
+++ b/code/modules/clothing/under/marine_uniform.dm
@@ -18,6 +18,7 @@
 	armor_rad = CLOTHING_ARMOR_NONE
 	armor_internaldamage = CLOTHING_ARMOR_LOW
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
+	contained_sprite = TRUE
 	///Makes it so that we can see the right name in the vendor.
 	var/specialty = "USCM"
 	///List of map variants that use sleeve rolling on something else, like snow uniforms rolling the collar, and therefore shouldn't hide patches etc when rolled.
@@ -30,7 +31,7 @@
 	if(!(flags_atom & NO_NAME_OVERRIDE))
 		name = "[specialty]"
 		if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
-			name += " snow uniform"
+			name += " cold-weather uniform"
 		else
 			name += " uniform"
 	if(!(flags_atom & NO_SNOW_TYPE))
@@ -52,12 +53,45 @@
 /obj/item/clothing/under/marine/standard
 	flags_atom = NO_SNOW_TYPE
 
-/obj/item/clothing/under/marine/standard
+/obj/item/clothing/under/marine/tattered
+	desc = "Torn, Burned and blood stained. This uniform has seen much more than you could possibly imagine."
+	icon_state = "damage_marine_jumpsuit"
+	worn_state = "damage_marine_jumpsuit"
 	flags_atom = NO_SNOW_TYPE
 
+/obj/item/clothing/under/marine/tattered/Initialize(mapload)
+	. = ..()
+	var/R = rand(1,4)
+	switch(R) //this is no longer shitcode, courtesy of stan_albatross
+		if(1)
+			roll_suit_sleeves(FALSE)
+		if(2)
+			roll_suit_jacket(FALSE)
+		if(3)
+			cut_suit_jacket(FALSE)
+
+/obj/item/clothing/under/marine/operations
+	name = "\improper USCM operations uniform"
+	desc = "It's a standard-issue Marine Corps battle dress uniform featuring venlar armor inserts at critical areas to protect from blades and ballistics. This one is issued to Officers and Dropship crews."
+	icon_state = "command_jumpsuit"
+	item_state = "command_jumpsuit"
+	worn_state = "command_jumpsuit"
+	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
+	flags_atom = NO_SNOW_TYPE
+	specialty = "marine operations"
+
+/obj/item/clothing/under/marine/marsoc
+	name = "\improper USCM battle dress uniform"
+	desc = "It's a standard-issue Marine Corps battle dress uniform featuring venlar armor inserts at critical areas to protect from blades and ballistics."
+	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
+	icon_state = "marine_raider"
+	worn_state = "marine_raider"
+	specialty = "MARSOC uniform"
+	flags_item = NO_SNOW_TYPE
+
 /obj/item/clothing/under/marine/service
 	name = "\improper USCM service uniform"
-	desc = "Standard issue Marine service uniform."
+	desc = "It's a standard-issue Marine Corps service uniform offering no defensive qualities."
 	icon_state = "marine_service"
 	item_state = "marine_service"
 	worn_state = "marine_service"
@@ -73,22 +107,12 @@
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
 	flags_atom = NO_SNOW_TYPE
 
-/obj/item/clothing/under/marine/operations
-	name = "\improper USCM operations uniform"
-	desc = "It's a standard-issue Marine Corps battle dress uniform featuring venlar armor inserts at critical areas to protect from blades and ballistics. This one is issued to Officers and Dropship crews."
-	icon_state = "command_jumpsuit"
-	item_state = "command_jumpsuit"
-	worn_state = "command_jumpsuit"
-	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
-	specialty = "marine operations"
-
 /obj/item/clothing/under/marine/blues
-	name = "marine enlisted dress blues"
+	name = "\improper USCM enlisted dress blues"
 	desc = "The undershirt and trousers of the legendary Marine dress blues, virtually unchanged since the 19th century. This unadorned variant is for enlisted personnel, E-1 thru E-3."
-	icon = 'icons/mob/humans/onmob/uniform-layer/uniform_marine.dmi'
-	icon_state = "marine_blues_un"
-	item_state = "marine_blues_un"
-	worn_state = "marine_blues_un"
+	icon_state = "marine_blues"
+	item_state = "marine_blues"
+	worn_state = "marine_blues"
 	armor_melee = CLOTHING_ARMOR_NONE
 	armor_bullet = CLOTHING_ARMOR_NONE
 	armor_laser = CLOTHING_ARMOR_NONE
@@ -97,71 +121,28 @@
 	armor_bio = CLOTHING_ARMOR_NONE
 	armor_rad = CLOTHING_ARMOR_NONE
 	armor_internaldamage = CLOTHING_ARMOR_NONE
-	contained_sprite = TRUE
 	item_state_slots = null
+	flags_atom = NO_SNOW_TYPE
 
 /obj/item/clothing/under/marine/blues/nco
-	name = "marine senior dress blues uniform"
+	name = "\improper USCM senior dress blues uniform"
 	desc = "The undershirt and trousers of the legendary Marine dress blues, virtually unchanged since the 19th century. This variant features the iconic Blood Stripe, worn by NCOs and officers."
-	icon_state = "marine_officer_blues_un"
-	item_state = "marine_officer_blues_un"
-	worn_state = "marine_officer_blues_un"
+	icon_state = "marine_officer_blues"
+	item_state = "marine_officer_blues"
+	worn_state = "marine_officer_blues"
 
-/obj/item/clothing/under/marine/tattered
-	name = "\improper tattered USCM uniform"
-	desc = "Torn, Burned and blood stained. This uniform has seen much more than you could possibly imagine."
-	icon_state = "recon_marine"
-	worn_state = "recon_marine"
-	flags_atom = NO_SNOW_TYPE
-
-/obj/item/clothing/under/marine/reconnaissance/Initialize(mapload)
-	. = ..()
-	var/R = rand(1,4)
-	switch(R) //this is no longer shitcode, courtesy of stan_albatross
-		if(1)
-			roll_suit_sleeves(FALSE)
-		if(2)
-			roll_suit_jacket(FALSE)
-		if(3)
-			cut_suit_jacket(FALSE)
-
-
-//=========================//RESPONDERS\\================================\\
+//=========================//\\================================\\
 //=======================================================================\\
 
-/obj/item/clothing/under/marine/veteran
+/obj/item/clothing/under/marine/opfor
 	flags_jumpsuit = FALSE
-	flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE //Let's make them keep their original name.
-
-//=========================//Marine Raiders\\================================\\
-
-/obj/item/clothing/under/marine/veteran/marsoc
-	name = "SOF Uniform"
-	desc = "MARSOC standard uniform, in a dark camouflage pattern. Venlar liners provide slight protection from ballistics or blades."
-	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
-	icon_state = "marsoc"
-	worn_state = "marsoc"
-	specialty = "sof uniform"
-	flags_item = NO_SNOW_TYPE
+	flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
 
 //=========================//UPP\\================================\\
 
-/obj/item/clothing/under/marine/veteran/bear
-	name = "\improper Iron Bear uniform"
-	desc = "A uniform worn by Iron Bears mercenaries in the service of Mother Russia. Smells a little like an actual bear."
-	icon_state = "bear_jumpsuit"
-	worn_state = "bear_jumpsuit"
-	min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
-	has_sensor = UNIFORM_NO_SENSORS
-	suit_restricted = list(/obj/item/clothing/suit/storage/marine/veteran/bear)
-
-	item_icons = list(
-		WEAR_BODY = 'icons/mob/humans/onmob/uniform_0.dmi',
-	)
-
-/obj/item/clothing/under/marine/veteran/UPP
+/obj/item/clothing/under/marine/opfor/UPP
 	name = "\improper UPP fatigues"
-	desc = "A set of UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm."
+	desc = "It's a set of standard-issue Naval Infantry fatigues featuring venlar armor inserts at critical areas to protect from blades and ballistics."
 	icon = 'icons/mob/humans/onmob/uniform-layer/uniform_upp.dmi'
 	icon_state = "upp_uniform"
 	worn_state = "upp_uniform"
@@ -171,53 +152,22 @@
 	suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/UPP, /obj/item/clothing/suit/gimmick/jason, /obj/item/clothing/suit/storage/snow_suit/soviet, /obj/item/clothing/suit/storage/snow_suit/survivor, /obj/item/clothing/suit/storage/webbing, /obj/item/clothing/suit/storage/marine/smartgunner/upp)
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
 
-/obj/item/clothing/under/marine/veteran/UPP/boiler
-	name = "\improper UPP operations fatigues"
-	desc = "A set of UPP operations fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm."
-	icon_state = "upp_boiler"
-	worn_state = "upp_boiler"
-	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
-
-/obj/item/clothing/under/marine/veteran/UPP/medic
-	name = "\improper UPP medic fatigues"
-	desc = "A set of medic UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm."
-	icon_state = "upp_uniform_medic"
-	worn_state = "upp_uniform_medic"
-	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
-
-/obj/item/clothing/under/marine/veteran/UPP/engi
-	name = "\improper UPP engineer fatigues"
-	desc = "A set of Engineer UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm."
-	icon_state = "upp_uniform_engi"
-	worn_state = "upp_uniform_engi"
-	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
-
-/obj/item/clothing/under/marine/veteran/UPP/mp
+/obj/item/clothing/under/marine/opfor/UPP/mp
 	name = "\improper UPP Military Police fatigues"
 	desc = "A set of Military Police UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm."
 	icon_state = "upp_uniform_mp"
 	worn_state = "upp_uniform_mp"
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
 
-/obj/item/clothing/under/marine/veteran/UPP/officer
+/obj/item/clothing/under/marine/opfor/UPP/officer
 	name = "\improper UPP Officer fatigues"
 	desc = "A set of Officer UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm."
 	icon_state = "upp_uniform_officer"
 	worn_state = "upp_uniform_officer"
 
-//=========================//Freelancer\\================================\\
-
-/obj/item/clothing/under/marine/veteran/freelancer
-	name = "\improper freelancer fatigues"
-	desc = "A set of loose-fitting fatigues, perfect for an informal mercenary. Smells like gunpowder, apple pie, and covered in grease and sake stains."
-	icon_state = "freelancer_uniform"
-	worn_state = "freelancer_uniform"
-	min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
-	has_sensor = UNIFORM_NO_SENSORS
-
 //=========================//Dutch Dozen\\================================\\
 
-/obj/item/clothing/under/marine/veteran/dutch
+/obj/item/clothing/under/marine/opfor/dutch
 	name = "\improper Dutch's Dozen uniform"
 	desc = "A comfortable uniform worn by the Dutch's Dozen mercenaries. It's seen some definite wear and tear, but is still in good condition."
 	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS
@@ -229,10 +179,10 @@
 	suit_restricted = list(/obj/item/clothing/suit/storage/marine/veteran/dutch, /obj/item/clothing/suit/armor/vest/dutch)
 
 
-/obj/item/clothing/under/marine/veteran/dutch/ranger
+/obj/item/clothing/under/marine/opfor/dutch/ranger
 	icon_state = "dutch_jumpsuit2"
 
-/obj/item/clothing/under/marine/veteran/van_bandolier
+/obj/item/clothing/under/marine/opfor/van_bandolier
 	name = "hunting clothes"
 	desc = "A set of tailored clothes, made from fine but sturdy reinforced fabrics. Protects from thorns, weather, and the cuts and scrapes that forever bedevil outdoorsmen."
 	icon_state = "van_bandolier"
@@ -243,7 +193,7 @@
 
 //=========================//OWLF\\================================\\
 
-/obj/item/clothing/under/marine/veteran/owlf
+/obj/item/clothing/under/marine/opfor/owlf
 	name = "\improper OWLF thermal field uniform"
 	desc = "A high-tech uniform with built-in thermal cloaking technology. It looks like it's worth more than your life."
 	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS //This is all a copy and paste of the Dutch's stuff for now.
@@ -257,7 +207,7 @@
 //===========================//HELGHAST - MERCENARY\\================================\\
 //=====================================================================\\
 
-/obj/item/clothing/under/marine/veteran/mercenary
+/obj/item/clothing/under/marine/opfor/mercenary
 	name = "\improper Mercenary fatigues"
 	desc = "A thick, beige suit with a red armband. There is an unknown symbol is emblazed on the suit."
 	icon_state = "mercenary_heavy_uniform"
@@ -265,13 +215,13 @@
 	min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
 	suit_restricted = list(/obj/item/clothing/suit/storage/marine/veteran/mercenary)
 
-/obj/item/clothing/under/marine/veteran/mercenary/miner
+/obj/item/clothing/under/marine/opfor/mercenary/miner
 	name = "\improper Mercenary miner fatigues"
 	desc = "A beige suit with a red armband. It looks a little thin, like it wasn't designed for protection. There is an unknown symbol is emblazed on the suit."
 	icon_state = "mercenary_miner_uniform"
 	worn_state = "mercenary_miner_uniform"
 
-/obj/item/clothing/under/marine/veteran/mercenary/support
+/obj/item/clothing/under/marine/opfor/mercenary/support
 	name = "\improper Mercenary engineer fatigues"
 	desc = "A blue suit with yellow accents, used by engineers. There is an unknown symbol is emblazed on the suit."
 	icon_state = "mercenary_engineer_uniform"
@@ -280,13 +230,6 @@
 
 ////// Civilians /////////
 
-/obj/item/clothing/under/souto
-	name = "\improper Souto Man's cargo pants"
-	desc = "The white cargo pants worn by the one and only Souto man. As cool as an ice cold can of Souto Grape!"
-	icon_state = "souto_man"
-	worn_state = "souto_man"
-	has_sensor = UNIFORM_NO_SENSORS
-
 /obj/item/clothing/under/marine/reporter
 	name = "combat correspondent uniform"
 	desc = "A relaxed and robust uniform fit for any potential reporting needs."
@@ -296,16 +239,6 @@
 	contained_sprite = TRUE
 	flags_atom = NO_NAME_OVERRIDE
 
-/obj/item/clothing/under/synthetic/flight
-	name = "tactical flightsuit"
-	desc = "A flightsuit with plenty of leather straps, pouches, and other essential gear."
-	icon_state = "pilot_flightsuit_alt"
-	item_state = "pilot_flightsuit_alt"
-	worn_state = "pilot_flightsuit_alt"
-	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
-	flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
-	flags_cold_protection = ICE_PLANET_MIN_COLD_PROT
-
 /obj/item/clothing/under/synthetic/joe
 	name = "\improper Working Joe Uniform"
 	desc = "A cheap uniform made for Synthetic labor. Tomorrow, Together."
@@ -336,20 +269,20 @@
 
 //=ROYAL MARINES=\\
 
-/obj/item/clothing/under/marine/veteran/royal_marine
+/obj/item/clothing/under/marine/opfor/royal_marine
 	name = "royal marines commando uniform"
-	desc = "The field uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar USCM equipment."
+	desc = "It's a standard-issue Royal Marine Commando battle dress uniform featuring venlar armor inserts at critical areas to protect from blades and ballistics."
 	icon_state = "rmc_uniform"
 	worn_state = "rmc_uniform"
 	flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
 	contained_sprite = TRUE
 	icon = 'icons/mob/humans/onmob/contained/royal_marines_commando.dmi'
 
-/obj/item/clothing/under/marine/veteran/royal_marine/tl
+/obj/item/clothing/under/marine/opfor/royal_marine/tl
 	icon_state = "rmc_uniform_teaml"
 	worn_state = "rmc_uniform_teaml"
 
-/obj/item/clothing/under/marine/veteran/royal_marine/lt
+/obj/item/clothing/under/marine/opfor/royal_marine/lt
 	name = "royal marines commando officers uniform"
 	desc = "The officers uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar USCM equipment."
 	icon_state = "rmc_uniform_lt"
diff --git a/code/modules/clothing/under/weyland_uniform.dm b/code/modules/clothing/under/weyland_uniform.dm
index da9603e53a..640096bc8c 100644
--- a/code/modules/clothing/under/weyland_uniform.dm
+++ b/code/modules/clothing/under/weyland_uniform.dm
@@ -1,6 +1,6 @@
 //=========================//PMC\\================================\\
 
-/obj/item/clothing/under/marine/veteran/pmc
+/obj/item/clothing/under/marine/opfor/pmc
 	name = "\improper PMC fatigues"
 	desc = "A white set of fatigues, designed for private security operators. The symbol of the Weyland-Yutani corporation is emblazed on the suit."
 	icon_state = "pmc_jumpsuit"
@@ -8,20 +8,20 @@
 	min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
 
-/obj/item/clothing/under/marine/veteran/pmc/leader
+/obj/item/clothing/under/marine/opfor/pmc/leader
 	name = "\improper PMC command fatigues"
 	desc = "A white set of fatigues, designed for private security operators. The symbol of the Weyland-Yutani corporation is emblazed on the suit. This particular suit looks like it belongs to a high-ranking officer."
 	icon_state = "officer_jumpsuit"
 	worn_state = "officer_jumpsuit"
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
 
-/obj/item/clothing/under/marine/veteran/pmc/commando
+/obj/item/clothing/under/marine/opfor/pmc/commando
 	name = "\improper PMC commando uniform"
 	desc = "An armored uniform worn by Weyland-Yutani elite commandos. It is well protected while remaining light and comfortable."
 	icon_state = "commando_jumpsuit"
 	worn_state = "commando_jumpsuit"
 
-/obj/item/clothing/under/marine/veteran/pmc/corporate
+/obj/item/clothing/under/marine/opfor/pmc/corporate
 	name = "\improper WY corporate security uniform"
 	desc = "An armored uniform worn by Weyland-Yutani corporate security members. This variant is commonly worn by what are known as 'goons'."
 	icon = 'icons/mob/humans/onmob/contained/wy_goons.dmi'
@@ -32,7 +32,7 @@
 	item_state_slots = null
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
 
-/obj/item/clothing/under/marine/veteran/pmc/corporate/lead
+/obj/item/clothing/under/marine/opfor/pmc/corporate/lead
 	desc = "An armored uniform worn by Weyland-Yutani corporate security members. This variant is commonly worn by the lead of the 'goonsquad', as they are colloquially known."
 	icon_state = "lead_uniform"
 	item_state = "lead_uniform"
diff --git a/code/modules/cm_marines/Donator_Kits.dm b/code/modules/cm_marines/Donator_Kits.dm
deleted file mode 100644
index 01acf638c2..0000000000
--- a/code/modules/cm_marines/Donator_Kits.dm
+++ /dev/null
@@ -1,588 +0,0 @@
-/obj/item/storage/box/donator_kit
-	name = "donated box"
-	desc = "A cardboard box stamped with a dollar sign and filled with trinkets. Appears to have been donated by a wealthy sponsor."
-	icon_state = "donator_kit"
-	item_state = "giftbag"
-	var/list/donor_gear = list()
-	var/donor_key = "GENERIC" //Key the kit is assigned to. If GENERIC, not tied to particular donor.
-	var/kit_variant
-	max_w_class = SIZE_TINY
-
-/obj/item/storage/box/donator_kit/New()
-	if(kit_variant)
-		name = "[name] ([kit_variant])"
-	..()
-
-/obj/item/storage/box/donator_kit/fill_preset_inventory()
-	for(var/donor_item in donor_gear)
-		new donor_item(src)
-
-/obj/item/storage/box/donator_kit/open(mob/user)
-	if((donor_key != "GENERIC") && (donor_key != user.ckey))
-		to_chat(user, SPAN_BOLDWARNING("You cannot open a donator kit you do not own!"))
-		return FALSE
-	..()
-
-/obj/item/storage/box/donator_kit/verb/destroy_kit()
-	set name = "Destroy Kit"
-	set category = "Object"
-	set src in oview(1)
-
-	var/mob/user = usr
-
-	if((donor_key != "GENERIC") && (donor_key != user.ckey))
-		to_chat(user, SPAN_BOLDWARNING("You cannot destroy a donator kit you do not own!"))
-		return FALSE
-
-	log_admin("[key_name(user)] deleted a donator kit.")
-	qdel(src)
-
-/obj/item/storage/box/donator_kit/generic_omega //Generic set given to various donors
-	kit_variant = "Team Omega (G)"
-	donor_gear = list(
-		/obj/item/clothing/under/marine/fluff/standard_jumpsuit,
-		/obj/item/clothing/suit/storage/marine/fluff/standard_armor,
-		/obj/item/clothing/head/helmet/marine/fluff/standard_helmet,
-	)
-
-//Unless specified in comments as otherwise, subtype of box/donator_kit/ is CKEY of the donator (example: /obj/item/storage/box/donator_kit/sasoperative)
-/obj/item/storage/box/donator_kit/adjective
-	donor_key = "adjective"
-	donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/adjective)
-
-/obj/item/storage/box/donator_kit/alexwarhammer
-	donor_key = "alexwarhammer"
-	donor_gear = list(/obj/item/clothing/glasses/fluff/alexwarhammer)
-
-/obj/item/storage/box/donator_kit/allan1234
-	donor_key = "allan1234"
-	donor_gear = list(/obj/item/clothing/under/marine/fluff/allan1234)
-
-/obj/item/storage/box/donator_kit/arachnidnexus
-	donor_key = "arachnidnexus"
-	donor_gear = list(/obj/item/clothing/under/marine/fluff/arach)
-
-/obj/item/storage/box/donator_kit/bibblesless
-	donor_key = "bibblesless"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/bibblesless)
-
-/obj/item/storage/box/donator_kit/biolock
-	donor_key = "biolock"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/biolock,
-		/obj/item/clothing/suit/storage/marine/light/fluff/biolock,
-	)
-
-/obj/item/storage/box/donator_kit/bunny232
-	donor_key = "bunny232"
-	donor_gear = list(/obj/item/clothing/glasses/fluff/eyepatch)
-
-/obj/item/storage/box/donator_kit/bwoincognito
-	donor_key = "bwoincognito"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/bwoincognito,
-		/obj/item/clothing/suit/storage/marine/fluff/bwoincognito,
-		/obj/item/clothing/under/marine/fluff/bwoincognito,
-	)
-
-/obj/item/storage/box/donator_kit/chris1464
-	donor_key = "chris1464"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/chris1464,
-		/obj/item/clothing/suit/storage/marine/fluff/chris1464,
-		/obj/item/clothing/under/marine/fluff/chris1464,
-	)
-
-/obj/item/storage/box/donator_kit/commandercookies
-	donor_key = "commandercookies"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/commandercookies,
-		/obj/item/clothing/suit/storage/marine/fluff/commandercookies,
-	)
-
-/obj/item/storage/box/donator_kit/commissar //used by both ckeys 'hycinth' and 'technokat'
-	donor_key = "hycinth"
-	kit_variant = "Commissar"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/commissar,
-		/obj/item/clothing/suit/storage/marine/fluff/commissar,
-		/obj/item/clothing/under/marine/fluff/commissar,
-		/obj/item/storage/belt/marine/fluff/commissar,
-	)
-
-/obj/item/storage/box/donator_kit/commissar/technokat
-	donor_key = "technokat"
-
-/obj/item/storage/box/donator_kit/crazyh206
-	donor_key = "crazyh206"
-	donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/crazyh206)
-
-/obj/item/storage/box/donator_kit/devilzhand
-	donor_key = "devilzhand"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/devilzhand,
-		/obj/item/clothing/suit/storage/marine/fluff/devilzhand,
-	)
-
-/obj/item/storage/box/donator_kit/dingledangle
-	donor_key = "dingledangle"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/dingledangle)
-
-/obj/item/storage/box/donator_kit/dinobubba7
-	donor_key = "dinobubba7"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/dino,
-		/obj/item/clothing/suit/storage/marine/fluff/dino,
-	)
-
-/obj/item/storage/box/donator_kit/docdemo
-	donor_key = "docdemo"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/goldtrimberet)
-
-/obj/item/storage/box/donator_kit/dudewithatude
-	donor_key = "dudewithatude"
-	donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/dudewithatude)
-
-/obj/item/storage/box/donator_kit/eastgermanstasi
-	donor_key = "eastgermanstasi"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/eastgerman)
-
-/obj/item/storage/box/donator_kit/edgelord
-	donor_key = "edgelord"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/edgelord)
-
-/obj/item/storage/box/donator_kit/eonoc
-	donor_key = "eonoc"
-	donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/eonoc)
-
-/obj/item/storage/box/donator_kit/fairedan
-	donor_key = "fairedan"
-	donor_gear = list(
-		/obj/item/clothing/suit/storage/marine/fluff/fairedan,
-		/obj/item/clothing/under/marine/fluff/fairedan,
-	)
-
-/obj/item/storage/box/donator_kit/feodrich
-	donor_key = "feodrich"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/feodrich,
-		/obj/item/clothing/shoes/marine/fluff/feodrich,
-		/obj/item/clothing/suit/storage/marine/fluff/feodrich,
-		/obj/item/clothing/under/marine/fluff/feodrich,
-	)
-
-/obj/item/storage/box/donator_kit/fernkiller
-	donor_key = "fernkiller"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/fernkiller)
-
-/obj/item/storage/box/donator_kit/feweh
-	donor_key = "feweh"
-	donor_gear = list(
-		/obj/item/clothing/mask/fluff/feweh,
-		/obj/item/clothing/suit/storage/marine/fluff/feweh,
-		/obj/item/clothing/under/marine/fluff/feweh,
-	)
-
-/obj/item/storage/box/donator_kit/fickmacher_selena //ckey fickmacher has two sets
-	donor_key = "fickmacher"
-	kit_variant = "Selena"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/fickmacher,
-		/obj/item/clothing/suit/storage/marine/fluff/fickmacher,
-		/obj/item/clothing/under/marine/fluff/fickmacher,
-	)
-
-/obj/item/storage/box/donator_kit/fickmacher_hart
-	donor_key = "fickmacher"
-	kit_variant = "Hart"
-	donor_gear = list(
-		/obj/item/clothing/mask/fluff/fickmacher2,
-		/obj/item/clothing/suit/storage/marine/fluff/fickmacher2,
-		/obj/item/clothing/under/marine/fluff/fickmacher2,
-	)
-
-/obj/item/storage/box/donator_kit/fridrich
-	donor_key = "fridrich"
-	donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/fridrich)
-
-/obj/item/storage/box/donator_kit/ghostdex
-	donor_key = "ghostdex"
-	donor_gear = list(
-		/obj/item/clothing/mask/cigarette/fluff/ghostdex,
-		/obj/item/tool/lighter/zippo/fluff/ghostdex,
-	)
-
-/obj/item/storage/box/donator_kit/graciegrace0
-	donor_key = "graciegrace0"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/medicae_helmet,
-		/obj/item/clothing/suit/storage/marine/fluff/medicae_armor,
-		/obj/item/clothing/under/marine/fluff/medicae_jumpsuit,
-	)
-
-/obj/item/storage/box/donator_kit/gromoi
-	donor_key = "gromoi"
-	donor_gear = list(
-		/obj/item/clothing/suit/storage/marine/fluff/gromi,
-		/obj/item/clothing/under/marine/fluff/gromi,
-	)
-
-/obj/item/storage/box/donator_kit/haveatya
-	donor_key = "haveatya"
-	donor_gear = list(
-		/obj/item/clothing/glasses/fluff/haveatya,
-		/obj/item/clothing/head/helmet/marine/fluff/haveatya,
-		/obj/item/clothing/under/marine/fluff/turtleneck, //generic item
-	)
-
-/obj/item/storage/box/donator_kit/jackmcintyre
-	donor_key = "jackmcintyre"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/jackmcintyre,
-		/obj/item/clothing/suit/storage/marine/fluff/jackmcintyre,
-		/obj/item/clothing/under/marine/fluff/jackmcintyre,
-		/obj/item/clothing/under/marine/fluff/jackmcintyre_alt,
-	)
-
-/obj/item/storage/box/donator_kit/jdobbin49
-	donor_key = "jdobbin49"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/jdobbin49)
-
-/obj/item/storage/box/donator_kit/jedijasun
-	donor_key = "jedijasun"
-	donor_gear = list(/obj/item/clothing/gloves/marine/fluff/jedijas)
-
-/obj/item/storage/box/donator_kit/johnkilla56
-	donor_key = "johnkilla56"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/john56,
-		/obj/item/clothing/mask/fluff/john56,
-		/obj/item/clothing/suit/storage/marine/fluff/john56,
-		/obj/item/clothing/under/marine/fluff/john56,
-	)
-
-/obj/item/storage/box/donator_kit/juninho77
-	donor_key = "juninho77"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/juniho,
-		/obj/item/clothing/suit/storage/marine/fluff/juninho,
-		/obj/item/clothing/under/marine/fluff/juninho,
-	)
-
-/obj/item/storage/box/donator_kit/kilinger
-	donor_key = "kilinger"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/goldshieldberet)
-
-/obj/item/storage/box/donator_kit/kyrac
-	donor_key = "kyrac"
-	donor_gear = list(
-		/obj/item/clothing/under/marine/fluff/turtleneck,
-		/obj/item/clothing/glasses/fluff/eyepatch,
-	)
-
-/obj/item/storage/box/donator_kit/laser243
-	donor_key = "laser243"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/laser243,
-		/obj/item/clothing/suit/storage/marine/fluff/laser243,
-	)
-
-/obj/item/storage/box/donator_kit/leondark16
-	donor_key = "leondark16"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/leondark)
-
-/obj/item/storage/box/donator_kit/lestatanderson
-	donor_key = "lestatanderson"
-	donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/cia)
-
-/obj/item/storage/box/donator_kit/limodish
-	donor_key = "limodish"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/limo,
-		/obj/item/clothing/mask/fluff/limo,
-		/obj/item/clothing/suit/storage/marine/fluff/limo,
-		/obj/item/clothing/under/marine/fluff/turtleneck, //generic item
-	)
-
-/obj/item/storage/box/donator_kit/lostmixup
-	donor_key = "lostmixup"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/lostmixup,
-		/obj/item/clothing/mask/fluff/lostmixup,
-		/obj/item/clothing/suit/storage/marine/fluff/lostmixup,
-	)
-
-/obj/item/storage/box/donator_kit/markvalentine
-	donor_key = "markvalentine"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/valentine,
-		/obj/item/clothing/suit/storage/marine/fluff/valentine,
-		/obj/item/clothing/under/marine/fluff/valentine,
-	)
-
-/obj/item/storage/box/donator_kit/mitii
-	donor_key = "mitii"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/mitii,
-		/obj/item/clothing/suit/storage/marine/fluff/mitii,
-		/obj/item/storage/backpack/marine/fluff/mitii,
-	)
-
-/obj/item/storage/box/donator_kit/mrbark45
-	donor_key = "mrbark45"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/bark)
-
-/obj/item/storage/box/donator_kit/nickiskool
-	donor_key = "nickiskool"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/nickiskool,
-		/obj/item/clothing/suit/storage/marine/fluff/nickiskool,
-		/obj/item/clothing/under/marine/fluff/nickiskool,
-	)
-
-/obj/item/storage/box/donator_kit/ningajai
-	donor_key = "ningajai"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/ningajai)
-
-/obj/item/storage/box/donator_kit/obeystylez
-	donor_key = "obeystylez"
-	donor_gear = list(
-		/obj/item/clothing/gloves/black/obey,
-		/obj/item/clothing/mask/fluff/balaclava, //generic item
-		/obj/item/clothing/suit/storage/marine/fluff/obey,
-		/obj/item/clothing/under/marine/fluff/turtleneck, //generic item
-	)
-
-/obj/item/storage/box/donator_kit/officialjake
-	donor_key = "officialjake"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/officialjake)
-
-/obj/item/storage/box/donator_kit/oneonethreeeight
-	donor_key = "oneonethreeeight"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/oneonethreeeight,
-		/obj/item/clothing/suit/storage/marine/fluff/oneonethreeeight,
-		/obj/item/clothing/under/marine/fluff/oneonethreeeight,
-	)
-
-/obj/item/storage/box/donator_kit/paradox1i7
-	donor_key = "paradox1i7"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/paradox,
-		/obj/item/clothing/suit/storage/marine/fluff/paradox,
-		/obj/item/clothing/under/marine/fluff/paradox,
-	)
-
-/obj/item/storage/box/donator_kit/poops_buttly
-	donor_key = "poops_buttly"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/kaila,
-		/obj/item/clothing/suit/storage/marine/fluff/kaila,
-	)
-
-/obj/item/storage/box/donator_kit/radicalscorpion
-	donor_key = "radicalscorpion"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/radical,
-		/obj/item/clothing/mask/fluff/balaclava, //generic item
-		/obj/item/clothing/suit/storage/marine/fluff/radical,
-		/obj/item/clothing/under/marine/fluff/radical,
-	)
-
-/obj/item/storage/box/donator_kit/robin63
-	donor_key = "robin63"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/robin)
-
-/obj/item/storage/box/donator_kit/rogue1131
-	donor_key = "rogue1131"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/titus,
-		/obj/item/clothing/suit/storage/marine/fluff/titus,
-	)
-
-/obj/item/storage/box/donator_kit/sadokist
-	donor_key = "sadokist"
-	donor_gear = list(
-		/obj/item/clothing/glasses/fluff/sadokist,
-		/obj/item/clothing/head/helmet/marine/fluff/sadokist,
-		/obj/item/clothing/suit/storage/marine/fluff/sadokist,
-		/obj/item/storage/backpack/marine/fluff/sadokist,
-	)
-
-/obj/item/storage/box/donator_kit/sailordave
-	donor_key = "sailordave"
-	donor_gear = list(/obj/item/clothing/under/marine/fluff/sailordave)
-
-/obj/item/storage/box/donator_kit/sasoperative_elite //sasoperative has several sets
-	donor_key = "sasoperative"
-	kit_variant = "Elite"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/sas_elite,
-		/obj/item/clothing/mask/fluff/sas_elite,
-		/obj/item/clothing/suit/storage/marine/fluff/sas_elite,
-		/obj/item/clothing/under/marine/fluff/sas_elite,
-	)
-
-/obj/item/storage/box/donator_kit/sasoperative_juggernaut
-	donor_key = "sasoperative"
-	kit_variant = "Juggernaut"
-	donor_gear = list(
-		/obj/item/storage/backpack/marine/satchel/fluff/sas_juggernaut,
-		/obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut,
-		/obj/item/clothing/suit/storage/marine/fluff/sas_juggernaut,
-	)
-
-/obj/item/storage/box/donator_kit/sasoperative_legion
-	donor_key = "sasoperative"
-	kit_variant = "Legion"
-	donor_gear = list(
-		/obj/item/clothing/suit/storage/marine/fluff/sas_legion,
-		/obj/item/clothing/under/marine/fluff/sas_legion,
-		/obj/item/clothing/mask/fluff/sas_legion,
-	)
-
-/obj/item/storage/box/donator_kit/seloc_aferah
-	donor_key = "seloc_aferah"
-	donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/deejay)
-
-/obj/item/storage/box/donator_kit/starscream123
-	donor_key = "starscream123"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/starscream,
-		/obj/item/clothing/mask/fluff/starscream,
-		/obj/item/clothing/suit/storage/marine/fluff/starscream,
-		/obj/item/clothing/under/marine/fluff/starscream,
-	)
-
-/obj/item/storage/box/donator_kit/steelpoint
-	donor_key = "steelpoint"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/steelpoint,
-		/obj/item/clothing/shoes/marine/fluff/steelpoint,
-		/obj/item/clothing/suit/storage/marine/fluff/steelpoint,
-		/obj/item/clothing/under/marine/fluff/steelpoint,
-	)
-
-/obj/item/storage/box/donator_kit/stobarico
-	donor_key = "stobarico"
-	donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/stobarico)
-
-/obj/item/storage/box/donator_kit/theflagbearer
-	donor_key = "theflagbearer"
-	donor_gear = list(/obj/item/clothing/under/marine/fluff/leeeverett)
-
-/obj/item/storage/box/donator_kit/theultimatechimera
-	donor_key = "theultimatechimera"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/chimera,
-		/obj/item/clothing/suit/storage/marine/fluff/chimera,
-	)
-
-/obj/item/storage/box/donator_kit/tophatpenguin_wooki //ckey tophatpenguin has two sets
-	donor_key = "tophatpenguin"
-	kit_variant = "Wooki"
-	donor_gear = list(
-		/obj/item/clothing/suit/storage/marine/fluff/penguin,
-		/obj/item/clothing/under/marine/fluff/wooki,
-		/obj/item/clothing/head/helmet/marine/fluff/penguin,
-	)
-
-/obj/item/storage/box/donator_kit/tophatpenguin_santa
-	donor_key = "tophatpenguin"
-	kit_variant = "Santa"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/santahat,
-		/obj/item/clothing/suit/storage/marine/fluff/santa,
-	)
-
-/obj/item/storage/box/donator_kit/totalanarchy
-	donor_key = "totalanarchy"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/totalanarchy,
-		/obj/item/clothing/mask/fluff/totalanarchy,
-		/obj/item/clothing/suit/storage/marine/fluff/totalanarchy,
-		/obj/item/clothing/under/marine/fluff/totalanarchy,
-	)
-
-/obj/item/storage/box/donator_kit/tranquill
-	donor_key = "tranquill"
-	donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/tranquill)
-
-/obj/item/storage/box/donator_kit/trblackdragon
-	donor_key = "trblackdragon"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/trblackdragon,
-		/obj/item/clothing/suit/storage/marine/fluff/trblackdragon,
-	)
-
-/obj/item/storage/box/donator_kit/tristan63
-	donor_key = "tristan63"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/tristan,
-		/obj/item/clothing/suit/storage/marine/fluff/tristan,
-		/obj/item/clothing/under/marine/fluff/tristan,
-	)
-
-/obj/item/storage/box/donator_kit/tyran68
-	donor_key = "tyran68"
-	donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/tyran)
-
-/obj/item/storage/box/donator_kit/shotgunbill
-	donor_key = "shotgunbill"
-	donor_gear = list(/obj/item/clothing/head/collectable/petehat)
-
-/obj/item/storage/box/donator_kit/vintagepalmer
-	donor_key = "vintagepalmer"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/vintage,
-		/obj/item/clothing/shoes/marine/fluff/vintage,
-		/obj/item/clothing/suit/storage/marine/fluff/vintage,
-		/obj/item/clothing/under/marine/fluff/vintage,
-	)
-
-/obj/item/storage/box/donator_kit/whiteblood17
-	donor_key = "whiteblood17"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/whiteblood17,
-		/obj/item/clothing/under/marine/fluff/whiteblood17,
-	)
-
-/obj/item/storage/box/donator_kit/wrightthewrong
-	donor_key = "wrightthewrong"
-	donor_gear = list(
-		/obj/item/clothing/glasses/fluff/wright,
-		/obj/item/clothing/suit/storage/marine/fluff/wright,
-		/obj/item/clothing/under/marine/fluff/turtleneck, //generic item
-	)
-
-/obj/item/storage/box/donator_kit/zegara
-	donor_key = "zegara"
-	donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/zegara)
-
-/obj/item/storage/box/donator_kit/zynax
-	donor_key = "zynax"
-	donor_gear = list(
-		/obj/item/clothing/mask/fluff/balaclava, //generic item
-		/obj/item/clothing/suit/storage/marine/fluff/Zynax,
-		/obj/item/clothing/under/marine/fluff/turtleneck, //generic item
-		/obj/item/clothing/under/marine/fluff/Zynax,
-	)
-
-/obj/item/storage/box/donator_kit/mileswolfe
-	donor_key = "mileswolfe"
-	donor_gear = list(/obj/item/clothing/under/marine/fluff/mileswolfe)
-
-/obj/item/storage/box/donator_kit/killaninja12
-	donor_key = "killaninja12"
-	donor_gear = list(
-		/obj/item/clothing/head/helmet/marine/fluff/killaninja12,
-		/obj/item/clothing/suit/storage/marine/fluff/killaninja12,
-	)
-
-/obj/item/storage/box/donator_kit/noize
-	donor_key = "noize"
-	donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/forwardslashn)
-
-/obj/item/storage/box/donator_kit/deanthelis
-	donor_key = "deanthelis"
-	donor_gear = list(/obj/item/clothing/head/beret/marine/techofficer)
diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm
index 7184827fda..185b6e35b0 100644
--- a/code/modules/cm_marines/equipment/guncases.dm
+++ b/code/modules/cm_marines/equipment/guncases.dm
@@ -72,7 +72,7 @@
 //------------
 /obj/item/storage/box/guncase/m41aMK1
 	name = "\improper M41A pulse rifle MK1 case"
-	desc = "A gun case containing the M41A pulse rifle MK1. It can only use proprietary MK1 magazines."
+	desc = "A gun case containing the M41A pulse rifle MK1."
 	storage_slots = 3
 	can_hold = list(/obj/item/weapon/gun/rifle/m41aMK1, /obj/item/ammo_magazine/rifle/m41aMK1)
 
@@ -82,9 +82,9 @@
 	new /obj/item/ammo_magazine/rifle/m41aMK1(src)
 
 
-/obj/item/storage/box/guncase/m41aMK1AP
+/obj/item/storage/box/guncase/m41aMK1/ap
 	name = "\improper M41A pulse rifle MK1 AP case"
-	desc = "A gun case containing the M41A pulse rifle MK1 loaded with AP rounds. It can only use proprietary MK1 magazines."
+	desc = "A gun case containing the M41A pulse rifle MK1 loaded with AP rounds."
 	storage_slots = 3
 	can_hold = list(/obj/item/weapon/gun/rifle/m41aMK1, /obj/item/ammo_magazine/rifle/m41aMK1)
 
@@ -192,19 +192,6 @@
 	new /obj/item/ammo_magazine/m2c(src)
 	new /obj/item/storage/belt/marine/m2c(src)
 
-//------------
-/obj/item/storage/box/guncase/m41a
-	name = "\improper M41A pulse rifle MK2 case"
-	desc = "A gun case containing the M41A pulse rifle MK2."
-	storage_slots = 5
-	can_hold = list(/obj/item/weapon/gun/rifle/m41a, /obj/item/ammo_magazine/rifle)
-
-/obj/item/storage/box/guncase/m41a/fill_preset_inventory()
-	new /obj/item/weapon/gun/rifle/m41a(src)
-	for(var/i = 1 to 4)
-		new /obj/item/ammo_magazine/rifle(src)
-
-
 //------------
 /obj/item/storage/box/guncase/pumpshotgun
 	name = "\improper M37A2 Pump Shotgun case"
@@ -271,18 +258,6 @@
 	new /obj/item/ammo_magazine/rifle/nsg23(src)
 	new /obj/item/ammo_magazine/rifle/nsg23(src)
 
-/obj/item/storage/box/guncase/m3717
-	name = "\improper M37-17 pump shotgun case"
-	desc = "A gun case containing the M37-17 pump shotgun. Rarely seen issued to USCM vessels on the edges of inhabited space who need the extra bang for their buck (literally) the M37-17 has. Like this one! Well, if it had the budget for it."
-	storage_slots = 4
-	can_hold = list(/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717, /obj/item/ammo_magazine/shotgun/buckshot)
-
-/obj/item/storage/box/guncase/m3717/fill_preset_inventory()
-	new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717(src)
-	new /obj/item/ammo_magazine/shotgun/buckshot(src)
-	new /obj/item/ammo_magazine/shotgun/buckshot(src)
-	new /obj/item/ammo_magazine/shotgun/buckshot(src)
-
 /obj/item/storage/box/guncase/m1911
 	name = "\improper M1911 service pistol case"
 	desc = "A gun case containing the M1911 service pistol. It might be three centuries old but it's still a damn good pistol. Back-issue only, though."
diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm
index c1a9a33f76..ee72a056a3 100644
--- a/code/modules/cm_marines/equipment/kit_boxes.dm
+++ b/code/modules/cm_marines/equipment/kit_boxes.dm
@@ -159,14 +159,14 @@
 	desc = "A paper box. Open it and get a specialist kit."
 	icon = 'icons/obj/items/storage.dmi'
 	icon_state = "spec_kit"
-	var/list/allowed_roles_list = list(JOB_SQUAD_SPECIALIST, JOB_WO_SQUAD_SPECIALIST, JOB_WO_CREWMAN)
+	var/list/allowed_roles_list = JOB_SQUAD_SPECIALIST
 
 	///Used for cryo specs who already have "foxtrot" appended to their ID assignments
 	var/squad_assignment_update = TRUE
 
 //this one is delivered via ASRS as a reward for DEFCON/techwebs/whatever else we will have
 /obj/item/spec_kit/asrs
-	allowed_roles_list = list(JOB_SQUAD_MARINE, JOB_WO_SQUAD_MARINE)
+	allowed_roles_list = JOB_SQUAD_MARINE
 
 /obj/item/spec_kit/cryo
 	squad_assignment_update = FALSE
diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm
index 7444583fcb..6e383cae98 100644
--- a/code/modules/cm_marines/marines_consoles.dm
+++ b/code/modules/cm_marines/marines_consoles.dm
@@ -302,13 +302,13 @@
 		departments = list("CentCom" = get_all_centcom_jobs())
 	else
 		departments = list(
-			CARDCON_DEPARTMENT_COMMAND = ROLES_CIC - ROLES_WO,
-			CARDCON_DEPARTMENT_AUXCOM = ROLES_AUXIL_SUPPORT - ROLES_WO,
-			CARDCON_DEPARTMENT_MISC = ROLES_MISC - ROLES_WO,
-			CARDCON_DEPARTMENT_SECURITY = ROLES_POLICE - ROLES_WO,
-			CARDCON_DEPARTMENT_ENGINEERING = ROLES_ENGINEERING - ROLES_WO,
-			CARDCON_DEPARTMENT_SUPPLY = ROLES_REQUISITION - ROLES_WO,
-			CARDCON_DEPARTMENT_MEDICAL = ROLES_MEDICAL - ROLES_WO,
+			CARDCON_DEPARTMENT_COMMAND = ROLES_CIC,
+			CARDCON_DEPARTMENT_AUXCOM = ROLES_AUXIL_SUPPORT,
+			CARDCON_DEPARTMENT_MISC = ROLES_MISC,
+			CARDCON_DEPARTMENT_SECURITY = ROLES_POLICE,
+			CARDCON_DEPARTMENT_ENGINEERING = ROLES_ENGINEERING,
+			CARDCON_DEPARTMENT_SUPPLY = ROLES_REQUISITION,
+			CARDCON_DEPARTMENT_MEDICAL = ROLES_MEDICAL,
 			CARDCON_DEPARTMENT_MARINE = ROLES_MARINES
 		)
 	data["jobs"] = list()
diff --git a/code/modules/fishing/datums/generic.dm b/code/modules/fishing/datums/generic.dm
index 3d2766efba..1452fa97ef 100644
--- a/code/modules/fishing/datums/generic.dm
+++ b/code/modules/fishing/datums/generic.dm
@@ -2,7 +2,7 @@ GLOBAL_LIST_EMPTY(fishing_loot_tables)
 
 /datum/fish_loot_table
 	var/list/common_fishable_atoms = list(
-		/obj/item/clothing/shoes/leather,
+		/obj/item/clothing/shoes/laceup/brown,
 		/obj/item/clothing/shoes/marine,
 	)
 	var/list/uncommon_fishable_atoms = list(
diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm
index f68d718604..4b6a2d8df2 100644
--- a/code/modules/gear_presets/_select_equipment.dm
+++ b/code/modules/gear_presets/_select_equipment.dm
@@ -1057,16 +1057,16 @@ var/list/rebel_rifles = list(
 	var/random_gear = rand(1, 5)
 	switch(random_gear)
 		if (1, 2, 3)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP (new_human), WEAR_BODY)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(new_human), WEAR_JACKET)
 			new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET)
 			new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_J_STORE)
 		if (4)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP (new_human), WEAR_BODY)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP(new_human), WEAR_JACKET)
 			new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET)
 		if (5)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP (new_human), WEAR_BODY)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/support(new_human), WEAR_JACKET)
 			new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET)
 
diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm
index 47d70af1ba..c891aecd82 100644
--- a/code/modules/gear_presets/clf.dm
+++ b/code/modules/gear_presets/clf.dm
@@ -99,32 +99,16 @@
 	access = get_access(ACCESS_LIST_CLF_BASE) + list(ACCESS_CLF_ARMORY)
 
 /datum/equipment_preset/clf/specialist/load_gear(mob/living/carbon/human/new_human)
-	var/random_gear = rand(1,6)
 
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/green(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian/brown(new_human), WEAR_FEET)
-
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF(new_human), WEAR_L_EAR)
-	//standard backpack stuff
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_BACK)
-	//specialist backpack stuff
-	new_human.equip_to_slot_or_del(new /obj/item/prop/folded_anti_tank_sadar(new_human), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/ears/earmuffs(new_human), WEAR_IN_BACK)
-
 	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_IN_BACK)
-	//storage items
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4(new_human), WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE)
-
-	if(prob(75))
-		new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(new_human), WEAR_IN_BACK)
-		new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(new_human), WEAR_IN_BACK)
-		spawn_rebel_specialist_weapon(new_human, 10)
-	else
-		new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(new_human), WEAR_IN_JACKET)
-		new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(new_human), WEAR_IN_JACKET)
-		spawn_weapon(/obj/item/weapon/gun/lever_action/r4t, /obj/item/ammo_magazine/handful/lever_action, new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large(new_human), WEAR_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_R_STORE)
 
 //*****************************************************************************************************/
 
diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm
index 7faae5ba47..50efac89e1 100644
--- a/code/modules/gear_presets/cmb.dm
+++ b/code/modules/gear_presets/cmb.dm
@@ -271,7 +271,7 @@
 
 	assignment = "Interstellar Human Rights Observer"
 	rank = JOB_CMB_OBS
-	skills = /datum/skills/civilian/survivor/doctor
+	skills = /datum/skills/civilian/doctor
 	languages = list(LANGUAGE_ENGLISH, LANGUAGE_SPANISH, LANGUAGE_RUSSIAN)
 
 /datum/equipment_preset/cmb/observer/load_gear(mob/living/carbon/human/new_human)
diff --git a/code/modules/gear_presets/colonist.dm b/code/modules/gear_presets/colonist.dm
index 015f60fbea..f3756b05a6 100644
--- a/code/modules/gear_presets/colonist.dm
+++ b/code/modules/gear_presets/colonist.dm
@@ -67,7 +67,7 @@
 /datum/equipment_preset/colonist/prisoner/skilled
 	name = "Prop - Prison - Inmate, Dangerous"
 	assignment = "High Risk Inmate"
-	skills = /datum/skills/civilian/survivor/prisoner
+	skills = /datum/skills/civilian/prisoner
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 	access = list(ACCESS_CIVILIAN_PUBLIC)
 
@@ -120,36 +120,14 @@
 		if(5)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket(new_human), WEAR_JACKET)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/workwear/blue(new_human), WEAR_BODY)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET)
 			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
 		if(6)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/hybrisa/polyester_jacket_red(new_human), WEAR_JACKET)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear(new_human), WEAR_BODY)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(new_human), WEAR_FEET)
-			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK)
-		if(7)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/ferret(new_human), WEAR_HEAD)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/bomber/grey(new_human), WEAR_JACKET)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/workwear/khaki(new_human), WEAR_BODY)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET)
-			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK)
-		if(8)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/bomber(new_human), WEAR_JACKET)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/workwear/pink(new_human), WEAR_BODY)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(new_human), WEAR_FEET)
-			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK)
-		if(9)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/trucker/red(new_human), WEAR_HEAD)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/bomber/red(new_human), WEAR_JACKET)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear(new_human), WEAR_BODY)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/red(new_human), WEAR_FEET)
-			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK)
-		if(10)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beanie/royal_marine(new_human), WEAR_HEAD)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/bomber/alt(new_human), WEAR_JACKET)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_joliet_shopsteward(new_human), WEAR_BODY)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/royal_marine(new_human), WEAR_FEET)
-			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack(new_human), WEAR_BACK)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/workwear/blue(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
+			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
+
 
 // Office Workers
 
@@ -201,3 +179,31 @@
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/red, WEAR_ACCESSORY)
 			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
 			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
+
+// Part-timers
+
+/datum/equipment_preset/survivor/hybrisa/weymart
+	name = "Survivor - Hybrisa - Civilian - Weymart Employee"
+	assignment = "Hi! My name is:"
+	skills = /datum/skills/civilian
+	flags = EQUIPMENT_PRESET_START_OF_ROUND
+	access = list(ACCESS_CIVILIAN_PUBLIC)
+
+/datum/equipment_preset/survivor/hybrisa/weymart/load_gear(mob/living/carbon/human/new_human)
+	var/random_gear = rand(1,3)
+	switch(random_gear)
+		if(1)
+			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/workwear/weymart(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/weymart(new_human), WEAR_JACKET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
+		if(2)
+			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/blue(new_human), WEAR_BACK)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/workwear/weymart(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/weymart(new_human), WEAR_JACKET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/red(new_human), WEAR_FEET)
+		if(3)
+			new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/blue(new_human), WEAR_BACK)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/under/workwear/weymart(new_human), WEAR_BODY)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/weymart(new_human), WEAR_JACKET)
+			new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET)
diff --git a/code/modules/gear_presets/contractor.dm b/code/modules/gear_presets/contractor.dm
index f8d146096f..14753a455c 100644
--- a/code/modules/gear_presets/contractor.dm
+++ b/code/modules/gear_presets/contractor.dm
@@ -60,11 +60,11 @@
 //*****************************************************************************************************/
 
 /datum/equipment_preset/contractor/duty/standard
-	name = "Military Contractor (Standard)"
+	name = "Mercenary"
 	paygrade = "VAI"
-	role_comm_title = "Merc"
+	role_comm_title = "MERC"
 	flags = EQUIPMENT_PRESET_EXTRA
-	assignment = "VAIPO Mercenary"
+	assignment = "Mercenary"
 	rank = JOB_CONTRACTOR_ST
 	skills = /datum/skills/contractor
 	faction = FACTION_CONTRACTOR
@@ -201,53 +201,6 @@
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK)
 
-
-//*****************************************************************************************************/
-/datum/equipment_preset/contractor/duty/engi
-	name = "Military Contractor (Engineer)"
-	paygrade = "VAI-E"
-
-	role_comm_title = "Eng"
-	flags = EQUIPMENT_PRESET_EXTRA
-
-	assignment = "VAIPO Engineering Specialist"
-	rank = JOB_CONTRACTOR_ENGI
-	skills = /datum/skills/contractor/engi
-	faction = FACTION_CONTRACTOR
-
-/datum/equipment_preset/contractor/duty/engi/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/w_br, WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/tool_webbing/equipped, WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine/tactical, WEAR_J_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_FACE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES)
-	//storage items
-	new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/contractor, WEAR_WAIST)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE)
-	//backpack and stuff in it
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK)
-
 //*****************************************************************************************************/
 
 /datum/equipment_preset/contractor/duty/medic
@@ -436,388 +389,3 @@
 	new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE)
 
 //*****************************************************************************************************/
-
-/datum/equipment_preset/contractor/covert/standard
-	name = "Military Contractor (Covert Standard)"
-	paygrade = "VAI"
-	role_comm_title = "Merc"
-	flags = EQUIPMENT_PRESET_EXTRA
-
-	assignment = "VAISO Mercenary"
-	rank = JOB_CONTRACTOR_COVST
-	skills = /datum/skills/contractor
-	faction = FACTION_CONTRACTOR
-
-/datum/equipment_preset/contractor/covert/load_gear(mob/living/carbon/human/new_human)
-
-	var/choice = rand(1,10)
-	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies, WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/tactical, WEAR_EYES)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE,WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK)
-
-	switch(choice)
-		if(1 to 3) // 30%
-			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/tactical, WEAR_J_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_BACK)
-		if(4 to 5) // 20%
-			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/l42a/abr40/tactical, WEAR_J_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/abr40/holo_target, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/abr40/holo_target, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/abr40/holo_target, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/ap, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/ap, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/extended, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/extended, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/extended, WEAR_IN_BACK)
-		if(6 to 8) // 20%
-			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/tactical, WEAR_J_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_BACK)
-		if(8 to 9) // 20%
-			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/covert, WEAR_J_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/buckshot, WEAR_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
-		if(10) // 10%
-			new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/tactical, WEAR_J_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-			new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE)
-			new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK)
-
-//*****************************************************************************************************/
-
-/datum/equipment_preset/contractor/covert/heavy
-	name = "Military Contractor (Covert Machinegunner)"
-	paygrade = "VAI-G"
-	role_comm_title = "MG"
-	flags = EQUIPMENT_PRESET_EXTRA
-
-	assignment = "VAISO Automatic Rifleman"
-	rank = JOB_CONTRACTOR_COVMG
-	skills = /datum/skills/contractor/heavy
-	faction = FACTION_CONTRACTOR
-
-/datum/equipment_preset/contractor/covert/heavy/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies, WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/lmg/tactical, WEAR_J_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/tactical, WEAR_EYES)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive, WEAR_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE)
-	//backpack and stuff in it
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE,WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK)
-
-
-//*****************************************************************************************************/
-/datum/equipment_preset/contractor/covert/engi
-	name = "Military Contractor (Covert Engineer)"
-	paygrade = "VAI-E"
-
-	role_comm_title = "Eng"
-	flags = EQUIPMENT_PRESET_EXTRA
-
-	assignment = "VAISO Engineering Specialist"
-	rank = JOB_CONTRACTOR_COVENG
-	skills = /datum/skills/contractor/engi
-	faction = FACTION_CONTRACTOR
-
-/datum/equipment_preset/contractor/covert/engi/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/tool_webbing/equipped, WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine/tactical, WEAR_J_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES)
-	//storage items
-	new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/contractor, WEAR_WAIST)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE)
-	//backpack and stuff in it
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK)
-
-//*****************************************************************************************************/
-
-/datum/equipment_preset/contractor/covert/medic
-	name = "Military Contractor (Covert Medic)"
-	paygrade = "VAI-M"
-	role_comm_title = "Med"
-	flags = EQUIPMENT_PRESET_EXTRA
-
-	assignment = "VAIMS Medical Specialist"
-	rank = JOB_CONTRACTOR_COVMED
-	skills = /datum/skills/contractor/medic
-	faction = FACTION_CONTRACTOR
-
-/datum/equipment_preset/contractor/covert/medic/load_gear(mob/living/carbon/human/new_human)
-	//clothing
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY)
-	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine/tactical, WEAR_J_STORE)
-	//storage items
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST)
-	//backpack and stuff in it
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) //Line in vest.
-	new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_BACK)
-
-//*****************************************************************************************************/
-
-/datum/equipment_preset/contractor/covert/leader
-	name = "Military Contractor (Covert Leader)"
-	paygrade = "VAI-L"
-	role_comm_title = "TL"
-	flags = EQUIPMENT_PRESET_EXTRA
-
-	assignment = "VAISO Team Leader"
-	rank = JOB_CONTRACTOR_COVTL
-	skills = /datum/skills/contractor/leader
-	faction = FACTION_CONTRACTOR
-
-/datum/equipment_preset/contractor/covert/leader/load_gear(mob/living/carbon/human/new_human)
-	//clothes
-	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies, WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/tactical, WEAR_J_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE)
-	//backpack and stuff in it
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/m717/hacked/contractor, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK)
-
-//*****************************************************************************************************/
-/datum/equipment_preset/contractor/covert/synth
-	name = "Military Contractor (Covert Synthetic)"
-	paygrade = "VAI-S"
-	role_comm_title = "Syn"
-	flags = EQUIPMENT_PRESET_EXTRA
-
-	assignment = "VAISO Support Synthetic"
-	rank = JOB_CONTRACTOR_COVSYN
-	skills = /datum/skills/synthetic
-	faction = FACTION_CONTRACTOR
-	languages = ALL_SYNTH_LANGUAGES
-
-/datum/equipment_preset/contractor/covert/synth/load_skills(mob/living/carbon/human/new_human)
-		new_human.set_skills(/datum/skills/synthetic)
-		new_human.allow_gun_usage = FALSE
-
-/datum/equipment_preset/contractor/covert/synth/load_name(mob/living/carbon/human/new_human, randomise)
-	new_human.gender = pick(50;MALE,50;FEMALE)
-	var/datum/preferences/A = new()
-	A.randomize_appearance(new_human)
-	var/random_name
-	if(new_human.gender == MALE)
-		random_name = "[pick(first_names_male)]"
-	else
-		random_name = "[pick(first_names_female)]"
-
-	if(new_human.gender == MALE)
-		new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache")
-
-
-	new_human.change_real_name(new_human, random_name)
-	new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut")
-	var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19))
-	var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42))
-	var/hair_color = pick(hair_colors)
-	new_human.r_hair = hair_colors[hair_color][1]
-	new_human.g_hair = hair_colors[hair_color][2]
-	new_human.b_hair = hair_colors[hair_color][3]
-	new_human.r_facial = hair_colors[hair_color][1]
-	new_human.g_facial = hair_colors[hair_color][2]
-	new_human.b_facial = hair_colors[hair_color][3]
-	var/eye_color = pick(colors)
-	new_human.r_eyes = colors[eye_color][1]
-	new_human.g_eyes = colors[eye_color][2]
-	new_human.b_eyes = colors[eye_color][3]
-	idtype = /obj/item/card/id/data
-
-/datum/equipment_preset/contractor/covert/synth/load_race(mob/living/carbon/human/new_human)
-	new_human.set_species(SYNTH_GEN_THREE)
-
-/datum/equipment_preset/contractor/covert/synth/load_gear(mob/living/carbon/human/new_human)
-	load_name(new_human)
-	//back
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/black, WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) //1
-	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) //2
-	new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK)
-	//face
-	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/experimental_mesons, WEAR_EYES)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/cosmetic, WEAR_IN_HELMET)
-	//body
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/synvest, WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/contractor, WEAR_J_STORE)
-	//waist
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST)
-	//limbs
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/twohanded/breacher/synth, WEAR_L_HAND)
-	//póckets
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE)
diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm
index 32ab7d3b27..232b4c241a 100644
--- a/code/modules/gear_presets/corpses.dm
+++ b/code/modules/gear_presets/corpses.dm
@@ -639,7 +639,7 @@
 	//head
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD)
 	//body
-	var/obj/item/clothing/under/marine/veteran/UPP/UPP = new()
+	var/obj/item/clothing/under/marine/opfor/UPP/UPP = new()
 	new_human.equip_to_slot_or_del(UPP, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET)
 	//limbs
@@ -678,7 +678,7 @@
 
 /datum/equipment_preset/corpse/pmc/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/hvh, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/pmc, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD)
@@ -705,7 +705,7 @@
 
 /datum/equipment_preset/corpse/pmc/goon/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/pmc/corporate, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD)
@@ -726,7 +726,7 @@
 
 /datum/equipment_preset/corpse/pmc/goon/lead/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/lead, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/pmc/corporate/lead, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/lead, WEAR_HEAD)
@@ -752,7 +752,7 @@
 
 /datum/equipment_preset/corpse/freelancer/load_gear(mob/living/carbon/human/new_human)
 
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/freelancer, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS)
diff --git a/code/modules/gear_presets/dutch.dm b/code/modules/gear_presets/dutch.dm
index c83e8384f5..9fda2b1490 100644
--- a/code/modules/gear_presets/dutch.dm
+++ b/code/modules/gear_presets/dutch.dm
@@ -41,7 +41,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(new_human), WEAR_IN_HELMET)
 	new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(new_human), WEAR_IN_HELMET)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/dutch(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_BACK)
@@ -94,7 +94,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(new_human), WEAR_IN_HELMET)
 	new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(new_human), WEAR_IN_HELMET)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/dutch(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/minigun(new_human), WEAR_J_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_JACKET)
@@ -123,7 +123,7 @@
 	skills = /datum/skills/dutchmerc
 
 /datum/equipment_preset/dutch/flamer/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/dutch(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(new_human), WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(new_human), WEAR_IN_HELMET)
 	new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(new_human), WEAR_IN_HELMET)
@@ -165,7 +165,7 @@
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES)
 	else
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/dutch(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/xm177/dutch(new_human), WEAR_J_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_JACKET)
@@ -220,7 +220,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/empproof(new_human), WEAR_EYES)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/yautja/hunter(new_human), WEAR_FACE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/dutch(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/xm177/dutch(new_human), WEAR_J_STORE) //he uses a grenadier m16 in the movie but too gear limited to add it so he gets the cool gun
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(new_human), WEAR_IN_JACKET)
diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm
index 7b1a9faa41..9ccf8ff046 100644
--- a/code/modules/gear_presets/fun.dm
+++ b/code/modules/gear_presets/fun.dm
@@ -50,7 +50,7 @@
 
 	new_human.equip_to_slot_or_del(M, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/new_human), WEAR_HANDS)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/brown(new_human), WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/specialist/hefa(new_human), WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE)
 	var/jacket_success = new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/M3G/hefa(new_human), WEAR_JACKET)
@@ -202,7 +202,7 @@
 	//face
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR)
 	//body + webbing
-	var/obj/item/clothing/under/marine/veteran/UPP/UPP = new()
+	var/obj/item/clothing/under/marine/opfor/UPP/UPP = new()
 	var/obj/item/clothing/accessory/storage/webbing/W = new()
 	UPP.attach_accessory(new_human, W)
 	new_human.equip_to_slot_or_del(UPP, WEAR_BODY)
@@ -261,7 +261,7 @@
 /datum/equipment_preset/fun/van_bandolier/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/double/twobore(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/van_bandolier(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/van_bandolier(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/van_bandolier(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/van_bandolier(new_human), WEAR_J_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/civ(new_human.wear_suit), WEAR_IN_JACKET)
diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm
index b5e38aa7a8..108d452652 100644
--- a/code/modules/gear_presets/pmc.dm
+++ b/code/modules/gear_presets/pmc.dm
@@ -67,7 +67,7 @@
 
 	var/choice = rand(1,5)
 	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/pmc, WEAR_BODY)
 	if(prob(50))
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET)
 	else
@@ -106,7 +106,7 @@
 /datum/equipment_preset/pmc/pmc_medic/load_gear(mob/living/carbon/human/new_human)
 
 	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/pmc, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD)
@@ -159,7 +159,7 @@
 /datum/equipment_preset/pmc/pmc_leader/load_gear(mob/living/carbon/human/new_human)
 	//TODO: add backpacks and satchels
 	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/leader, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/pmc/leader, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/leader, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, WEAR_HEAD)
@@ -212,7 +212,7 @@
 /datum/equipment_preset/pmc/pmc_gunner/load_gear(mob/living/carbon/human/new_human)
 	//TODO: add backpacks and satchels
 	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/pmc, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/gunner, WEAR_HEAD)
@@ -246,7 +246,7 @@
 /datum/equipment_preset/pmc/pmc_sniper/load_gear(mob/living/carbon/human/new_human)
 	//TODO: add backpacks and satchels
 	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/pmc, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/sniper, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/sniper, WEAR_HEAD)
@@ -288,7 +288,7 @@
 /datum/equipment_preset/pmc/pmc_crewman/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/pmc, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES)
@@ -323,7 +323,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE)
 	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/pmc, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_JACKET)
@@ -399,7 +399,7 @@
 		new_human.allow_gun_usage = FALSE
 
 /datum/equipment_preset/pmc/synth/load_gear(mob/living/carbon/human/new_human)
-		new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY)
+		new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/pmc, WEAR_BODY)
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY)
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth, WEAR_JACKET)
 		new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET)
diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm
index f2972a83a7..97a674f067 100644
--- a/code/modules/gear_presets/royal_marines.dm
+++ b/code/modules/gear_presets/royal_marines.dm
@@ -48,7 +48,7 @@
 /datum/equipment_preset/twe/royal_marine/standard/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/royal_marine, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine/team_leader, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/royal_marine, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY)
@@ -87,9 +87,10 @@
 	skills = /datum/skills/rmc/smartgun
 
 /datum/equipment_preset/twe/royal_marine/spec/machinegun/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
+
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/royal_marine, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/royal_marine, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/royal_marine, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET)
 	new_human.equip_to_slot(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision, WEAR_EYES)
@@ -120,16 +121,17 @@
 /datum/equipment_preset/twe/royal_marine/team_leader
 	name = "TWE Royal Marine Commando (Teamleader)"
 	paygrade = "RMC E4"
-	role_comm_title = "RMC TL"
+	role_comm_title = "RMC-TL"
 	flags = EQUIPMENT_PRESET_EXTRA
 	assignment = "Royal Marines Team Leader"
 	rank = JOB_TWE_RMC_TEAMLEADER
 	skills = /datum/skills/rmc/leader
 
 /datum/equipment_preset/twe/royal_marine/team_leader/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
+
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/royal_marine, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine/team_leader, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine/tl, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/royal_marine/tl, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
@@ -169,16 +171,18 @@
 /datum/equipment_preset/twe/royal_marine/lieuteant //they better say it Lef-tenant or they should be banned for LRP. More importantly this guy doesn't spawn in the ERT
 	name = "TWE Royal Marine Commando (Officer)"
 	paygrade = "RMC O1"
-	role_comm_title = "RMC LT"
+	role_comm_title = "RMC-LT"
 	flags = EQUIPMENT_PRESET_EXTRA
 	assignment = "Royal Marines Team Commander"
 	rank = JOB_TWE_RMC_LIEUTENANT
 	skills = /datum/skills/rmc/leader
 
 /datum/equipment_preset/twe/royal_marine/lieuteant/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
+
+
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/royal_marine, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine/team_leader, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine/lt, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/royal_marine/lt, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES)
diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm
index 6f696cecf8..3275321e2f 100644
--- a/code/modules/gear_presets/survivors/misc.dm
+++ b/code/modules/gear_presets/survivors/misc.dm
@@ -18,7 +18,7 @@ everything bellow isn't used or out of place.
 	access = list(ACCESS_CIVILIAN_PUBLIC)
 
 /datum/equipment_preset/survivor/pmc/miner/one/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/mercenary/miner, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/mercenary/miner, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/mercenary/miner, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner, WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE)
@@ -36,7 +36,7 @@ everything bellow isn't used or out of place.
 
 /datum/equipment_preset/survivor/pmc/freelancer/load_gear(mob/living/carbon/human/new_human)
 
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/freelancer, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS)
diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm
index 91ae5a4ade..09f3aa86db 100644
--- a/code/modules/gear_presets/synths.dm
+++ b/code/modules/gear_presets/synths.dm
@@ -38,11 +38,11 @@
 	name = "USCM Synthetic"
 	flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
 	faction = FACTION_MARINE
-	idtype = /obj/item/card/id/gold
+	idtype = /obj/item/card/id/dogtag
 	assignment = JOB_SYNTH
 	rank = "Synthetic"
 	paygrade = "SYN"
-	role_comm_title = "Syn"
+	role_comm_title = "USCM-SYN"
 
 /datum/equipment_preset/synth/uscm/load_gear(mob/living/carbon/human/new_human)
 
@@ -158,63 +158,6 @@
 
 	survivor_variant = MEDICAL_SURVIVOR
 
-/datum/equipment_preset/synth/survivor/scientist_synth
-	name = "Synthetic - Scientist Synth"
-	equipment_to_spawn = list(
-		WEAR_HEAD = /obj/item/clothing/head/bio_hood,
-		WEAR_FACE = /obj/item/clothing/mask/surgical,
-		WEAR_EYES = /obj/item/clothing/glasses/hud/health,
-		WEAR_BODY = /obj/item/clothing/under/boiler/lightblue,
-		WEAR_BACK = /obj/item/storage/backpack/satchel/blue,
-		WEAR_IN_BACK = /obj/item/reagent_container/glass/beaker/vial/random/good,
-		WEAR_IN_BACK = /obj/item/paper/research_notes/good,
-		WEAR_JACKET = /obj/item/clothing/suit/bio_suit,
-		WEAR_WAIST = /obj/item/storage/belt/medical/lifesaver/full,
-		WEAR_HANDS = /obj/item/clothing/gloves/black,
-		WEAR_R_HAND = /obj/item/device/motiondetector,
-		WEAR_R_STORE = /obj/item/storage/pouch/tools/full,
-		WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
-		WEAR_L_HAND = /obj/item/weapon/twohanded/fireaxe
-	)
-
-	survivor_variant = SCIENTIST_SURVIVOR
-
-/datum/equipment_preset/synth/survivor/engineer_synth
-	name = "Synthetic - Engineer Synth"
-	equipment_to_spawn = list(
-		WEAR_HEAD = /obj/item/clothing/head/hardhat,
-		WEAR_BODY = /obj/item/clothing/under/boiler/cyan,
-		WEAR_BACK = /obj/item/storage/backpack/satchel,
-		WEAR_IN_BACK = /obj/item/ammo_magazine/smg/nailgun,
-		WEAR_JACKET = /obj/item/clothing/suit/storage/hazardvest/yellow,
-		WEAR_IN_JACKET = /obj/item/ammo_magazine/smg/nailgun,
-		WEAR_IN_JACKET = /obj/item/ammo_magazine/smg/nailgun,
-		WEAR_J_STORE = /obj/item/weapon/gun/smg/nailgun/compact,
-		WEAR_WAIST = /obj/item/storage/belt/utility/full,
-		WEAR_R_STORE = /obj/item/storage/pouch/tools/full,
-		WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
-		WEAR_L_HAND = /obj/item/weapon/twohanded/fireaxe
-	)
-
-	survivor_variant = ENGINEERING_SURVIVOR
-
-/datum/equipment_preset/synth/survivor/freelancer_synth
-	name = "Synthetic - Freelancer Synth"
-	equipment_to_spawn = list(
-		WEAR_HEAD = /obj/item/clothing/head/welding,
-		WEAR_FACE = /obj/item/clothing/mask/rebreather/scarf,
-		WEAR_BODY = /obj/item/clothing/under/marine/veteran/freelancer,
-		WEAR_BACK = /obj/item/storage/backpack/lightpack,
-		WEAR_IN_BACK = /obj/item/tool/weldpack/minitank,
-		WEAR_JACKET = /obj/item/clothing/suit/storage/webbing/utility_vest,
-		WEAR_IN_JACKET = /obj/item/explosive/grenade/smokebomb,
-		WEAR_WAIST = /obj/item/storage/belt/marine,
-		WEAR_HANDS = /obj/item/clothing/gloves/marine/veteran,
-		WEAR_R_HAND = /obj/item/storage/pouch/flare/full,
-		WEAR_FEET = /obj/item/clothing/shoes/marine/upp,
-		WEAR_L_HAND = /obj/item/storage/large_holster/katana/full
-	)
-
 /datum/equipment_preset/synth/survivor/wy/security_synth
 	name = "Synthetic - Corporate Security Synth"
 	idtype = /obj/item/card/id/silver/cl
@@ -237,7 +180,7 @@
 	equipment_to_spawn = list(
 		WEAR_HEAD = /obj/item/clothing/head/helmet/marine/veteran/pmc,
 		WEAR_L_EAR = /obj/item/device/radio/headset/distress/pmc/hvh,
-		WEAR_BODY = /obj/item/clothing/under/marine/veteran/pmc,
+		WEAR_BODY = /obj/item/clothing/under/marine/opfor/pmc,
 		WEAR_ACCESSORY = /obj/item/clothing/accessory/storage/droppouch,
 		WEAR_IN_ACCESSORY = /obj/item/explosive/grenade/flashbang,
 		WEAR_IN_ACCESSORY = /obj/item/handcuffs/zip,
diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm
index 6a93106f1a..582f9343d6 100644
--- a/code/modules/gear_presets/upp.dm
+++ b/code/modules/gear_presets/upp.dm
@@ -83,7 +83,7 @@
 		new_human.equip_to_slot_or_del(new maybehat, WEAR_HEAD)
 
 	//body
-	var/obj/item/clothing/under/marine/veteran/UPP/UPP = new()
+	var/obj/item/clothing/under/marine/opfor/UPP/UPP = new()
 	new_human.equip_to_slot_or_del(UPP, WEAR_BODY)
 
 	var/maybejacket = prob(50) ? pick(/obj/item/clothing/suit/storage/marine/faction/UPP/jacket, /obj/item/clothing/suit/storage/snow_suit/soviet) : null
@@ -142,7 +142,7 @@
 	//head
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD)
 	//body
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/platoon, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET)
@@ -167,13 +167,16 @@
 
 /datum/equipment_preset/uscm/medic_equipped/upp
 	name = "UPP Squad Sanitar (Equipped)"
-	flags = EQUIPMENT_PRESET_EXTRA
-	paygrade = "UE4"
+	flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
 	access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_MEDPREP, ACCESS_UPP_MEDICAL)
-	assignment = "Squad Sanitar"
+	assignment = JOB_SQUAD_MEDIC_UPP
+	rank = JOB_SQUAD_MEDIC_UPP
+	paygrade = "UE4"
+	role_comm_title ="SNITR"
 	languages = list(LANGUAGE_RUSSIAN, LANGUAGE_CHINESE)
 	faction_group = list(FACTION_UPP)
 	faction = FACTION_UPP
+	skills = /datum/skills/combat_medic
 
 /datum/equipment_preset/uscm/medic_equipped/upp/load_gear(mob/living/carbon/human/new_human)
 	//back
@@ -191,7 +194,7 @@
 	//head
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD)
 	//body
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/medic, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/platoon, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/support, WEAR_JACKET) //medic should move fast
@@ -212,9 +215,6 @@
 	new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/tricordrazine, WEAR_IN_L_STORE)
 
-	if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
-		new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/green, WEAR_FACE)
-
 //*****************************************************************************************************/
 
 /datum/equipment_preset/uscm/smartgunner_equipped/upp
@@ -238,7 +238,7 @@
 	//head
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP/heavy, WEAR_HEAD)
 	//body
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/platoon, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/heavy, WEAR_JACKET)
@@ -277,7 +277,7 @@
 	//head
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD)
 	//body
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/platoon, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET)
@@ -318,7 +318,7 @@
 	//head
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD)
 	//body
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/platoon, WEAR_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET)
@@ -354,7 +354,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret, WEAR_HEAD)
 	//uniform
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/mp, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP/mp, WEAR_BODY)
 	//jacket
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/mp, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/revolver, WEAR_J_STORE)
@@ -388,7 +388,7 @@
 	//head
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret, WEAR_HEAD)
 	//uniform
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/officer, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP/officer, WEAR_BODY)
 	//jacket
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/officer, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET)
@@ -488,7 +488,7 @@
 	var/hat = pick(/obj/item/clothing/head/uppcap, /obj/item/clothing/head/uppcap/beret, /obj/item/clothing/head/uppcap/ushanka)
 	new_human.equip_to_slot_or_del(new hat, WEAR_HEAD)
 	//body
-	var/obj/item/clothing/under/marine/veteran/UPP/medic/UPP = new()
+	var/obj/item/clothing/under/marine/opfor/UPP = new()
 	var/obj/item/clothing/accessory/storage/tool_webbing/equipped/W = new()
 	UPP.attach_accessory(new_human, W)
 	new_human.equip_to_slot_or_del(UPP, WEAR_BODY)
@@ -532,7 +532,7 @@
 /datum/equipment_preset/upp/commando/load_gear(mob/living/carbon/human/new_human)
 	//TODO: add backpacks and satchels
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/kdo, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/commando, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_JACKET)
@@ -573,7 +573,7 @@
 /datum/equipment_preset/upp/commando/leader/load_gear(mob/living/carbon/human/new_human)
 	//TODO: add backpacks and satchels
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/kdo/command, WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP, WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/commando, WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_JACKET)
@@ -614,7 +614,7 @@
 	skills = /datum/skills/tank_crew
 
 /datum/equipment_preset/upp/tank/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/cct(new_human), WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES)
@@ -659,7 +659,7 @@
 	//head
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap, WEAR_HEAD)
 	//body
-	var/obj/item/clothing/under/marine/veteran/UPP/medic/UPP = new()
+	var/obj/item/clothing/under/marine/opfor/UPP = new()
 	var/obj/item/clothing/accessory/storage/surg_vest/equipped/W = new()
 	UPP.attach_accessory(new_human, W)
 	new_human.equip_to_slot_or_del(UPP, WEAR_BODY)
diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm
index 327f3c37c1..63b9ee5879 100644
--- a/code/modules/gear_presets/uscm.dm
+++ b/code/modules/gear_presets/uscm.dm
@@ -12,7 +12,7 @@
 
 	service_under = list(/obj/item/clothing/under/marine/service)
 	service_over = list(/obj/item/clothing/suit/storage/jacket/marine/service)
-	service_hat = list(/obj/item/clothing/head/marine/peaked/service)
+	service_hat = list(/obj/item/clothing/head/marine/peaked)
 	service_shoes = list(/obj/item/clothing/shoes/laceup)
 
 	dress_under = list(/obj/item/clothing/under/marine/blues)
@@ -205,94 +205,6 @@
 /datum/equipment_preset/uscm/sg/forecon/lesser_rank
 	paygrade = "ME4"
 
-//*****************************************************************************************************/
-
-/datum/equipment_preset/uscm/sg/full
-	name = "USCM Squad Smartgunner"
-	flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
-
-/datum/equipment_preset/uscm/sg/full/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/specrag(new_human), WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(new_human), WEAR_EYES)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
-
-/datum/equipment_preset/uscm/sg/full/load_status(mob/living/carbon/human/new_human)
-	return //No cryo munchies
-
-/datum/equipment_preset/uscm/rto
-	name = "USCM Radio Telephone Operator"
-	flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
-
-	access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP)
-	assignment = JOB_SQUAD_RTO
-	rank = JOB_SQUAD_RTO
-	paygrade = "ME4"
-	role_comm_title = "RTO"
-	skills = /datum/skills/pfc
-
-	minimap_icon = "rto"
-
-/datum/equipment_preset/uscm/rto/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
-
-/datum/equipment_preset/uscm/rto/lesser_rank
-	paygrade = "ME3"
-
-//*****************************************************************************************************/
-
-/datum/equipment_preset/uscm/tank
-	name = "USCM Vehicle Crewman (CRMN) (Cryo)"
-	flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
-
-	access = list(
-		ACCESS_MARINE_PREP,
-		ACCESS_MARINE_CREWMAN,
-		ACCESS_MARINE_ALPHA,
-		ACCESS_MARINE_BRAVO,
-		ACCESS_MARINE_CHARLIE,
-		ACCESS_MARINE_DELTA,
-	)
-	assignment = JOB_CREWMAN
-	rank = JOB_CREWMAN
-	paygrade = "ME4"
-	role_comm_title = "CRMN"
-	minimum_age = 30
-	skills = /datum/skills/tank_crew
-
-	minimap_icon = "vc"
-
-/datum/equipment_preset/uscm/tank/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine(new_human), WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
-
-
-/datum/equipment_preset/uscm/tank/load_status(mob/living/carbon/human/new_human)
-	return
-
-//*****************************************************************************************************/
-
-/datum/equipment_preset/uscm/tank/full
-	name = "USCM Vehicle Crewman (CRMN)"
-	flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
-
-/datum/equipment_preset/uscm/tank/full/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/vc(new_human), WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/operations(new_human), WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/brown(new_human), WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/weldpack(new_human), WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(new_human), WEAR_IN_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(new_human), WEAR_IN_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol(new_human), WEAR_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/mod88(new_human), WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/pilot(new_human), WEAR_HEAD)
-
 /*****************************************************************************************************/
 
 /datum/equipment_preset/uscm/medic
@@ -478,105 +390,74 @@
 	return paygrade
 
 /datum/equipment_preset/uscm/private_equipped/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
+	//back
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
+	//face
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine(new_human), WEAR_L_EAR)
+	//head
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(new_human), WEAR_L_EAR)
+	//body
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
-
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK)
-
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(new_human), WEAR_WAIST)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_BACK)
+	//limbs
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+	//pockets
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
 
 /datum/equipment_preset/uscm/private_equipped/cryo
 	name = "USCM Cryo Squad Rifleman (Equipped)"
 	auto_squad_name = SQUAD_MARINE_CRYO
 
-/datum/equipment_preset/uscm/private_equipped/upp
-	name = "UPP Squad Rifleman"
-	paygrade = "UE2"
-	access = list(ACCESS_UPP_GENERAL)
-	languages = list(LANGUAGE_RUSSIAN, LANGUAGE_CHINESE)
-	faction_group = list(FACTION_UPP)
-	faction = FACTION_UPP
-
-/datum/equipment_preset/uscm/private_equipped/upp/load_gear(mob/living/carbon/human/new_human)
-	//back
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp(new_human), WEAR_BACK)
-	//face
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR)
-	//head
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD)
-	//body
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp(new_human), WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp(new_human), WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71(new_human), WEAR_J_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/machete/full, WEAR_IN_BELT)
-	//limbs
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp_knife, WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/brown, WEAR_HANDS)
-	//pockets
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE)
-
-/datum/equipment_preset/uscm/private_equipped/upp/lesser_rank
-	paygrade = "UE1"
-
-
-//*****************************************************************************************************/
-
-/datum/equipment_preset/uscm/leader_equipped
-	name = "USCM Platoon Sergeant (Equipped)"
+/datum/equipment_preset/uscm/private_equipped/forecon
+	name = "FORECON Squad Rifleman (Equipped)"
 	flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
 
-	access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP)
-	assignment = JOB_SQUAD_LEADER
-	rank = JOB_SQUAD_LEADER
-	paygrade = "ME7"
-	role_comm_title = "PltSgt"
-	minimum_age = 27
-	skills = /datum/skills/SL
+	access = list(ACCESS_MARINE_PREP)
+	assignment = JOB_SQUAD_MARINE
+	rank = JOB_SQUAD_MARINE
+	paygrade = "ME3"
+	role_comm_title = "RFN"
+	skills = /datum/skills/pfc/recon
 
-	minimap_icon = "leader"
+	minimap_icon = "private"
 
-/datum/equipment_preset/uscm/leader_equipped/load_status(mob/living/carbon/human/new_human)
+/datum/equipment_preset/uscm/private_equipped/forecon/load_status(mob/living/carbon/human/new_human)
 	new_human.nutrition = NUTRITION_NORMAL
 
-/datum/equipment_preset/uscm/leader_equipped/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/leader(new_human), WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/lead(new_human), WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader(new_human), WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
+/datum/equipment_preset/uscm/private_equipped/forecon/load_rank(mob/living/carbon/human/new_human)
+	if(new_human.client)
+		if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1)
+			return "ME2"
+	return paygrade
 
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+/datum/equipment_preset/uscm/private_equipped/forecon/load_gear(mob/living/carbon/human/new_human)
+	//back
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(new_human), WEAR_WAIST)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_BACK)
-
-/datum/equipment_preset/uscm/leader_equipped/cryo
-	name = "USCM Cryo Platoon Sergeant (Equipped)"
-	auto_squad_name = SQUAD_MARINE_CRYO
+	//face
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof/survivor_forecon(new_human), WEAR_L_EAR)
+	//head
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD)
+	//body
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch(new_human), WEAR_ACCESSORY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/forecon(new_human), WEAR_ACCESSORY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/forecon(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/forecon(new_human), WEAR_J_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/machete/full(new_human), WEAR_IN_BELT)
+	//limbs
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle(new_human), WEAR_FEET)
+	//pockets
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/, WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/recon(new_human.back), WEAR_IN_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/recon(new_human.back), WEAR_IN_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/recon(new_human.back), WEAR_IN_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE)
 
 //*****************************************************************************************************/
 
@@ -597,20 +478,25 @@
 	new_human.nutrition = NUTRITION_NORMAL
 
 /datum/equipment_preset/uscm/smartgunner_equipped/load_gear(mob/living/carbon/human/new_human)
+	//back
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
+	//face
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine(new_human), WEAR_L_EAR)
+	//head
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD)
+	//body
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST)
+	//limbs
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+	//pockets
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(new_human), WEAR_EYES)
-
-
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(new_human), WEAR_L_EAR)
 
 /datum/equipment_preset/uscm/smartgunner_equipped/cryo
 	name = "USCM Cryo Squad Smartgunner (Equipped)"
@@ -637,33 +523,35 @@
 	new_human.nutrition = NUTRITION_NORMAL
 
 /datum/equipment_preset/uscm/medic_equipped/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic(new_human), WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/med(new_human), WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK)
-	if(prob(50))
-		new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE)
+	//back
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/medic(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line(new_human), WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft(new_human), WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator(new_human), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(new_human), WEAR_WAIST)
+	//face
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine(new_human), WEAR_L_EAR)
+	if(prob(50))
+		new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE)
 	if(new_human.disabilities & NEARSIGHTED)
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES)
 	else
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full(new_human), WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
-
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_JACKET)
+	//head
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic(new_human), WEAR_HEAD)
+	//body
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line(new_human), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft(new_human), WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(new_human), WEAR_WAIST)
+	//limbs
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+	//pockets
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full(new_human), WEAR_L_STORE)
 
 /datum/equipment_preset/uscm/medic_equipped/cryo
 	name = "USCM Cryo Hospital Corpsman (Equipped)"
@@ -671,29 +559,6 @@
 
 //*****************************************************************************************************/
 
-/datum/equipment_preset/uscm/specialist_equipped/sniper
-	name = "USCM Scout Sniper"
-
-/datum/equipment_preset/uscm/specialist_equipped/sniper/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles(new_human), WEAR_EYES)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/ghillie(new_human), WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/ghillie(new_human), WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smock(new_human), WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing(new_human), WEAR_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/incendiary(new_human), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/flak(new_human), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/flak(new_human), WEAR_IN_BACK)
-
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK)
-
-	spawn_weapon(/obj/item/weapon/gun/rifle/sniper/M42A, /obj/item/ammo_magazine/sniper, new_human, 0, 5)
-
-//*****************************************************************************************************/
-
 /datum/equipment_preset/uscm/tl_equipped
 	name = "USCM Squad Sergeant (Equipped)"
 	flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
@@ -711,39 +576,184 @@
 	new_human.nutrition = NUTRITION_NORMAL
 
 /datum/equipment_preset/uscm/tl_equipped/load_gear(mob/living/carbon/human/new_human)
-	//TODO: add backpacks and satchels
-	var/obj/item/clothing/under/marine/U = new(new_human)
-	var/obj/item/clothing/accessory/storage/webbing/W = new()
-	U.attach_accessory(new_human, W)
-	new_human.equip_to_slot_or_del(U, WEAR_BODY)
+	//back
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
+	//face
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine(new_human), WEAR_L_EAR)
+	//head
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD)
+	//body
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(new_human), WEAR_WAIST)
+	//limbs
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto(new_human), WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/tl(new_human), WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(src), WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(src), WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/rto(new_human), WEAR_BACK)
+	//pockets
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
+
+/datum/equipment_preset/uscm/tl_equipped/cryo
+	name = "USCM Cryo Squad Sergeant (Equipped)"
+	auto_squad_name = SQUAD_MARINE_CRYO
+
+//*****************************************************************************************************/
+
+/datum/equipment_preset/uscm/leader_equipped
+	name = "USCM Platoon Sergeant (Equipped)"
+	flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
+
+	access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP)
+	assignment = JOB_SQUAD_LEADER
+	rank = JOB_SQUAD_LEADER
+	paygrade = "ME7"
+	role_comm_title = "PltSgt"
+	minimum_age = 27
+	skills = /datum/skills/SL
+
+	minimap_icon = "leader"
+
+/datum/equipment_preset/uscm/leader_equipped/load_status(mob/living/carbon/human/new_human)
+	new_human.nutrition = NUTRITION_NORMAL
+
+/datum/equipment_preset/uscm/leader_equipped/load_gear(mob/living/carbon/human/new_human)
+	//back
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
+	//face
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine(new_human), WEAR_L_EAR)
+	//head
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD)
+	//body
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(new_human), WEAR_WAIST)
+	//limbs
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+	//pockets
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
+
+/datum/equipment_preset/uscm/leader_equipped/cryo
+	name = "USCM Cryo Platoon Sergeant (Equipped)"
+	auto_squad_name = SQUAD_MARINE_CRYO
+
+//*****************************************************************************************************/
+
+/datum/equipment_preset/uscm/sniper
+	name = "USCM Scout Sniper"
+	assignment = "Scout Sniper"
+/datum/equipment_preset/uscm/specialist_equipped/sniper/load_gear(mob/living/carbon/human/new_human)
+
+	//back
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smock(new_human), WEAR_BACK)
+	//face
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof(new_human), WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles(new_human), WEAR_EYES)
+	//head
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/ghillie(new_human), WEAR_HEAD)
+	//body
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/ghillie(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/sniper/M42A(new_human), WEAR_J_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine(new_human), WEAR_WAIST)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper(new_human), WEAR_IN_BELT)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper(new_human), WEAR_IN_BELT)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper(new_human), WEAR_IN_BELT)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper(new_human), WEAR_IN_BELT)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper(new_human), WEAR_IN_BELT)
+	//limbs
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET)
+	//pockets
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE)
+
+//*****************************************************************************************************/
+
+/datum/equipment_preset/uscm/rto
+	name = "USCM Radio Telephone Operator"
+	flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
+
+	access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP)
+	assignment = JOB_SQUAD_RTO
+	rank = JOB_SQUAD_RTO
+	paygrade = "ME4"
+	role_comm_title = "RTO"
+	skills = /datum/skills/pfc
+
+	minimap_icon = "rto"
+
+/datum/equipment_preset/uscm/rto/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
+
+/datum/equipment_preset/uscm/rto/lesser_rank
+	paygrade = "ME3"
+
+//*****************************************************************************************************/
+
+/datum/equipment_preset/uscm/tank
+	name = "USCM Vehicle Crewman"
+	flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
+
+	access = list(
+		ACCESS_MARINE_PREP,
+		ACCESS_MARINE_CREWMAN,
+		ACCESS_MARINE_ALPHA,
+		ACCESS_MARINE_BRAVO,
+		ACCESS_MARINE_CHARLIE,
+		ACCESS_MARINE_DELTA,
+	)
+	assignment = JOB_CREWMAN
+	rank = JOB_CREWMAN
+	paygrade = "ME4"
+	role_comm_title = "CRMN"
+	minimum_age = 18
+	skills = /datum/skills/tank_crew
+
+	minimap_icon = "vc"
+
+/datum/equipment_preset/uscm/tank/load_gear(mob/living/carbon/human/new_human)
+	//back
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK)
+	//face
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine(new_human), WEAR_L_EAR)
+	//head
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/pilot(new_human), WEAR_HEAD)
+	//body
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/operations(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST)
+	//limbs
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/brown(new_human), WEAR_HANDS)
+	//pockets
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(new_human), WEAR_IN_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(new_human), WEAR_IN_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol(new_human), WEAR_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/mod88(new_human), WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_L_HAND)
 
-	new_human.back.pickup(new_human)
+/datum/equipment_preset/uscm/tank/load_status(mob/living/carbon/human/new_human)
+	return
 
-/datum/equipment_preset/uscm/tl_equipped/cryo
-	name = "USCM Cryo Squad Sergeant (Equipped)"
-	auto_squad_name = SQUAD_MARINE_CRYO
+//*****************************************************************************************************/
 
-//############ Marine Raiders #############
-//Operator
 /datum/equipment_preset/uscm/marsoc
 	name = "USCM Raider"
 	flags = EQUIPMENT_PRESET_EXTRA
 	assignment = "Marine Raider"
 	rank = JOB_MARINE_RAIDER
-	role_comm_title = "Op."
+	role_comm_title = "RAIDER"
 	languages = list(LANGUAGE_ENGLISH, LANGUAGE_TSL)
 	skills = /datum/skills/commando/deathsquad
 	auto_squad_name = SQUAD_SOF
@@ -761,22 +771,15 @@
 
 /datum/equipment_preset/uscm/marsoc/load_gear(mob/living/carbon/human/new_human)
 	//back
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/marsoc, WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/super, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/super, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/super, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel, WEAR_BACK)
 	//face
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof, WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof/survivor_forecon, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/marsoc, WEAR_FACE)
 	//head
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/sof, WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_HELMET)
 	//uniform
-	var/obj/item/clothing/under/marine/veteran/marsoc/M = new()
+	var/obj/item/clothing/under/marine/opfor/marsoc/M = new()
 	var/obj/item/clothing/accessory/storage/black_vest/W = new()
 	M.attach_accessory(new_human, W)
 	new_human.equip_to_slot_or_del(M, WEAR_BODY)
@@ -803,17 +806,6 @@
 			return "ME7"
 	return paygrade
 
-//Covert Raiders
-/datum/equipment_preset/uscm/marsoc/covert
-	name = "Marine Raiders (!DEATHSQUAD! Covert)"
-	uses_special_name = TRUE
-/datum/equipment_preset/uscm/marsoc/covert/load_name(mob/living/carbon/human/new_human, randomise)
-	new_human.gender = MALE
-	new_human.change_real_name(new_human, "[pick(nato_phonetic_alphabet)]")
-	new_human.age = rand(20,30)
-/datum/equipment_preset/uscm/marsoc/covert/load_rank(mob/living/carbon/human/new_human)
-	return "O"
-
 //Team Leader
 /datum/equipment_preset/uscm/marsoc/sl
 	name = "Marine Raider Team Leader (!DEATHSQUAD!)"
@@ -830,28 +822,3 @@
 		if(get_job_playtime(new_human.client, rank) > JOB_PLAYTIME_TIER_2)
 			return "MO2"
 	return paygrade
-
-//Codenamed Team Leader
-/datum/equipment_preset/uscm/marsoc/sl/covert
-	name = "Marine Raider Team Leader (!DEATHSQUAD! Covert)"
-	uses_special_name = TRUE
-/datum/equipment_preset/uscm/marsoc/sl/covert/load_name(mob/living/carbon/human/new_human, randomise)
-	new_human.gender = MALE
-	new_human.change_real_name(new_human, "[pick(nato_phonetic_alphabet)]")
-	new_human.age = rand(20,30)
-/datum/equipment_preset/uscm/marsoc/sl/covert/load_rank(mob/living/carbon/human/new_human)
-	return "O"
-//Officer
-/datum/equipment_preset/uscm/marsoc/cmd
-	name = "Marine Raider Officer (!DEATHSQUAD!)"
-	assignment = JOB_MARINE_RAIDER_CMD
-	rank = JOB_MARINE_RAIDER_CMD
-	role_comm_title = "CMD."
-	paygrade = "MO3"
-	skills = /datum/skills/commando/deathsquad/officer
-
-/datum/equipment_preset/uscm/marsoc/cmd/load_rank(mob/living/carbon/human/new_human)
-	if(new_human.client)
-		if(get_job_playtime(new_human.client, rank) > JOB_PLAYTIME_TIER_3)
-			return "MO4"
-	return paygrade
diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm
index b68f15f964..679c198b0d 100644
--- a/code/modules/gear_presets/uscm_event.dm
+++ b/code/modules/gear_presets/uscm_event.dm
@@ -28,7 +28,7 @@
 	service_under = list(/obj/item/clothing/under/marine/service)
 	service_shoes = list(/obj/item/clothing/shoes/laceup)
 	service_extra = list(/obj/item/clothing/suit/storage/jacket/marine/service)
-	service_hat = list(/obj/item/clothing/head/marine/peaked/service)
+	service_hat = list(/obj/item/clothing/head/marine/peaked)
 
 	dress_under = list(/obj/item/clothing/under/marine/blues/nco)
 	dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
@@ -45,7 +45,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/peaked/service(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/peaked(new_human), WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/cmateba/full(new_human), WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET)
@@ -68,7 +68,7 @@
 	service_under = list(/obj/item/clothing/under/marine/service)
 	service_shoes = list(/obj/item/clothing/shoes/laceup)
 	service_extra = list(/obj/item/clothing/suit/storage/jacket/marine/service)
-	service_hat = list(/obj/item/clothing/head/marine/peaked/service)
+	service_hat = list(/obj/item/clothing/head/marine/peaked)
 
 /datum/equipment_preset/uscm_event/general/New()
 	. = ..()
@@ -81,7 +81,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general(new_human), WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/peaked/service(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/peaked(new_human), WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/large/mateba/impact(new_human), WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE)
diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm
index ee59ba3bcd..8ee7c628b1 100644
--- a/code/modules/gear_presets/uscm_ship.dm
+++ b/code/modules/gear_presets/uscm_ship.dm
@@ -12,7 +12,7 @@
 
 	service_under = list(/obj/item/clothing/under/marine/service)
 	service_over = list(/obj/item/clothing/suit/storage/jacket/marine/service)
-	service_hat = list(/obj/item/clothing/head/marine/peaked/service)
+	service_hat = list(/obj/item/clothing/head/marine/peaked)
 	service_shoes = list(/obj/item/clothing/shoes/laceup)
 
 	dress_under = list(/obj/item/clothing/under/marine/blues)
@@ -51,7 +51,7 @@
 	minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN
 
 /datum/equipment_preset/uscm_ship/reporter/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/reporter(new_human), WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine(new_human), WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/cyan(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
@@ -80,7 +80,7 @@
 	minimap_background = MINIMAP_ICON_BACKGROUND_CIC
 
 /datum/equipment_preset/uscm_ship/reporter_uscm/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/reporter(new_human), WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine(new_human), WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
@@ -198,7 +198,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/req/ro(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/khaki(new_human), WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol(new_human), WEAR_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/mod88(new_human), WEAR_IN_R_STORE)
@@ -264,7 +264,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/peaked/service(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/peaked(new_human), WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/command(new_human), WEAR_L_STORE)
 
@@ -296,7 +296,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/service(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/peaked/service(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/peaked(new_human), WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(new_human), WEAR_IN_L_STORE)
@@ -358,7 +358,7 @@
 
 /datum/equipment_preset/uscm_ship/so/upp/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command(new_human), WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/officer(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP/officer(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/np92(new_human), WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/peaked(new_human), WEAR_HEAD)
diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm
index 027628c179..5fea222061 100644
--- a/code/modules/gear_presets/whiteout.dm
+++ b/code/modules/gear_presets/whiteout.dm
@@ -54,7 +54,7 @@
 	//head
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD)
 	//uniform
-	var/obj/item/clothing/under/marine/veteran/pmc/commando/M = new()
+	var/obj/item/clothing/under/marine/opfor/pmc/commando/M = new()
 	var/obj/item/clothing/accessory/storage/webbing/W = new()
 	M.attach_accessory(new_human, W)
 	new_human.equip_to_slot_or_del(M, WEAR_BODY)
@@ -103,7 +103,7 @@
 	//head
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD)
 	//uniform
-	var/obj/item/clothing/under/marine/veteran/pmc/commando/M = new()
+	var/obj/item/clothing/under/marine/opfor/pmc/commando/M = new()
 	var/obj/item/clothing/accessory/storage/webbing/W = new()
 	M.attach_accessory(new_human, W)
 	new_human.equip_to_slot_or_del(M, WEAR_BODY)
diff --git a/code/modules/gear_presets/wy.dm b/code/modules/gear_presets/wy.dm
index ff756946c8..dbd04ebd80 100644
--- a/code/modules/gear_presets/wy.dm
+++ b/code/modules/gear_presets/wy.dm
@@ -89,3 +89,4 @@
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(new_human), WEAR_IN_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack(new_human), WEAR_IN_BACK)
 
+
diff --git a/code/modules/vehicles/apc/apc.dm b/code/modules/vehicles/apc/apc.dm
index f9a6e47dcd..5ff1265825 100644
--- a/code/modules/vehicles/apc/apc.dm
+++ b/code/modules/vehicles/apc/apc.dm
@@ -87,13 +87,13 @@ GLOBAL_LIST_EMPTY(command_apc_list)
 /obj/vehicle/multitile/apc/load_role_reserved_slots()
 	var/datum/role_reserved_slots/RRS = new
 	RRS.category_name = "Crewmen"
-	RRS.roles = list(JOB_CREWMAN, JOB_WO_CREWMAN, JOB_UPP_CREWMAN, JOB_PMC_CREWMAN)
+	RRS.roles = list(JOB_CREWMAN, JOB_UPP_CREWMAN, JOB_PMC_CREWMAN)
 	RRS.total = 2
 	role_reserved_slots += RRS
 
 	RRS = new
 	RRS.category_name = "Synthetic Unit"
-	RRS.roles = list(JOB_SYNTH, JOB_WO_SYNTH)
+	RRS.roles = list(JOB_SYNTH)
 	RRS.total = 1
 	role_reserved_slots += RRS
 
diff --git a/code/modules/vehicles/apc/apc_command.dm b/code/modules/vehicles/apc/apc_command.dm
index 998fd3e19f..5306badb9b 100644
--- a/code/modules/vehicles/apc/apc_command.dm
+++ b/code/modules/vehicles/apc/apc_command.dm
@@ -70,7 +70,7 @@
 /obj/vehicle/multitile/apc/command/load_role_reserved_slots()
 	var/datum/role_reserved_slots/RRS = new
 	RRS.category_name = "Crewmen"
-	RRS.roles = list(JOB_CREWMAN, JOB_WO_CREWMAN, JOB_UPP_CREWMAN, JOB_PMC_CREWMAN)
+	RRS.roles = list(JOB_CREWMAN, JOB_UPP_CREWMAN, JOB_PMC_CREWMAN)
 	RRS.total = 2
 	role_reserved_slots += RRS
 
@@ -82,7 +82,7 @@
 
 	RRS = new
 	RRS.category_name = "Synthetic Unit"
-	RRS.roles = list(JOB_SYNTH, JOB_WO_SYNTH)
+	RRS.roles = list(JOB_SYNTH)
 	RRS.total = 1
 	role_reserved_slots += RRS
 
diff --git a/code/modules/vehicles/apc/apc_medical.dm b/code/modules/vehicles/apc/apc_medical.dm
index c3b3a16bd8..3d66e0e59d 100644
--- a/code/modules/vehicles/apc/apc_medical.dm
+++ b/code/modules/vehicles/apc/apc_medical.dm
@@ -32,13 +32,13 @@
 /obj/vehicle/multitile/apc/medical/load_role_reserved_slots()
 	var/datum/role_reserved_slots/RRS = new
 	RRS.category_name = "Crewmen"
-	RRS.roles = list(JOB_CREWMAN, JOB_WO_CREWMAN, JOB_UPP_CREWMAN, JOB_PMC_CREWMAN)
+	RRS.roles = list(JOB_CREWMAN, JOB_UPP_CREWMAN, JOB_PMC_CREWMAN)
 	RRS.total = 2
 	role_reserved_slots += RRS
 
 	RRS = new
 	RRS.category_name = "Medical Support"
-	RRS.roles = JOB_MEDIC_ROLES_LIST + list(JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_SYNTH, JOB_WO_SYNTH)
+	RRS.roles = JOB_MEDIC_ROLES_LIST + list(JOB_SYNTH)
 	RRS.total = 1
 	role_reserved_slots += RRS
 
diff --git a/code/modules/vehicles/tank/tank.dm b/code/modules/vehicles/tank/tank.dm
index 3264b4bcea..a5f61d9945 100644
--- a/code/modules/vehicles/tank/tank.dm
+++ b/code/modules/vehicles/tank/tank.dm
@@ -89,7 +89,7 @@
 /obj/vehicle/multitile/tank/load_role_reserved_slots()
 	var/datum/role_reserved_slots/RRS = new
 	RRS.category_name = "Crewmen"
-	RRS.roles = list(JOB_CREWMAN, JOB_WO_CREWMAN, JOB_UPP_CREWMAN, JOB_PMC_CREWMAN)
+	RRS.roles = list(JOB_CREWMAN, JOB_UPP_CREWMAN, JOB_PMC_CREWMAN)
 	RRS.total = 2
 	role_reserved_slots += RRS
 
diff --git a/colonialmarines.dme b/colonialmarines.dme
index f1f1390726..291faaffc4 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -1528,7 +1528,6 @@
 #include "code\modules\cm_marines\anti_air.dm"
 #include "code\modules\cm_marines\codebook.dm"
 #include "code\modules\cm_marines\Donator_Items.dm"
-#include "code\modules\cm_marines\Donator_Kits.dm"
 #include "code\modules\cm_marines\dropship_ammo.dm"
 #include "code\modules\cm_marines\dropship_equipment.dm"
 #include "code\modules\cm_marines\m2c.dm"
diff --git a/icons/mob/humans/onmob/head-layer/head_0.dmi b/icons/mob/humans/onmob/head-layer/head_0.dmi
index 587f3acb38..fa5d67a615 100644
Binary files a/icons/mob/humans/onmob/head-layer/head_0.dmi and b/icons/mob/humans/onmob/head-layer/head_0.dmi differ
diff --git a/icons/mob/humans/onmob/head-layer/head_marine.dmi b/icons/mob/humans/onmob/head-layer/head_marine.dmi
index 43f7fb4fab..e59380f9a1 100644
Binary files a/icons/mob/humans/onmob/head-layer/head_marine.dmi and b/icons/mob/humans/onmob/head-layer/head_marine.dmi differ
diff --git a/icons/mob/humans/onmob/suit-layer/suit_civilian.dmi b/icons/mob/humans/onmob/suit-layer/suit_civilian.dmi
index efb90d0ba4..f8aafafb76 100644
Binary files a/icons/mob/humans/onmob/suit-layer/suit_civilian.dmi and b/icons/mob/humans/onmob/suit-layer/suit_civilian.dmi differ
diff --git a/icons/mob/humans/onmob/suit-layer/suit_marine.dmi b/icons/mob/humans/onmob/suit-layer/suit_marine.dmi
index 7133762fca..5bb2bd6de9 100644
Binary files a/icons/mob/humans/onmob/suit-layer/suit_marine.dmi and b/icons/mob/humans/onmob/suit-layer/suit_marine.dmi differ
diff --git a/icons/mob/humans/onmob/uniform-layer/uniform_civilian.dmi b/icons/mob/humans/onmob/uniform-layer/uniform_civilian.dmi
index ca24104d8e..6ea3b3a9b7 100644
Binary files a/icons/mob/humans/onmob/uniform-layer/uniform_civilian.dmi and b/icons/mob/humans/onmob/uniform-layer/uniform_civilian.dmi differ
diff --git a/icons/mob/humans/onmob/uniform-layer/uniform_marine.dmi b/icons/mob/humans/onmob/uniform-layer/uniform_marine.dmi
index 0e8a73d022..9b27575407 100644
Binary files a/icons/mob/humans/onmob/uniform-layer/uniform_marine.dmi and b/icons/mob/humans/onmob/uniform-layer/uniform_marine.dmi differ
diff --git a/icons/mob/humans/onmob/uniform-layer/war_correspondent.dmi b/icons/mob/humans/onmob/uniform-layer/war_correspondent.dmi
deleted file mode 100644
index 38bef4845c..0000000000
Binary files a/icons/mob/humans/onmob/uniform-layer/war_correspondent.dmi and /dev/null differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index d9dee77bed..07c5222d12 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/obj/items/clothing/shoes.dmi b/icons/obj/items/clothing/shoes.dmi
index 90504be231..c567701ff3 100644
Binary files a/icons/obj/items/clothing/shoes.dmi and b/icons/obj/items/clothing/shoes.dmi differ
diff --git a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm
index e6d91bfeaf..1e5214169f 100644
--- a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm
+++ b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm
@@ -1449,7 +1449,7 @@
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 4
 	},
-/obj/item/clothing/under/marine/veteran/pmc,
+/obj/item/clothing/under/marine/opfor/pmc,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
 	},
@@ -1469,7 +1469,7 @@
 /obj/effect/decal/cleanable/blood,
 /obj/effect/spawner/gibspawner/human,
 /obj/item/clothing/head/helmet/marine/veteran/pmc,
-/obj/item/clothing/under/marine/veteran/pmc,
+/obj/item/clothing/under/marine/opfor/pmc,
 /obj/item/clothing/head/helmet/marine/veteran/pmc,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm
index bd48ecbe77..c9bc2165ea 100644
--- a/maps/map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm
+++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm
@@ -177,7 +177,7 @@
 "mz" = (
 /obj/structure/surface/table/reinforced/prison,
 /obj/item/clothing/accessory/storage/webbing,
-/obj/item/clothing/under/marine/veteran/mercenary/support{
+/obj/item/clothing/under/marine/opfor/mercenary/support{
 	layer = 2.9;
 	pixel_y = 6
 	},
diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
index b72e1e4e9e..4e1fbda417 100644
--- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
+++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
@@ -258,7 +258,7 @@
 /area/shiva/interior/caves/right_spiders)
 "aaR" = (
 /obj/effect/spider/stickyweb,
-/obj/item/clothing/under/marine/veteran/marsoc,
+/obj/item/clothing/under/marine/opfor/marsoc,
 /turf/open/auto_turf/ice/layer1,
 /area/shiva/interior/caves/right_spiders)
 "aaS" = (
@@ -9641,7 +9641,7 @@
 /area/shiva/exterior/junkyard/fortbiceps)
 "ect" = (
 /obj/structure/closet/crate/trashcart,
-/obj/item/clothing/under/marine/veteran/mercenary,
+/obj/item/clothing/under/marine/opfor/mercenary,
 /obj/item/clothing/suit/armor/vest/security,
 /turf/open/floor/shiva{
 	icon_state = "floor3"
@@ -10398,7 +10398,7 @@
 /area/shiva/interior/warehouse)
 "fbI" = (
 /obj/structure/closet/crate/trashcart,
-/obj/item/clothing/under/marine/veteran/mercenary/support,
+/obj/item/clothing/under/marine/opfor/mercenary/support,
 /obj/item/clothing/suit/armor/vest/security,
 /turf/open/floor/shiva{
 	icon_state = "floor3"
diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index 42ec6eb078..876b1bcac2 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -23156,7 +23156,7 @@
 	dir = 1
 	},
 /obj/item/clothing/head/helmet/marine/veteran/pmc,
-/obj/item/clothing/under/marine/veteran/pmc,
+/obj/item/clothing/under/marine/opfor/pmc,
 /obj/item/storage/fancy/cigar,
 /turf/open/floor{
 	dir = 5;
diff --git a/maps/map_files/LV624/hydro/30.destroyed.dmm b/maps/map_files/LV624/hydro/30.destroyed.dmm
index 5235c1f45a..983558c3c3 100644
--- a/maps/map_files/LV624/hydro/30.destroyed.dmm
+++ b/maps/map_files/LV624/hydro/30.destroyed.dmm
@@ -208,7 +208,7 @@
 	},
 /obj/effect/decal/cleanable/blood,
 /obj/item/weapon/gun/smg/fp9000,
-/obj/item/clothing/under/marine/veteran/pmc/leader{
+/obj/item/clothing/under/marine/opfor/pmc/leader{
 	pixel_x = -7
 	},
 /turf/open/floor/plating{
@@ -237,7 +237,7 @@
 	current_rounds = 2
 	},
 /obj/effect/spawner/gibspawner/human,
-/obj/item/clothing/under/marine/veteran/pmc{
+/obj/item/clothing/under/marine/opfor/pmc{
 	pixel_x = 6;
 	pixel_y = 8
 	},
@@ -252,7 +252,7 @@
 /area/lv624/lazarus/hydroponics)
 "xF" = (
 /obj/effect/decal/cleanable/blood,
-/obj/item/clothing/under/marine/veteran/pmc{
+/obj/item/clothing/under/marine/opfor/pmc{
 	pixel_x = -7;
 	pixel_y = 9
 	},
diff --git a/maps/map_files/LV624_Fixed/LV624_repaired.dmm b/maps/map_files/LV624_Fixed/LV624_repaired.dmm
index a8ab3fcda3..1e3cd8427f 100644
--- a/maps/map_files/LV624_Fixed/LV624_repaired.dmm
+++ b/maps/map_files/LV624_Fixed/LV624_repaired.dmm
@@ -14786,7 +14786,7 @@
 	dir = 1
 	},
 /obj/item/clothing/head/helmet/marine/veteran/pmc,
-/obj/item/clothing/under/marine/veteran/pmc,
+/obj/item/clothing/under/marine/opfor/pmc,
 /obj/item/storage/fancy/cigar,
 /turf/open/floor{
 	dir = 5;
diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm
index ec03e22945..60cd77e05b 100644
--- a/maps/map_files/chapaev/chapaev.dmm
+++ b/maps/map_files/chapaev/chapaev.dmm
@@ -1774,7 +1774,7 @@
 	},
 /obj/item/clothing/shoes/marine/upp,
 /obj/item/device/radio/headset/distress/UPP,
-/obj/item/clothing/under/marine/veteran/UPP/medic,
+/obj/item/clothing/under/marine/opfor/UPP/medic,
 /turf/open/floor/strata{
 	dir = 4;
 	icon_state = "cyan1"
@@ -1914,7 +1914,7 @@
 /area/golden_arrow/medical)
 "tq" = (
 /obj/structure/machinery/cm_vending/sorted/marine_food{
-	desc = "USCM Food Vendor, containing standard military Prepared Meals. It was gifted to Chapaev by Marines of 1st Platoon, Sun Riders as a sign of good will. They did not complain receiving a crate of vodka in return."
+	desc = "USCM Food Vendor, containing standard military Prepared Meals. It was gifted to the Chapaev by 3rd Battalion, 2nd Colonial Marines as a sign of good will. They did not complain receiving a crate of vodka in return."
 	},
 /turf/open/floor/strata{
 	dir = 6;
@@ -2299,7 +2299,7 @@
 	job = "Smartgunner"
 	},
 /obj/item/clothing/shoes/marine/upp,
-/obj/item/clothing/under/marine/veteran/UPP,
+/obj/item/clothing/under/marine/opfor/UPP,
 /obj/item/device/radio/headset/distress/UPP,
 /obj/structure/machinery/light{
 	dir = 4;
@@ -2760,7 +2760,7 @@
 	has_cryo_gear = 0
 	},
 /obj/item/clothing/shoes/marine/upp,
-/obj/item/clothing/under/marine/veteran/UPP,
+/obj/item/clothing/under/marine/opfor/UPP,
 /obj/item/device/radio/headset/distress/UPP,
 /turf/open/floor/strata{
 	dir = 4;
@@ -2840,7 +2840,7 @@
 	job = "Squad Sergeant"
 	},
 /obj/item/clothing/shoes/marine/upp,
-/obj/item/clothing/under/marine/veteran/UPP,
+/obj/item/clothing/under/marine/opfor/UPP,
 /obj/item/device/radio/headset/distress/UPP,
 /obj/structure/machinery/light{
 	dir = 8;
@@ -3918,7 +3918,7 @@
 	job = "Smartgunner"
 	},
 /obj/item/clothing/shoes/marine/upp,
-/obj/item/clothing/under/marine/veteran/UPP,
+/obj/item/clothing/under/marine/opfor/UPP,
 /obj/item/device/radio/headset/distress/UPP,
 /turf/open/floor/strata{
 	dir = 4;
@@ -4341,7 +4341,7 @@
 	icon_state = "cabinetdetective_locked";
 	job = "Platoon Commander"
 	},
-/obj/item/clothing/under/marine/veteran/UPP/boiler,
+/obj/item/clothing/under/marine/opfor/UPP/boiler,
 /turf/open/floor/strata{
 	dir = 6;
 	icon_state = "multi_tiles"
@@ -4771,7 +4771,7 @@
 	job = "Squad Sergeant"
 	},
 /obj/item/clothing/shoes/marine/upp,
-/obj/item/clothing/under/marine/veteran/UPP,
+/obj/item/clothing/under/marine/opfor/UPP,
 /obj/item/device/radio/headset/distress/UPP,
 /turf/open/floor/strata{
 	dir = 4;
@@ -4859,7 +4859,7 @@
 	job = "Platoon Sergeant"
 	},
 /obj/item/clothing/shoes/marine/upp,
-/obj/item/clothing/under/marine/veteran/UPP,
+/obj/item/clothing/under/marine/opfor/UPP,
 /obj/item/device/radio/headset/distress/UPP,
 /turf/open/floor/strata{
 	dir = 4;