WIP

code/datums/map_config.dm

@@ -70,15 +70,6 @@
 	var/override_map
 
 /datum/map_config/New()
-	survivor_types = list(
-		/datum/equipment_preset/survivor/scientist,
-		/datum/equipment_preset/survivor/doctor,
-		/datum/equipment_preset/survivor/chef,
-		/datum/equipment_preset/survivor/chaplain,
-		/datum/equipment_preset/survivor/miner,
-		/datum/equipment_preset/survivor/colonial_marshal,
-		/datum/equipment_preset/survivor/engineer,
-	)
 
 	synth_survivor_types = list(
 		/datum/equipment_preset/synth/survivor/medical_synth,

code/datums/skills/civilian.dm

@@ -19,8 +19,6 @@ CIVILIAN
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
 		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
-		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_INTEL = SKILL_INTEL_EXPERT,
 	)
@@ -59,7 +57,7 @@ CIVILIAN
 		SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
 	)
 
-/datum/skills/civilian/survivor/manager
+/datum/skills/civilian/manager
 	name = "Weyland-Yutani Manager"
 	skills = list(
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
@@ -68,19 +66,19 @@ CIVILIAN
 		SKILL_INTEL = SKILL_INTEL_EXPERT,
 	)
 
-/datum/skills/civilian/survivor/goon
-	name = "Survivor Goon"
+/datum/skills/civilian/security
+	name = "Security"
 	skills = list(
 		SKILL_CQC = SKILL_CQC_TRAINED,
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
-		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
+		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 	)
 
-/datum/skills/civilian/survivor/pmc
+/datum/skills/civilian/pmc
 	name = "Survivor PMC"
 	additional_skills = list(
 		SKILL_CQC = SKILL_CQC_TRAINED,
@@ -91,7 +89,7 @@ CIVILIAN
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 	)
 
-/datum/skills/civilian/survivor/pmc/medic
+/datum/skills/civilian/pmc/medic
 	name = "Survivor PMC Medic"
 	additional_skills = list(
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
@@ -103,7 +101,7 @@ CIVILIAN
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 	)
 
-/datum/skills/civilian/survivor/pmc/engineer
+/datum/skills/civilian/pmc/engineer
 	name = "Survivor PMC Engineer"
 	additional_skills = list(
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
@@ -117,14 +115,14 @@ CIVILIAN
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 	)
 
-/datum/skills/civilian/survivor/doctor
+/datum/skills/civilian/doctor
 	name = "Survivor Doctor"
 	additional_skills = list(
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
 		SKILL_SURGERY = SKILL_SURGERY_TRAINED,
 	)
 
-/datum/skills/civilian/survivor/clf
+/datum/skills/civilian/clf
 	name = "Survivor CLF"
 	additional_skills = list(
 		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
@@ -133,37 +131,37 @@ CIVILIAN
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
 	)
 
-/datum/skills/civilian/survivor/scientist
+/datum/skills/civilian/scientist
 	name = "Survivor Scientist"
 	additional_skills = list(
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
 		SKILL_SURGERY = SKILL_SURGERY_TRAINED,
 		SKILL_RESEARCH = SKILL_RESEARCH_TRAINED,
 	)
 
-/datum/skills/civilian/survivor/chef
+/datum/skills/civilian/chef
 	name = "Survivor Chef"
 	additional_skills = list(
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER,
 		SKILL_DOMESTIC = SKILL_DOMESTIC_TRAINED,
 	)
 
-/datum/skills/civilian/survivor/miner
+/datum/skills/civilian/miner
 	name = "Survivor Miner"
 	additional_skills = list(
 		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 	)
 
-/datum/skills/civilian/survivor/trucker
+/datum/skills/civilian/trucker
 	name = "Survivor Trucker"
 	additional_skills = list(
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN,
 	)
 
-/datum/skills/civilian/survivor/engineer
+/datum/skills/civilian/engineer
 	name = "Survivor Engineer"
 	additional_skills = list(
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
@@ -172,13 +170,13 @@ CIVILIAN
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 	)
 
-/datum/skills/civilian/survivor/chaplain
+/datum/skills/civilian/chaplain
 	name = "Survivor Chaplain"
 	additional_skills = list(
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
 	)
 
-/datum/skills/civilian/survivor/marshal
+/datum/skills/civilian/marshal
 	name = "Survivor Marshal"
 	skills = list(
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
@@ -195,7 +193,7 @@ CIVILIAN
 		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
 	)
 
-/datum/skills/civilian/survivor/prisoner
+/datum/skills/civilian/prisoner
 	name = "Survivor Prisoner"
 	additional_skills = list(
 		SKILL_CQC = SKILL_CQC_SKILLED,
@@ -204,7 +202,7 @@ CIVILIAN
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 	)
 
-/datum/skills/civilian/survivor/gangleader
+/datum/skills/civilian/gangleader
 	name = "Survivor Gang Leader"
 	additional_skills = list(
 		SKILL_CQC = SKILL_CQC_SKILLED,

code/game/jobs/job/antag/xeno/xenomorph.dm

@@ -34,14 +34,6 @@
 	human_to_transform.set_stat(UNCONSCIOUS)
 	human_to_transform.forceMove(get_turf(pick(GLOB.xeno_spawns)))
 
-	var/list/survivor_types = list(
-		/datum/equipment_preset/survivor/scientist,
-		/datum/equipment_preset/survivor/doctor,
-		/datum/equipment_preset/survivor/security,
-		/datum/equipment_preset/survivor/engineer
-	)
-	arm_equipment(human_to_transform, pick(survivor_types), FALSE, FALSE)
-
 	for(var/obj/item/device/radio/radio in human_to_transform.contents_recursive())
 		radio.listening = FALSE
 

code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm

@@ -85,8 +85,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_upp_medic, list(
 		list("Essential Medical Set", 0, /obj/effect/essentials_set/medic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
 
 		list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
-		list("Standard Apparel", 0, list(/obj/item/clothing/gloves/marine/veteran/upp, /obj/item/clothing/head/helmet/marine/veteran/UPP), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
-		list("Combat Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
+		list("Standard Apparel", 0, list(/obj/item/clothing/gloves/marine/brown, /obj/item/clothing/head/helmet/marine/veteran/UPP), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
 		list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
 
 		list("ARMOR (CHOOSE 1)", 0, null, null, null),

code/game/objects/items/storage/pouch.dm

@@ -521,7 +521,7 @@
 
 /obj/item/storage/pouch/magazine/large/rifle_heap/fill_preset_inventory()
 	for(var/i = 1 to storage_slots)
-		new /obj/item/ammo_magazine/rifle/heap(src)
+		new /obj/item/ammo_magazine/rifle/m41aMK1/heap(src)
 
 /obj/item/storage/pouch/magazine/large/smg_heap/fill_preset_inventory()
 	for(var/i = 1 to storage_slots)

code/modules/clothing/head/helmet.dm

@@ -364,6 +364,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	armor_bio = CLOTHING_ARMOR_MEDIUM
 	armor_rad = CLOTHING_ARMOR_LOW
 	armor_internaldamage = CLOTHING_ARMOR_MEDIUM
+	clothing_traits = list(TRAIT_EAR_PROTECTION)
 	health = 5
 	force = 15
 	throwforce = 15 // https://i.imgur.com/VW09I4B.gif

code/modules/clothing/suits/civilian_suit.dm

@@ -402,13 +402,3 @@
 	desc = "A green windbreaker."
 	icon_state = "windbreaker_green"
 
-/obj/item/clothing/suit/storage/windbreaker/windbreaker_fr
-	name = "first responder windbreaker"
-	desc = "A brown windbreaker with reflective strips commonly worn by first responders."
-	icon_state = "windbreaker_fr"
-
-/obj/item/clothing/suit/storage/windbreaker/windbreaker_covenant
-	name = "explorer's windbreaker"
-	desc = "A brown windbreaker covered in various patches tying it to one of the first explorations into this sector."
-	icon_state = "windbreaker_covenant"
-

code/modules/cm_marines/equipment/kit_boxes.dm

@@ -411,7 +411,6 @@
 /obj/item/storage/box/kit/mini_engineer/fill_preset_inventory()
 	new /obj/item/storage/backpack/marine/engineerpack(src)
 	new /obj/item/pamphlet/skill/engineer(src)
-	new /obj/item/clothing/gloves/marine/insulated(src)
 	new /obj/item/tool/crowbar(src)
 	new /obj/item/clothing/glasses/welding(src)
 	new /obj/item/storage/pouch/tools/pfc(src)

code/modules/gear_presets/cmb.dm

@@ -49,7 +49,7 @@
 //*****************************************************************************************************/
 
 /datum/equipment_preset/cmb/standard
-	name = "Prop - CMB - Colonial Marshal Deputy"
+	name = "Prop - UA - Deputy"
 	paygrade = "GS-9"
 	role_comm_title = "CMB DEP"
 	flags = EQUIPMENT_PRESET_EXTRA
@@ -129,7 +129,7 @@
 //*****************************************************************************************************/
 
 /datum/equipment_preset/cmb/leader
-	name = "CMB - Colonial Marshal"
+	name = "Prop - UA - Marshal"
 	paygrade = "GS-13"
 	idtype = /obj/item/card/id/marshal
 	role_comm_title = "CMB MAR"
@@ -155,7 +155,7 @@
 	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/CMB, WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE)
@@ -225,7 +225,7 @@
 //*****************************************************************************************************/
 
 /datum/equipment_preset/cmb/liaison
-	name = "Prop - ICC Liaison"
+	name = "Prop - UA - ICC Liaison"
 	paygrade = "GS-6"
 	idtype = /obj/item/card/id/silver/cl
 	role_comm_title = "ICC Rep."
@@ -263,7 +263,7 @@
 //*****************************************************************************************************/
 
 /datum/equipment_preset/cmb/observer
-	name = "Prop - Human Rights Observer"
+	name = "Prop - UA - Human Rights Observer"
 	paygrade = "GS-3"
 	idtype = /obj/item/card/id/lanyard
 	role_comm_title = "OBS"