WIP

code/__DEFINES/job.dm

@@ -220,9 +220,9 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 #define JOB_DIRECTOR "W-Y Director"
 
 //-------- WY Goons --------//
-#define JOB_WY_GOON "WY Corporate Security"
-#define JOB_WY_GOON_LEAD "WY Corporate Security Lead"
-#define JOB_WY_GOON_RESEARCHER "WY Research Consultant"
+#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_GOON_LIST list(JOB_WY_GOON, JOB_WY_GOON_LEAD)
 

code/game/jobs/job/civilians/other/liaison.dm

@@ -5,7 +5,7 @@
 	supervisors = "the Wey-Yu corporate office"
 	selection_class = "job_cl"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
-	gear_preset = /datum/equipment_preset/wy/junior_exec
+	gear_preset = /datum/equipment_preset/wy/exec
 	entry_message_body = "As a <a href='"+WIKI_PLACEHOLDER+"'>representative of Weyland-Yutani Corporation</a>, your job requires you to stay in character at all times. You are not required to follow military orders; however, you cannot give military orders. Your primary job is to observe and report back your findings to Weyland-Yutani. Follow regular game rules unless told otherwise by your superiors. Use your office fax machine to communicate with corporate headquarters or to acquire new directives. You may not receive anything back, and this is normal."
 	var/mob/living/carbon/human/active_liaison
 

code/modules/gear_presets/uscm.dm

@@ -8,17 +8,16 @@
 	utility_under = list(/obj/item/clothing/under/marine)
 	utility_hat = list(/obj/item/clothing/head/cmcap)
 	utility_gloves = list(/obj/item/clothing/gloves/marine)
-	utility_shoes = list(/obj/item/clothing/shoes/marine)
-	utility_extra = list(/obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/cm/tan)
+	utility_shoes = list(/obj/item/clothing/shoes/marine/knife)
 
 	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/cmcap)
+	service_hat = list(/obj/item/clothing/head/marine/peaked/service)
 	service_shoes = list(/obj/item/clothing/shoes/laceup)
 
 	dress_under = list(/obj/item/clothing/under/marine/blues)
-	dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
-	dress_hat = list(/obj/item/clothing/head/marine/peaked)
+	dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress)
+	dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
 	dress_gloves = list(/obj/item/clothing/gloves/marine/dress)
 	dress_shoes = list(/obj/item/clothing/shoes/laceup)
 	var/auto_squad_name
@@ -255,8 +254,6 @@
 	name = "USCM Vehicle Crewman (CRMN)"
 	flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
 
-	utility_under = list(/obj/item/clothing/under/marine/officer/tanker)
-
 /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)
@@ -390,10 +387,6 @@
 	minimap_icon = "leader"
 
 /datum/equipment_preset/uscm/leader/load_gear(mob/living/carbon/human/new_human)
-	var/back_item = /obj/item/storage/backpack/marine/satchel
-	if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
-		back_item = /obj/item/storage/backpack/marine
-
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
 
 /datum/equipment_preset/uscm/leader/cryo
@@ -416,11 +409,7 @@
 	faction = FACTION_UPP
 
 /datum/equipment_preset/uscm/leader/upp/load_gear(mob/living/carbon/human/new_human)
-	var/back_item = /obj/item/storage/backpack/lightpack/upp
-	if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
-		back_item = /obj/item/storage/backpack/marine
-
-	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/backpack/lightpack/upp(new_human), WEAR_BACK)
 
 /datum/equipment_preset/uscm/leader/upp/lesser_rank
 	paygrade = "UE6"
@@ -432,11 +421,7 @@
 	role_comm_title = "SL"
 
 /datum/equipment_preset/uscm/leader/forecon/load_gear(mob/living/carbon/human/new_human)
-	var/back_item = /obj/item/storage/backpack/marine/satchel/standard
-	if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
-		back_item = /obj/item/storage/backpack/marine/standard
-
-	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/backpack/marine/satchel/standard(new_human), WEAR_BACK)
 
 /datum/equipment_preset/uscm/leader/forecon/lesser_rank
 	paygrade = "ME7"

code/modules/gear_presets/uscm_ship.dm

@@ -16,7 +16,7 @@
 	service_shoes = list(/obj/item/clothing/shoes/laceup)
 
 	dress_under = list(/obj/item/clothing/under/marine/blues)
-	dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
+	dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress)
 	dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
 	dress_gloves = list(/obj/item/clothing/gloves/marine/dress)
 	dress_shoes = list(/obj/item/clothing/shoes/laceup)

code/modules/gear_presets/wy.dm

@@ -26,53 +26,26 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK)
 	. = ..()
 
-/datum/equipment_preset/wy/trainee
-	name = "Corporate - A - Trainee"
-	flags = EQUIPMENT_PRESET_EXTRA
-	assignment = JOB_TRAINEE
-	rank = JOB_TRAINEE
-	paygrade = "WYC1"
-
-/datum/equipment_preset/wy/trainee/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/black(new_human), WEAR_BODY)
-	. = ..()
-
-/datum/equipment_preset/wy/junior_exec
-	name = "Corporate - B - Junior Executive"
-	flags = EQUIPMENT_PRESET_EXTRA
-	assignment = JOB_JUNIOR_EXECUTIVE
-	rank = JOB_JUNIOR_EXECUTIVE
-	paygrade = "WYC2"
-
 /datum/equipment_preset/wy/exec
-	name = "Corporate - C - Executive"
+	name = "Prop - WeyYu - Executive"
 	flags = EQUIPMENT_PRESET_EXTRA
 	assignment = JOB_EXECUTIVE
 	rank = JOB_EXECUTIVE
 	paygrade = "WYC3"
 
-/datum/equipment_preset/wy/senior_exec
-	name = "Corporate - D - Senior Executive"
-	flags = EQUIPMENT_PRESET_EXTRA
-	assignment = JOB_SENIOR_EXECUTIVE
-	rank = JOB_SENIOR_EXECUTIVE
-	paygrade = "WYC4"
-
-/datum/equipment_preset/wy/exec_spec
-	name = "Corporate - E - Executive Specialist"
-	flags = EQUIPMENT_PRESET_EXTRA
-	assignment = JOB_EXECUTIVE_SPECIALIST
-	rank = JOB_EXECUTIVE_SPECIALIST
-	paygrade = "WYC5"
-
 /datum/equipment_preset/wy/exec_supervisor
-	name = "Corporate - F - Executive Supervisor"
+	name = "Prop - WeyYu - Executive Supervisor"
 	flags = EQUIPMENT_PRESET_EXTRA
 	assignment = JOB_EXECUTIVE_SUPERVISOR
 	rank = JOB_EXECUTIVE_SUPERVISOR
 	paygrade = "WYC6"
 
-/datum/equipment_preset/wy/manager
+/datum/equipment_preset/wy/division_manager
+	name = "Prop - WeyYu - Division Manager"
+	flags = EQUIPMENT_PRESET_EXTRA
+	assignment = JOB_DIVISION_MANAGER
+	rank = JOB_DIVISION_MANAGER
+	paygrade = "WYC8"
 	skills = /datum/skills/civilian/manager
 	idtype = /obj/item/card/id/silver/clearance_badge/manager
 	headset_type = /obj/item/device/radio/headset/distress/pmc/command
@@ -86,13 +59,6 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/ivory(new_human), WEAR_JACKET)
 	..()
 
-/datum/equipment_preset/wy/manager/assistant_manager
-	name = "Corporate - G - Assistant Manager"
-	flags = EQUIPMENT_PRESET_EXTRA
-	assignment = JOB_ASSISTANT_MANAGER
-	rank = JOB_ASSISTANT_MANAGER
-	paygrade = "WYC7"
-
 /datum/equipment_preset/wy/manager/division_manager
 	name = "Corporate - H - Division Manager"
 	flags = EQUIPMENT_PRESET_EXTRA
@@ -128,3 +94,9 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/ivory(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/ivory(new_human), WEAR_JACKET)
 	..()
+
+/datum/equipment_preset/wy/security
+	name = "Corporate - J - Director"
+	flags = EQUIPMENT_PRESET_EXTRA
+	assignment = JOB_DIRECTOR
+	rank = JOB_WY_GOON

colonialmarines.dme

@@ -486,33 +486,9 @@
 #include "code\datums\elements\traitbound\crawler.dm"
 #include "code\datums\elements\traitbound\gun_silenced.dm"
 #include "code\datums\elements\traitbound\leadership.dm"
-#include "code\datums\emergency_calls\big_game_hunter.dm"
-#include "code\datums\emergency_calls\cbrn.dm"
-#include "code\datums\emergency_calls\clf.dm"
-#include "code\datums\emergency_calls\cmb.dm"
-#include "code\datums\emergency_calls\colonist.dm"
-#include "code\datums\emergency_calls\contractor.dm"
-#include "code\datums\emergency_calls\cryo_marines.dm"
-#include "code\datums\emergency_calls\cryo_spec.dm"
 #include "code\datums\emergency_calls\custom.dm"
-#include "code\datums\emergency_calls\deathsquad.dm"
-#include "code\datums\emergency_calls\deus_vult.dm"
-#include "code\datums\emergency_calls\dutch.dm"
 #include "code\datums\emergency_calls\emergency_call.dm"
-#include "code\datums\emergency_calls\feral_xenos.dm"
 #include "code\datums\emergency_calls\forsaken_xenos.dm"
-#include "code\datums\emergency_calls\hefa_knight.dm"
-#include "code\datums\emergency_calls\mercs.dm"
-#include "code\datums\emergency_calls\pizza.dm"
-#include "code\datums\emergency_calls\pmc.dm"
-#include "code\datums\emergency_calls\royal_marines.dm"
-#include "code\datums\emergency_calls\souto.dm"
-#include "code\datums\emergency_calls\supplies.dm"
-#include "code\datums\emergency_calls\tank_crew.dm"
-#include "code\datums\emergency_calls\upp.dm"
-#include "code\datums\emergency_calls\upp_commando.dm"
-#include "code\datums\emergency_calls\xenos.dm"
-#include "code\datums\emergency_calls\zombie.dm"
 #include "code\datums\entities\chemical_information.dm"
 #include "code\datums\entities\clans.dm"
 #include "code\datums\entities\discord_identifier.dm"
@@ -722,9 +698,6 @@
 #include "code\game\gamemodes\colonialmarines\xenovsxeno.dm"
 #include "code\game\gamemodes\colonialmarines\ai\colonialmarines_ai.dm"
 #include "code\game\gamemodes\colonialmarines\ai\colonialmarines_ai_nospawn.dm"
-#include "code\game\gamemodes\colonialmarines\whiskey_outpost\equipping.dm"
-#include "code\game\gamemodes\colonialmarines\whiskey_outpost\skills.dm"
-#include "code\game\gamemodes\colonialmarines\whiskey_outpost\whiskey_output_waves.dm"
 #include "code\game\gamemodes\events\power_failure.dm"
 #include "code\game\gamemodes\extended\extended.dm"
 #include "code\game\gamemodes\extended\extended_clash.dm"
@@ -1696,7 +1669,6 @@
 #include "code\modules\flufftext\Japanese.dm"
 #include "code\modules\flufftext\TextFilters.dm"
 #include "code\modules\gear_presets\_select_equipment.dm"
-#include "code\modules\gear_presets\cbrn.dm"
 #include "code\modules\gear_presets\clf.dm"
 #include "code\modules\gear_presets\cmb.dm"
 #include "code\modules\gear_presets\colonist.dm"