WIP

code/datums/map_config.dm

@@ -74,9 +74,7 @@
 	synth_survivor_types = list(
 		/datum/equipment_preset/synth/survivor/medical_synth,
 		/datum/equipment_preset/synth/survivor/emt_synth,
-		/datum/equipment_preset/synth/survivor/scientist_synth,
-		/datum/equipment_preset/synth/survivor/engineer_synth,
-		/datum/equipment_preset/synth/survivor/freelancer_synth,
+,
 		/datum/equipment_preset/synth/survivor/wy/security_synth,
 		/datum/equipment_preset/synth/survivor/wy/protection_synth,
 		/datum/equipment_preset/synth/survivor/wy/corporate_synth,

code/datums/supply_packs/black_market.dm

@@ -1058,17 +1058,8 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro
 			new /obj/item/reagent_container/food/drinks/bottle/kahlua(loc)
 			new /obj/item/reagent_container/food/drinks/bottle/rum(loc)
 			loot_message = SPAN_NOTICE("It's a bunch of finished and unfinished molotovs.")
-		if(41 to 45)
-		// Spare CLF gear!
-			new /obj/effect/essentials_set/random/clf_shoes(loc)
-			new /obj/item/clothing/under/boiler/grey(loc)
-			new /obj/effect/essentials_set/random/clf_armor(loc)
-			new /obj/effect/essentials_set/random/clf_gloves(loc)
-			new /obj/effect/essentials_set/random/clf_head(loc)
-			new /obj/effect/essentials_set/random/clf_belt(loc)
-			loot_message = SPAN_NOTICE("It's a spare set of CLF equipment. You probably shouldn't wear this...")
 		// That was the good 50%. Now it's time for the bad.
-		if(46 to 50)
+		if(41 to 50)
 		// Random junk
 			new /obj/effect/essentials_set/random/clf_bonus_item(loc)
 			new /obj/effect/essentials_set/random/clf_bonus_item(loc)

code/game/machinery/vending/vendor_types/antag/antag_clothing.dm

@@ -39,62 +39,3 @@
 			listed_products[/datum/equipment_preset/clf] = GLOB.gear_path_presets_list[/datum/equipment_preset/clf].get_antag_clothing_equipment()
 		products_sets = listed_products[/datum/equipment_preset/clf]
 	return products_sets
-
-//--------------RANDOM EQUIPMENT AND GEAR------------------------
-
-/obj/effect/essentials_set/random/clf_shoes
-	spawned_gear_list = list(
-		/obj/item/clothing/shoes/laceup,
-		/obj/item/clothing/shoes/laceup/brown,
-		/obj/item/clothing/shoes/marine/civilian,
-		/obj/item/clothing/shoes/marine/civilian/brown,
-	)
-
-/obj/effect/essentials_set/random/clf_armor
-	spawned_gear_list = list(
-		/obj/item/clothing/suit/armor/vest,
-		/obj/item/clothing/suit/armor/bulletproof,
-		/obj/item/clothing/suit/storage/militia/brace,
-		/obj/item/clothing/suit/storage/militia,
-		/obj/item/clothing/suit/storage/militia/partial,
-		/obj/item/clothing/suit/storage/militia/vest,
-	)
-
-/obj/effect/essentials_set/random/clf_gloves
-	spawned_gear_list = list(
-		/obj/item/clothing/gloves/black,
-		/obj/item/clothing/gloves/botanic_leather,
-		/obj/item/clothing/gloves/combat,
-		/obj/item/clothing/gloves/swat,
-	)
-
-/obj/effect/essentials_set/random/clf_head
-	spawned_gear_list = list(
-		/obj/item/clothing/head/militia,
-		/obj/item/clothing/head/militia/bucket,
-		/obj/item/clothing/head/helmet/skullcap,
-		/obj/item/clothing/head/hardhat,
-		/obj/item/clothing/head/helmet,
-		/obj/item/clothing/head/bandana,
-		/obj/item/clothing/head/headband/red,
-		/obj/item/clothing/head/headband/rambo,
-		/obj/item/clothing/head/headband/rebel,
-		/obj/item/clothing/head/helmet/swat,
-	)
-
-/obj/effect/essentials_set/random/clf_belt
-	spawned_gear_list = list(
-		/obj/item/storage/belt/marine,
-		/obj/item/storage/belt/marine,
-		/obj/item/storage/belt/marine,
-		/obj/item/storage/belt/marine,
-		/obj/item/storage/belt/marine,
-		/obj/item/storage/belt/gun/flaregun/full,
-		/obj/item/storage/belt/gun/flaregun/full,
-		/obj/item/storage/backpack/general_belt,
-		/obj/item/storage/backpack/general_belt,
-		/obj/item/storage/backpack/general_belt,
-		/obj/item/storage/belt/knifepouch,
-		/obj/item/storage/large_holster/katana/full,
-		/obj/item/storage/large_holster/machete/full,
-	)

code/game/machinery/vending/vendor_types/crew/synthetic.dm

@@ -85,7 +85,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list(
 		list("Experimental Tool Vendor Token", 0, /obj/item/coin/marine/synth, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
 
 		list("RADIO (TAKE ALL)", 0, null, null, null),
-		list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom/cdrcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
+		list("Headset", 0, /obj/item/device/radio/headset/almayer/marine, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
 
 		list("UNIFORM (CHOOSE 1)", 0, null, null, null),
 		list("Uniform, Standard Synth", 0, /obj/item/clothing/under/boiler/darkblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
@@ -167,93 +167,45 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list(
 
 GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
 	list("USCM UNIFORMS", 0, null, null, null),
-	list("Medical Scrubs, Blue", 12, /obj/item/clothing/under/medical/blue, null, VENDOR_ITEM_REGULAR),
-	list("Medical Scrubs, Light Blue", 0, /obj/item/clothing/under/medical, null, VENDOR_ITEM_REGULAR),
-	list("Medical Scrubs, Green", 12, /obj/item/clothing/under/medical/green, null, VENDOR_ITEM_REGULAR),
-	list("Medical Scrubs, Purple", 12, /obj/item/clothing/under/medical/purple, null, VENDOR_ITEM_REGULAR),
-	list("Medical Scrubs, White", 12, /obj/item/clothing/under/medical, null, VENDOR_ITEM_REGULAR),
+	list("Utility Boilersuit, Dark Blue", 12, /obj/item/clothing/under/boiler/darkblue, null, VENDOR_ITEM_REGULAR),
+	list("Utility Boilersuit, Light Blue", 12, /obj/item/clothing/under/boiler/lightblue, null, VENDOR_ITEM_REGULAR),
+	list("USCM Battle Dress Uniform", 12, /obj/item/clothing/under/marine, null, VENDOR_ITEM_REGULAR),
+	list("USCM Operations Uniform", 12, /obj/item/clothing/under/marine, null, VENDOR_ITEM_REGULAR),
 	list("USCM Service Uniform", 12, /obj/item/clothing/under/marine/service, null, VENDOR_ITEM_REGULAR),
 
 	list("GLASSES", 0, null, null, null),
 	list("HealthMate HUD", 12, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_REGULAR),
-	list("Marine RPG Glasses", 12, /obj/item/clothing/glasses/regular, null, VENDOR_ITEM_REGULAR),
-	list("Optical Meson Scanner", 12, /obj/item/clothing/glasses/meson, null, VENDOR_ITEM_REGULAR),
-	list("PatrolMate HUD", 12, /obj/item/clothing/glasses/hud/security, null, VENDOR_ITEM_REGULAR),
-	list("Sunglasses", 12, /obj/item/clothing/glasses/sunglasses, null, VENDOR_ITEM_REGULAR),
 	list("Welding Goggles", 12, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR),
 
 	list("SHOES", 0, null, null, null),
-	list("Shoes, Black", 12, /obj/item/clothing/shoes/black, null, VENDOR_ITEM_REGULAR),
-	list("Shoes, Blue", 12, /obj/item/clothing/shoes/blue, null, VENDOR_ITEM_REGULAR),
-	list("Shoes, Brown", 12, /obj/item/clothing/shoes/brown, null, VENDOR_ITEM_REGULAR),
-	list("Shoes, Green", 12, /obj/item/clothing/shoes/green, null, VENDOR_ITEM_REGULAR),
-	list("Shoes, Purple", 12, /obj/item/clothing/shoes/purple, null, VENDOR_ITEM_REGULAR),
 	list("Shoes, Red", 12, /obj/item/clothing/shoes/red, null, VENDOR_ITEM_REGULAR),
 	list("Shoes, White", 12, /obj/item/clothing/shoes/white, null, VENDOR_ITEM_REGULAR),
-	list("Shoes, Yellow", 12, /obj/item/clothing/shoes/yellow, null, VENDOR_ITEM_REGULAR),
 	list("Dress Shoes", 24, /obj/item/clothing/shoes/laceup, null, VENDOR_ITEM_REGULAR),
 
 	list("HEADWEAR", 0, null, null, null),
-	list("Beanie", 12, /obj/item/clothing/head/beanie, null, VENDOR_ITEM_REGULAR),
-	list("Surgical Cap, Blue", 12, /obj/item/clothing/head/surgery/blue, null, VENDOR_ITEM_REGULAR),
-	list("Surgical Cap, Blue", 12, /obj/item/clothing/head/surgery/purple, null, VENDOR_ITEM_REGULAR),
-	list("Surgical Cap, Green", 12, /obj/item/clothing/head/surgery/green, null, VENDOR_ITEM_REGULAR),
-	list("Ushanka", 12, /obj/item/clothing/head/ushanka, null, VENDOR_ITEM_REGULAR),
-	list("Cap", 12, /obj/item/clothing/head/cmcap, null, VENDOR_ITEM_REGULAR),
-	list("QM Cap", 12, /obj/item/clothing/head/cmcap/req/ro, null, VENDOR_ITEM_REGULAR),
-	list("Req Cap", 12, /obj/item/clothing/head/cmcap/req, null, VENDOR_ITEM_REGULAR),
-	list("Bio Hood", 12, /obj/item/clothing/head/bio_hood/synth, null, VENDOR_ITEM_REGULAR),
+	list("Patrol Cap, Green", 12, /obj/item/clothing/head/cmcap, null, VENDOR_ITEM_REGULAR),
+	list("Patrol Cap, Command", 12, /obj/item/clothing/head/cmcap, null, VENDOR_ITEM_REGULAR),
+	list("Patrol Cap, Khaki", 12, /obj/item/clothing/head/cmcap/req, null, VENDOR_ITEM_REGULAR),
 
 	list("HELMET", 0, null, null, null),
 	list("Marine Helmet (Mission-Specific Camo)", 12, /obj/item/clothing/head/helmet/marine, null, VENDOR_ITEM_REGULAR),
-	list("Marine Helmet (Grey)", 12, /obj/item/clothing/head/helmet/marine/grey, null, VENDOR_ITEM_REGULAR),
-	list("Marine Helmet (Jungle)", 12, /obj/item/clothing/head/helmet/marine/jungle, null, VENDOR_ITEM_REGULAR),
-	list("Marine Helmet (Snow)", 12, /obj/item/clothing/head/helmet/marine/snow, null, VENDOR_ITEM_REGULAR),
-	list("Marine Helmet (Desert)", 12, /obj/item/clothing/head/helmet/marine/desert, null, VENDOR_ITEM_REGULAR),
-	list("Technician Helmet", 12, /obj/item/clothing/head/helmet/marine/tech, null, VENDOR_ITEM_REGULAR),
-	list("Corpsman Helmet", 12, /obj/item/clothing/head/helmet/marine/medic, null, VENDOR_ITEM_REGULAR),
-	list("Attachable Helmet Shield", 12, /obj/item/prop/helmetgarb/riot_shield, null, VENDOR_ITEM_REGULAR),
 
 	list("SUIT", 0, null, null, null),
 	list("External Webbing", 12, /obj/item/clothing/suit/storage/webbing, null, VENDOR_ITEM_REGULAR),
 	list("Utility Vest", 12, /obj/item/clothing/suit/storage/webbing/utility_vest, null, VENDOR_ITEM_REGULAR),
-	list("Hazard Vest(Orange)", 12, /obj/item/clothing/suit/storage/hazardvest, null, VENDOR_ITEM_REGULAR),
-	list("Hazard Vest(Blue)", 12, /obj/item/clothing/suit/storage/hazardvest/blue, null, VENDOR_ITEM_REGULAR),
-	list("Hazard Vest(Yellow)", 12, /obj/item/clothing/suit/storage/hazardvest/yellow, null, VENDOR_ITEM_REGULAR),
-	list("Hazard Vest(Black)", 12, /obj/item/clothing/suit/storage/hazardvest/black, null, VENDOR_ITEM_REGULAR),
-	list("USCM Service Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/service, null, VENDOR_ITEM_REGULAR),
 	list("Windbreaker, Brown", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown, null, VENDOR_ITEM_REGULAR),
 	list("Windbreaker, Grey", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_gray, null, VENDOR_ITEM_REGULAR),
 	list("Windbreaker, Green", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_green, null, VENDOR_ITEM_REGULAR),
-	list("Windbreaker, First Responder", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_fr, null, VENDOR_ITEM_REGULAR),
-	list("Windbreaker, Exploration", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_covenant, null, VENDOR_ITEM_REGULAR),
-	list("Labcoat", 12, /obj/item/clothing/suit/storage/labcoat, null, VENDOR_ITEM_REGULAR),
-	list("Quartermaster Jacket", 12, /obj/item/clothing/suit/storage/RO, null, VENDOR_ITEM_REGULAR),
-	list("Bio Suit", 12, /obj/item/clothing/suit/storage/synthbio, null, VENDOR_ITEM_REGULAR),
-	list("USCM Poncho (Mission-Specific Camo)", 12, /obj/item/clothing/accessory/poncho, null, VENDOR_ITEM_REGULAR),
-	list("USCM Poncho (Green)", 12, /obj/item/clothing/accessory/poncho/green, null, VENDOR_ITEM_REGULAR),
-	list("USCM Poncho (Brown)", 12, /obj/item/clothing/accessory/poncho/brown, null, VENDOR_ITEM_REGULAR),
-	list("USCM Poncho (Black)", 12, /obj/item/clothing/accessory/poncho/black, null, VENDOR_ITEM_REGULAR),
-	list("USCM Poncho (Blue)", 12, /obj/item/clothing/accessory/poncho/blue, null, VENDOR_ITEM_REGULAR),
-	list("USCM Poncho (Purple)", 12, /obj/item/clothing/accessory/poncho/purple, null, VENDOR_ITEM_REGULAR),
+
 
 
 	list("BACKPACK", 0, null, null, null),
-	list("Backpack, Industrial", 12, /obj/item/storage/backpack/industrial, null, VENDOR_ITEM_REGULAR),
-	list("Backpack, USCM Medical", 12, /obj/item/storage/backpack/marine/medic, null, VENDOR_ITEM_REGULAR),
 	list("Chestrig, Technician", 12, /obj/item/storage/backpack/marine/satchel/tech, null, VENDOR_ITEM_REGULAR),
 	list("Satchel, USCM", 12, /obj/item/storage/backpack/marine/satchel, null, VENDOR_ITEM_REGULAR),
-	list("Satchel, Leather", 12, /obj/item/storage/backpack/satchel, null, VENDOR_ITEM_REGULAR),
 	list("USCM RTO Pack", 12, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR),
 	list("USCM Welderpack", 12, /obj/item/storage/backpack/marine/engineerpack, null, VENDOR_ITEM_REGULAR),
 	list("USCM Weldersatchel", 12, /obj/item/storage/backpack/marine/engineerpack/satchel, null, VENDOR_ITEM_REGULAR),
 	list("USCM Welder Chestrig", 12, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, null, VENDOR_ITEM_REGULAR),
-
-	list("OTHER", 0, null, null, null),
-	list("Red Armband", 6, /obj/item/clothing/accessory/armband, null, VENDOR_ITEM_REGULAR),
-	list("Yellow Armband", 6, /obj/item/clothing/accessory/armband/engine, null, VENDOR_ITEM_REGULAR),
-	list("Green Armband", 6, /obj/item/clothing/accessory/armband/medgreen, null, VENDOR_ITEM_REGULAR),
-
 ))
 
 /obj/structure/machinery/cm_vending/clothing/synth/snowflake

code/modules/clothing/head/helmet.dm

@@ -771,19 +771,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	flags_item = MOB_LOCK_ON_EQUIP
 	specialty = "M45 ghillie"
 
-/obj/item/clothing/head/helmet/marine/CO
-	name = "\improper M10 pattern commanding officer helmet"
-	desc = "A special M10 Pattern Helmet worn by Commanding Officers of the USCM. It reads on the label, 'The difference between an open-casket and closed-casket funeral. Wear on head for best results.'."
-	icon_state = "co_officer"
-	item_state = "co_officer"
-	armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
-	armor_bullet = CLOTHING_ARMOR_HIGH
-	armor_energy = CLOTHING_ARMOR_MEDIUMLOW
-	armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
-	specialty = "M10 pattern captain"
-	flags_atom = NO_SNOW_TYPE
-	built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced, new /obj/item/device/helmet_visor/security)
-
 /obj/item/clothing/head/helmet/marine/MP
 	name = "\improper M10 pattern MP helmet"
 	desc = "A special variant of the M10 Pattern Helmet worn by the Military Police of the USCM. Whether you're facing a crime syndicate or a mutiny, this bucket will keep your brains intact."
@@ -1239,17 +1226,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	cell_explosion(loc, 40, 18, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
 	qdel(src)
 
-/obj/item/clothing/head/helmet/marine/reporter
-	name = "press helmet"
-	desc = "A helmet designed to make it clear that the wearer is safety aware and not looking for a fight."
-	icon = 'icons/mob/humans/onmob/contained/war_correspondent.dmi'
-	icon_state = "wc_helm"
-	item_state = "wc_helm"
-	contained_sprite = TRUE
-	flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
-
-	built_in_visors = list()
-
 /obj/item/clothing/head/helmet/marine/cbrn_hood
 	name = "\improper M3 MOPP mask"
 	desc = "The M3 MOPP mask includes a full covering cowl that securely attaches to the MOPP suit. The mask filters out harmful particles in the air to allow the wearer to breathe safely in the field. Depending on the hostility of the contaminated area the mask’s filter will last an average of 12 hours or less."

code/modules/clothing/suits/civilian_suit.dm

@@ -391,9 +391,9 @@
 	desc = "A brown windbreaker."
 	icon_state = "windbreaker_brown"
 
-/obj/item/clothing/suit/storage/windbreaker/gray
-	desc = "A gray windbreaker."
-	icon_state = "windbreaker_gray"
+/obj/item/clothing/suit/storage/windbreaker/blue
+	desc = "A blue windbreaker."
+	icon_state = "windbreaker_blue"
 
 /obj/item/clothing/suit/storage/windbreaker/green
 	desc = "A green windbreaker."

code/modules/clothing/suits/clf_suit.dm

@@ -83,8 +83,6 @@
 	armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
 	armor_energy = CLOTHING_ARMOR_MEDIUMLOW
 	storage_slots = 2
-	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/freelancer)
-
 //this one is for CLF
 /obj/item/clothing/suit/storage/militia
 	name = "colonial militia hauberk"

code/modules/clothing/suits/gimmick_suit.dm

@@ -8,7 +8,6 @@
 	armor_rad = CLOTHING_ARMOR_MEDIUM
 	storage_slots = 2
 	slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
-	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 +22,6 @@
 	storage_slots = 2
 	light_range = 7
 	slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
-	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/dutch)
 
 /obj/item/clothing/suit/armor/gimmick/dutch
 	name = "armored jacket"
@@ -64,7 +62,6 @@
 	slowdown = SLOWDOWN_ARMOR_LIGHT
 	storage_slots = 2
 	movement_compensation = SLOWDOWN_ARMOR_LIGHT
-	uniform_restricted = list(/obj/item/clothing/under/marine/opfor/van_bandolier)
 	allowed = list(
 		/obj/item/weapon/gun,
 		/obj/item/tank/emergency_oxygen,

code/modules/clothing/suits/upp_suit.dm

@@ -31,7 +31,6 @@
 	armor_rad = CLOTHING_ARMOR_MEDIUMLOW
 	armor_internaldamage = CLOTHING_ARMOR_HIGH
 	storage_slots = 3
-	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"
@@ -156,7 +155,6 @@
 	armor_bio = CLOTHING_ARMOR_MEDIUM
 	armor_rad = CLOTHING_ARMOR_MEDIUMLOW
 	armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS
-	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,