WY actual hud

code/__DEFINES/job.dm

@@ -228,7 +228,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_WY_GOON_LEAD "WY Corporate Security Lead"
 #define JOB_WY_GOON_RESEARCHER "WY Research Consultant"
 
-#define ROLES_WY_GOONS list(JOB_WY_GOON_LEAD, JOB_WY_GOON_TECH, JOB_WY_GOON)
+#define ROLES_WY_GOONS list(JOB_WY_GOON_LEAD, JOB_WY_GOON_TECH, JOB_WY_GOON, JOB_WY_GOON_RESEARCHER)
 
 //---- Contractors ----//
 #define JOB_CONTRACTOR "VAIPO Mercenary"

code/__DEFINES/minimap.dm

@@ -1,6 +1,6 @@
 #define MINIMAP_FLAG_XENO (1<<0)
 #define MINIMAP_FLAG_USCM (1<<1)
-#define MINIMAP_FLAG_PMC (1<<2)
+#define MINIMAP_FLAG_WY (1<<2)
 #define MINIMAP_FLAG_UPP (1<<3)
 #define MINIMAP_FLAG_CLF (1<<4)
 #define MINIMAP_FLAG_YAUTJA (1<<5)

code/controllers/subsystem/minimap.dm

@@ -768,7 +768,7 @@ SUBSYSTEM_DEF(minimaps)
 		faction = allowed_flags == MINIMAP_FLAG_XENO ? XENO_HIVE_NORMAL : FACTION_MARINE
 
 	if(is_xeno && xeno.hive.see_humans_on_tacmap && targeted_ztrait != ZTRAIT_MARINE_MAIN_SHIP)
-		allowed_flags |= MINIMAP_FLAG_USCM|MINIMAP_FLAG_PMC|MINIMAP_FLAG_UPP|MINIMAP_FLAG_CLF
+		allowed_flags |= MINIMAP_FLAG_USCM|MINIMAP_FLAG_WY|MINIMAP_FLAG_UPP|MINIMAP_FLAG_CLF
 		targeted_ztrait = ZTRAIT_MARINE_MAIN_SHIP
 		map_holder = null
 
@@ -1080,7 +1080,7 @@ SUBSYSTEM_DEF(minimaps)
 		if(FACTION_CLF)
 			return MINIMAP_FLAG_CLF
 		if(FACTION_PMC)
-			return MINIMAP_FLAG_PMC
+			return MINIMAP_FLAG_WY
 		if(FACTION_YAUTJA)
 			return MINIMAP_FLAG_YAUTJA
 		if(XENO_HIVE_CORRUPTED)

code/datums/factions/pmc.dm

@@ -13,16 +13,32 @@
 	switch(_role)
 		if(JOB_PMC_DIRECTOR)
 			hud_icon_state = "sd"
-		if(JOB_PMC_LEADER, JOB_PMC_LEAD_INVEST)
+		if(JOB_PMC_LEADER)
 			hud_icon_state = "ld"
+		if(JOB_PMC_LEAD_INVEST)
+			hud_icon_state = "inv"
 		if(JOB_PMC_DOCTOR)
 			hud_icon_state = "td"
 		if(JOB_PMC_ENGINEER)
 			hud_icon_state = "ct"
-		if(JOB_PMC_MEDIC, JOB_PMC_INVESTIGATOR)
+		if(JOB_PMC_MEDIC)
 			hud_icon_state = "md"
+		if(JOB_PMC_INVESTIGATOR)
+			hud_icon_state = "mi"
 		if(JOB_PMC_SYNTH)
 			hud_icon_state = "syn"
+		if(JOB_PMC_XENO_HANDLER)
+			hud_icon_state = "handler"
+		if(JOB_PMC_GUNNER)
+			hud_icon_state = "sg"
+		if(JOB_PMC_DETAINER)
+			hud_icon_state = "mp"
+		if(JOB_PMC_CREWMAN)
+			hud_icon_state = "crew"
+		if(JOB_PMC_SNIPER)
+			hud_icon_state = "spec"
+		if(JOB_PMC_STANDARD)
+			hud_icon_state = "gun"
 	if(hud_icon_state)
 		holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "pmc_[hud_icon_state]")
 

code/datums/factions/wy.dm

@@ -0,0 +1,45 @@
+/datum/faction/wy
+	name = "Weyland-Yutani Corporation"
+	faction_tag = FACTION_WY
+
+/datum/faction/wy/modify_hud_holder(image/holder, mob/living/carbon/human/user)
+	var/hud_icon_state
+	var/obj/item/card/id/id_card = user.get_idcard()
+	var/role
+	if(user.mind)
+		role = user.job
+	else if(id_card)
+		role = id_card.rank
+	switch(role)
+		if(JOB_WY_GOON)
+			hud_icon_state = "goon_normal"
+		if(JOB_WY_GOON_LEAD)
+			hud_icon_state = "goon_leader"
+		if(JOB_WY_GOON_RESEARCHER)
+			hud_icon_state = "goon_sci"
+		if(JOB_WY_GOON_TECH)
+			hud_icon_state = "goon_engi"
+		if(JOB_CORPORATE_LIAISON)
+			hud_icon_state = "liaison"
+		if(JOB_EXECUTIVE)
+			hud_icon_state = "liaison"
+		if(JOB_SENIOR_EXECUTIVE)
+			hud_icon_state = "senior_exec"
+		if(JOB_EXECUTIVE_SPECIALIST)
+			hud_icon_state = "exec_spec"
+		if(JOB_EXECUTIVE_SUPERVISOR)
+			hud_icon_state = "exec_super"
+		if(JOB_ASSISTANT_MANAGER)
+			hud_icon_state = "ass_man"
+		if(JOB_DIVISION_MANAGER)
+			hud_icon_state = "div_man"
+		if(JOB_CHIEF_EXECUTIVE)
+			hud_icon_state = "chief_man"
+		if(JOB_TRAINEE)
+			hud_icon_state = "trainee"
+		if(JOB_JUNIOR_EXECUTIVE)
+			hud_icon_state = "junior_exec"
+		if(JOB_DIRECTOR)
+			hud_icon_state = "director"
+	if(hud_icon_state)
+		holder.overlays += image('icons/mob/hud/marine_hud.dmi', user, "wy_[hud_icon_state]")

code/game/machinery/computer/groundside_operations.dm

@@ -458,7 +458,7 @@
 	add_pmcs = TRUE
 	lz_selection = FALSE
 	has_squad_overwatch = FALSE
-	minimap_type = MINIMAP_FLAG_PMC
+	minimap_type = MINIMAP_FLAG_WY
 	freq = PMC_FREQ
 
 /obj/structure/machinery/computer/groundside_operations/arc

code/game/objects/items/devices/cictablet.dm

@@ -176,7 +176,7 @@
 	announcement_title = PMC_COMMAND_ANNOUNCE
 	announcement_faction = FACTION_PMC
 	add_pmcs = TRUE
-	minimap_type = MINIMAP_FLAG_PMC
+	minimap_type = MINIMAP_FLAG_WY
 
 /obj/item/device/cotablet/upp
 

code/game/objects/items/devices/radio/headset.dm

@@ -369,8 +369,8 @@
 			marker_flags = MINIMAP_FLAG_USCM
 		else if(hud_type == MOB_HUD_FACTION_UPP)
 			marker_flags = MINIMAP_FLAG_UPP
-		else if(hud_type == MOB_HUD_FACTION_PMC)
-			marker_flags = MINIMAP_FLAG_PMC
+		else if(hud_type == MOB_HUD_FACTION_PMC || hud_type == MOB_HUD_FACTION_WY)
+			marker_flags = MINIMAP_FLAG_WY
 		else if(hud_type == MOB_HUD_FACTION_CLF)
 			marker_flags = MINIMAP_FLAG_CLF
 
@@ -992,8 +992,11 @@
 /obj/item/device/radio/headset/distress/WY
 	name = "WY corporate headset"
 	desc = "A headset commonly worn by WY corporate personnel."
+	icon_state = "wy_headset"
 	frequency = WY_FREQ
 	initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/WY)
+	has_hud = TRUE
+	hud_type = MOB_HUD_FACTION_WY
 
 /obj/item/device/radio/headset/distress/dutch
 	name = "Dutch's Dozen headset"

code/modules/almayer/machinery.dm

@@ -115,7 +115,7 @@
 	faction = FACTION_CLF
 
 /obj/structure/machinery/prop/almayer/CICmap/pmc
-	minimap_type = MINIMAP_FLAG_PMC
+	minimap_type = MINIMAP_FLAG_WY
 	faction = FACTION_PMC
 
 //Nonpower using props

code/modules/gear_presets/pmc.dm

@@ -61,6 +61,7 @@
 
 	assignment = JOB_PMC_STANDARD
 	rank = JOB_PMC_STANDARD
+	minimap_icon = "pmc_gun"
 	paygrades = list(PAY_SHORT_PMC_OP = JOB_PLAYTIME_TIER_0)
 	skills = /datum/skills/pmc
 
@@ -203,6 +204,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null),
 
 	assignment = JOB_PMC_DETAINER
 	rank = JOB_PMC_DETAINER
+	minimap_icon = "pmc_mp"
 	paygrades = list(PAY_SHORT_PMC_EN = JOB_PLAYTIME_TIER_0)
 	skills = /datum/skills/pmc
 
@@ -510,7 +512,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null),
 
 	assignment = JOB_PMC_INVESTIGATOR
 	rank = JOB_PMC_INVESTIGATOR
-	minimap_icon = "pmc_td"
+	minimap_icon = "pmc_mi"
 	paygrades = list(PAY_SHORT_PMC_MS = JOB_PLAYTIME_TIER_0)
 	skills = /datum/skills/pmc/medic/chem
 	headset_type = /obj/item/device/radio/headset/distress/pmc/medic
@@ -852,6 +854,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null),
 	rank = JOB_PMC_LEAD_INVEST
 	paygrades = list(PAY_SHORT_PMC_TL = JOB_PLAYTIME_TIER_0)
 	role_comm_title = "SL"
+	minimap_icon = "tissa"
 	skills = /datum/skills/pmc/SL/chem
 	headset_type = /obj/item/device/radio/headset/distress/pmc/command
 
@@ -1103,6 +1106,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null),
 	rank = JOB_PMC_SNIPER
 	paygrades = list(PAY_SHORT_PMC_WS = JOB_PLAYTIME_TIER_0)
 	role_comm_title = "Spc"
+	minimap_icon = "pmc_spec"
 	skills = /datum/skills/pmc/specialist
 	headset_type = /obj/item/device/radio/headset/distress/pmc/cct
 
@@ -1223,6 +1227,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null),
 
 	assignment = JOB_PMC_CREWMAN
 	rank = JOB_PMC_CREWMAN
+	minimap_icon = "pmc_vc"
 	paygrades = list(PAY_SHORT_PMC_VS = JOB_PLAYTIME_TIER_0)
 	skills = /datum/skills/pmc/tank_crew
 	headset_type = /obj/item/device/radio/headset/distress/pmc/cct
@@ -1353,6 +1358,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null),
 	rank = JOB_PMC_XENO_HANDLER
 	paygrades = list(PAY_SHORT_PMC_XS = JOB_PLAYTIME_TIER_0)
 	role_comm_title = "XH"
+	minimap_icon = "pmc_handler"
 	skills = /datum/skills/pmc/xeno_handler
 	languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_XENOMORPH)
 	headset_type = /obj/item/device/radio/headset/distress/pmc/command
@@ -1678,7 +1684,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null),
 	paygrades = list(PAY_SHORT_PMC_TEC = JOB_PLAYTIME_TIER_0)
 	role_comm_title = "TEC"
 
-	minimap_icon = "engi"
+	minimap_icon = "mt"
 
 	skills = /datum/skills/pmc/engineer
 	headset_type = /obj/item/device/radio/headset/distress/pmc/cct

code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm

@@ -847,7 +847,12 @@
 /datum/equipment_preset/survivor/hybrisa/corporate_goon
 	name = "Survivor - Hybrisa - Weyland-Yutani - Corporate Security Guard"
 	assignment = "Weyland-Yutani - Corporate Security Guard"
+	assignment = JOB_WY_GOON
+	rank = JOB_WY_GOON
+	minimap_icon = "goon_standard"
+	minimap_background = "background_goon"
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
+	faction = FACTION_WY
 	faction_group = list(FACTION_WY, FACTION_SURVIVOR)
 	paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0, PAY_SHORT_CSPO = JOB_PLAYTIME_TIER_4)
 	skills = /datum/skills/civilian/survivor/goon

code/modules/gear_presets/survivors/misc.dm

@@ -176,9 +176,12 @@ Everything below isn't used or out of place.
 	name = "Survivor - Corporate Security Goon"
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 	assignment = JOB_WY_GOON
+	rank = JOB_WY_GOON
 	paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0)
 	idtype = /obj/item/card/id/silver/cl
 	skills = /datum/skills/civilian/survivor/goon
+	faction = FACTION_WY
+	faction_group = list(FACTION_WY, FACTION_SURVIVOR)
 	languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
 	access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_BRIG, ACCESS_WY_COLONIAL)
 	minimap_icon = "goon_standard"

code/modules/gear_presets/survivors/shivas_snowball/panic_room_insert_shivas.dm

@@ -7,6 +7,9 @@
 	paygrades = list(PAY_SHORT_WYC7 = JOB_PLAYTIME_TIER_0)
 	skills = /datum/skills/civilian/survivor/manager
 	assignment = "Assistant Operations Manager"
+	minimap_background = "background_wy_management"
+	minimap_icon = "ass_man"
+	rank = JOB_ASSISTANT_MANAGER
 	idtype = /obj/item/card/id/silver/clearance_badge/manager
 	faction_group = list(FACTION_WY, FACTION_SURVIVOR)
 	access = list(

code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm

@@ -12,7 +12,7 @@
 	idtype = /obj/item/card/id/pmc
 	skills = /datum/skills/civilian/survivor/pmc
 	languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
-	minimap_icon = "private"
+	minimap_icon = "pmc_gun"
 	minimap_background = "background_pmc"
 
 	access = list(
@@ -79,7 +79,7 @@
 	paygrades = list(PAY_SHORT_PMC_TEC = JOB_PLAYTIME_TIER_0)
 	role_comm_title = "TEC"
 	skills = /datum/skills/civilian/survivor/pmc/engineer
-	minimap_icon = "engi"
+	minimap_icon = "mt"
 
 /datum/equipment_preset/survivor/pmc/engineer/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/cct/hvh, WEAR_L_EAR)
@@ -120,6 +120,7 @@
 	skills = /datum/skills/civilian/survivor/manager
 	assignment = "Colony Supervisor"
 	rank = JOB_EXECUTIVE_SUPERVISOR
+	minimap_icon = "exec_super"
 	role_comm_title = "Supervisor"
 	idtype = /obj/item/card/id/silver/clearance_badge/manager
 	faction = FACTION_WY

code/modules/gear_presets/survivors/survivors.dm

@@ -299,6 +299,9 @@ Everything bellow is a parent used as a base for one or multiple maps.
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 	paygrades = list(PAY_SHORT_WYC2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_WYC3 = JOB_PLAYTIME_TIER_2, PAY_SHORT_WYC4 = JOB_PLAYTIME_TIER_3, PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_4)
 	faction_group = FACTION_LIST_SURVIVOR_WY
+	rank = JOB_EXECUTIVE
+	faction = FACTION_WY
+	faction_group = list(FACTION_WY, FACTION_SURVIVOR)
 	idtype = /obj/item/card/id/silver/clearance_badge/cl
 	access = list(
 		ACCESS_CIVILIAN_PUBLIC,
@@ -310,7 +313,7 @@ Everything bellow is a parent used as a base for one or multiple maps.
 	languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
 	survivor_variant = CORPORATE_SURVIVOR
 	minimap_icon = "cl"
-	minimap_background = "background_civillian"
+	minimap_background = "background_goon"
 
 /datum/equipment_preset/survivor/corporate/load_rank(mob/living/carbon/human/new_human, client/mob_client)
 	if(paygrades.len == 1)

code/modules/gear_presets/synths.dm

@@ -182,6 +182,7 @@
 
 /datum/equipment_preset/synth/survivor/wy
 	flags = EQUIPMENT_PRESET_STUB
+	minimap_background = "background_goon"
 
 /datum/equipment_preset/synth/survivor/wy/New()
 	. = ..()
@@ -499,7 +500,6 @@
 	name = "Survivor - Synthetic - Corporate Security Synth"
 	idtype = /obj/item/card/id/silver/cl
 	role_comm_title = "WY Syn"
-	minimap_background = "background_pmc"
 	equipment_to_spawn = list(
 		WEAR_HEAD = /obj/item/clothing/head/cmcap/wy_cap,
 		WEAR_L_EAR = /obj/item/device/radio/headset/distress/WY,

code/modules/gear_presets/uscm_ship.dm

@@ -26,6 +26,7 @@
 
 /datum/equipment_preset/uscm_ship/liaison
 	name = "USCM Corporate Liaison (CL)"
+	faction = FACTION_WY
 	faction_group =	FACTION_LIST_MARINE_WY
 	flags = EQUIPMENT_PRESET_START_OF_ROUND