WIP

code/__DEFINES/job.dm

@@ -222,9 +222,9 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 //-------- WY Goons --------//
 #define JOB_WY_SEC "W-Y Corporate Security"
 #define JOB_WY_SEC_LEAD "W-Y Corporate Security Lead"
-#define JOB_WY_GOON_RESEARCHER "W-Y Research Consultant"
+#define JOB_WY_SEC_RESEARCHER "W-Y Research Consultant"
 
-#define JOB_WY_GOON_LIST list(JOB_WY_GOON, JOB_WY_GOON_LEAD)
+#define JOB_WY_SEC_LIST list(JOB_WY_SEC, JOB_WY_SEC_LEAD)
 
 //---- Contractors ----//
 #define JOB_CONTRACTOR "VAIPO Mercenary"
@@ -398,4 +398,4 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 
 ///For denying certain traits being applied to people. ie. bad leg
 ///'Grunt' lists are for people who wouldn't logically get the bad leg trait, ie. UPP marine counterparts.
-#define JOB_ERT_GRUNT_LIST list(DUTCH_JOB_LIST, RIOT_JOB_LIST, PROVOST_JOB_LIST, CMB_GRUNT_LIST, CLF_JOB_LIST, UPP_JOB_GRUNT_LIST, UPP_COMMANDO_JOB_LIST, CONTRACTOR_JOB_LIST, JOB_WY_GOON_LIST, JOB_PMC_GRUNT_LIST)
+#define JOB_ERT_GRUNT_LIST list(DUTCH_JOB_LIST, RIOT_JOB_LIST, PROVOST_JOB_LIST, CMB_GRUNT_LIST, CLF_JOB_LIST, UPP_JOB_GRUNT_LIST, UPP_COMMANDO_JOB_LIST, CONTRACTOR_JOB_LIST, JOB_WY_SEC_LIST, JOB_PMC_GRUNT_LIST)

code/modules/cm_marines/marines_consoles.dm

@@ -995,8 +995,8 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor)
 				JOB_PMC_ENGINEER = 225,
 				JOB_PMC_STANDARD = 226,
 				JOB_PMC_DOCTOR = 227,
-				JOB_WY_GOON_LEAD = 228,
-				JOB_WY_GOON = 229,
+				JOB_WY_SEC_LEAD = 228,
+				JOB_WY_SEC = 229,
 
 				// Appear at bottom of squad list
 				JOB_MARINE_RAIDER_SL = 130,
@@ -1040,13 +1040,13 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor)
 				JOB_EXECUTIVE = 23,
 				JOB_JUNIOR_EXECUTIVE = 24,
 				// 30-39: Security
-				JOB_WY_GOON_LEAD = 30,
-				JOB_WY_GOON = 31,
+				JOB_WY_SEC_LEAD = 30,
+				JOB_WY_SEC = 31,
 				// 40-49: MedSci
 				JOB_PMC_SYNTH = 40,
 				JOB_PMC_XENO_HANDLER = 41,
 				JOB_PMC_DOCTOR = 42,
-				JOB_WY_GOON_RESEARCHER = 43,
+				JOB_WY_SEC_RESEARCHER = 43,
 				// 50-59: Engineering & Vehicle Crew
 				JOB_PMC_CREWMAN = 51,
 				JOB_PMC_ENGINEER = 52,

code/modules/gear_presets/corpses.dm

@@ -53,72 +53,6 @@
 	add_survivor_weapon_pistol(new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET)
 
-//*****************************************************************************************************/
-
-/datum/equipment_preset/corpse/realpirate
-	name = "Corpse - Pirate"
-	access = list(
-		ACCESS_CIVILIAN_PUBLIC,
-		ACCESS_CIVILIAN_LOGISTICS,
-		ACCESS_CIVILIAN_ENGINEERING,
-		ACCESS_CIVILIAN_RESEARCH,
-		ACCESS_CIVILIAN_BRIG,
-		ACCESS_CIVILIAN_MEDBAY,
-		ACCESS_CIVILIAN_COMMAND,
-		ACCESS_ILLEGAL_PIRATE,
-	)
-
-/datum/equipment_preset/corpse/realpirate/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(new_human), WEAR_BODY)
-	if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
-		add_ice_colony_survivor_equipment(new_human)
-	else
-		new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(new_human), WEAR_EYES)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(new_human), WEAR_HEAD)
-
-//*****************************************************************************************************/
-
-/datum/equipment_preset/corpse/realpirate/ranged
-	name = "Corpse - Pirate Gunner"
-
-/datum/equipment_preset/corpse/realpirate/ranged/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate(new_human), WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/pirate(new_human), WEAR_HEAD)
-	. = ..()
-
-//*****************************************************************************************************/
-
-/datum/equipment_preset/corpse/russian
-	name = "Corpse - Russian"
-	access = list(
-		ACCESS_CIVILIAN_PUBLIC,
-		ACCESS_CIVILIAN_LOGISTICS,
-		ACCESS_CIVILIAN_ENGINEERING,
-		ACCESS_CIVILIAN_RESEARCH,
-		ACCESS_CIVILIAN_BRIG,
-		ACCESS_CIVILIAN_MEDBAY,
-		ACCESS_CIVILIAN_COMMAND,
-	)
-
-/datum/equipment_preset/corpse/russian
-
-/datum/equipment_preset/corpse/russian/load_gear(mob/living/carbon/human/new_human)
-
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/veteran/soviet_uniform_01(new_human), WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(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/storage/belt/marine(new_human), WEAR_WAIST)
-	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/marine/upp(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
-	if(prob(25))
-		new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bearpelt(new_human), WEAR_HEAD)
-	else
-		new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD)
-
 //*****************************************************************************************************/
 // Civilians
 
@@ -140,24 +74,6 @@
 
 //*****************************************************************************************************/
 
-/datum/equipment_preset/corpse/chef
-	name = "Corpse - Chef"
-	assignment = "Chef"
-	access = list(ACCESS_CIVILIAN_PUBLIC)
-
-/datum/equipment_preset/corpse/chef/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chef(new_human), WEAR_BODY)
-	if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
-		add_ice_colony_survivor_equipment(new_human)
-	else
-		new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/chef/classic(new_human), WEAR_JACKET)
-	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/head/chefhat(new_human), WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack(new_human), WEAR_BACK)
-
-//*****************************************************************************************************/
-
 /datum/equipment_preset/corpse/doctor
 	name = "Corpse - Doctor"
 	assignment = "Medical Doctor"
@@ -798,8 +714,8 @@
 /datum/equipment_preset/corpse/pmc/goon
 	name = "Corpse - Weyland-Yutani Corporate (Goon)"
 	languages = list(LANGUAGE_ENGLISH)
-	assignment = JOB_WY_GOON
-	rank = JOB_WY_GOON
+	assignment = JOB_WY_SEC
+	rank = JOB_WY_SEC
 	paygrade = "WEY-GOON"
 	skills = /datum/skills/MP
 
@@ -820,8 +736,8 @@
 /datum/equipment_preset/corpse/pmc/goon/lead
 	name = "Corpse - Weyland-Yutani Corporate Security Lead (Goon Lead)"
 	flags = EQUIPMENT_PRESET_EXTRA
-	assignment = JOB_WY_GOON_LEAD
-	rank = JOB_WY_GOON_LEAD
+	assignment = JOB_WY_SEC_LEAD
+	rank = JOB_WY_SEC_LEAD
 	paygrade = "WEY-GOON-L"
 
 /datum/equipment_preset/corpse/pmc/goon/lead/load_gear(mob/living/carbon/human/new_human)
@@ -868,39 +784,6 @@
 	name = "Corpse - Burst Freelancer Mercenary"
 	xenovictim = TRUE
 
-// Fun Faction Corpse
-
-// Dutch Dozen
-
-/datum/equipment_preset/corpse/dutchrifle
-	name = "Corpse - Dutch Dozen Rifleman"
-	assignment = "Dutch Dozen Rifleman"
-	idtype = /obj/item/card/id/silver
-	faction = FACTION_DUTCH
-	xenovictim = FALSE
-
-/datum/equipment_preset/corpse/dutchrifle/New()
-	. = ..()
-	access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL)
-
-/datum/equipment_preset/corpse/dutchrifle/load_gear(mob/living/carbon/human/new_human)
-
-	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/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/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response(new_human), WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET)
-	spawn_merc_helmet(new_human)
-
-/datum/equipment_preset/corpse/dutchrifle/burst
-	name = "Corpse - Burst Dutch Dozen Rifleman"
-	xenovictim = TRUE
-
 // Pizza Planet
 
 /datum/equipment_preset/corpse/pizza
@@ -940,80 +823,3 @@
 	name = "Corpse - Burst Pizza Deliverer"
 	xenovictim = TRUE
 
-// Gladiator
-
-/datum/equipment_preset/corpse/gladiator
-	name = "Corpse - Gladiator"
-	assignment = "Gladiator"
-	idtype = /obj/item/card/id/dogtag
-	faction = FACTION_GLADIATOR
-	xenovictim = FALSE
-	access = list(
-		ACCESS_CIVILIAN_PUBLIC,
-		ACCESS_CIVILIAN_LOGISTICS,
-		ACCESS_CIVILIAN_ENGINEERING,
-		ACCESS_CIVILIAN_RESEARCH,
-		ACCESS_CIVILIAN_BRIG,
-		ACCESS_CIVILIAN_MEDBAY,
-		ACCESS_CIVILIAN_COMMAND,
-		ACCESS_MARINE_MAINT,
-	)
-
-/datum/equipment_preset/corpse/gladiator/load_gear(mob/living/carbon/human/new_human)
-
-	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/helmet/gladiator, WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chainshirt/hunter, WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/gladiator, WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND)
-	new_human.equip_to_slot_or_del(new /obj/item/weapon/sword, WEAR_L_HAND)
-
-	var/obj/item/lantern = new /obj/item/device/flashlight/lantern(new_human)
-	lantern.name = "Beacon of Holy Light"
-
-/datum/equipment_preset/corpse/gladiator/burst
-	name = "Corpse - Burst Gladiator"
-	xenovictim = TRUE
-
-
-//FORECON
-
-/datum/equipment_preset/corpse/forecon_spotter
-	name = "Corpse - USCM Reconnaissance Spotter"
-	assignment = "Reconnaissance Spotter"
-	xenovictim = FALSE
-	paygrade = "ME5"
-	idtype = /obj/item/card/id/dogtag
-	role_comm_title = "FORECON"
-	faction_group = list(FACTION_USCM, FACTION_SURVIVOR)
-	access = list(
-		ACCESS_CIVILIAN_PUBLIC,
-		ACCESS_CIVILIAN_ENGINEERING,
-		ACCESS_CIVILIAN_LOGISTICS,
-	)
-
-/datum/equipment_preset/corpse/forecon_spotter/load_gear(mob/living/carbon/human/new_human)
-	var/obj/item/clothing/under/marine/reconnaissance/uniform = new()
-	var/obj/item/clothing/accessory/storage/droppouch/pouch = new()
-	var/obj/item/clothing/accessory/ranks/marine/e5/pin = new()
-	var/obj/item/clothing/accessory/patch/patch_uscm = new()
-	var/obj/item/clothing/accessory/patch/forecon/patch_forecon = new()
-	uniform.attach_accessory(new_human,pouch)
-	uniform.attach_accessory(new_human,patch_uscm)
-	uniform.attach_accessory(new_human,pin)
-	uniform.attach_accessory(new_human,patch_forecon)
-	new_human.equip_to_slot_or_del(uniform, 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/storage/backpack/marine/satchel(new_human), WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/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/reagent_container/food/drinks/flask/marine(new_human), WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/facepaint/sniper(new_human), WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_ACCESSORY)
-	new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_J_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET)
-	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/device/radio(new_human), WEAR_IN_BACK)

code/modules/gear_presets/fun.dm

@@ -280,3 +280,4 @@
 	new_human.status_flags &= ~NO_PERMANENT_DAMAGE
 	new_human.status_flags |= STATUS_FLAGS_DEBILITATE
 	ADD_TRAIT(new_human, TRAIT_TWOBORE_TRAINING, TRAIT_SOURCE_ADMIN) //Means he can handle his gun and speak its hit lines.
+