Merge branch 'master' into HvH-automated-slot-assignment

cmss13-devs · Dec 2, 2024 · 229185f · 229185f
2 parents 7dada9a + 6cd1bf1
commit 229185f
Show file tree

Hide file tree

Showing 499 changed files with 3,526 additions and 2,043 deletions.
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
@@ -556,3 +556,6 @@
 #define PERF_TOGGLE_SHUTTLES (1<<3)
 /// Disables loading Techwebs and additional Z-Levels
 #define PERF_TOGGLE_TECHWEBS (1<<4)
+
+/// Maptext styles
+#define MAP_STYLESHEET ".maptext { font-family: 'Small Fonts'; font-size: 7px; -dm-text-outline: 1px black; color: white; line-height: 1.1; } .center { text-align: center; } .langchat { font-family: 'Small Fonts'; font-size: 7px; -dm-text-outline: 1px black; } .langchat_small { font-size: 6px; } .langchat_yell { font-weight: bold; font-size: 10px; } .langchat_bolded { font-weight: bold; font-size: 8px; } .langchat_announce { font-weight: bold; font-size: 12px; } .langchat_bolditalicbig {font-weight: bold; font-size: 24px; font-style: italic; } .langchat_italic {font-style: italic; }"
diff --git a/code/__DEFINES/dcs/signals/atom/signals_item.dm b/code/__DEFINES/dcs/signals/atom/signals_item.dm
@@ -29,7 +29,7 @@
 
 #define COMSIG_ITEM_PICKUP "item_pickup"
 
-///from /obj/item/device/camera/broadcasting
+///from /obj/item/device/broadcasting
 #define COMSIG_BROADCAST_GO_LIVE "broadcast_live"
 #define COMSIG_BROADCAST_HEAR_TALK "broadcast_hear_talk"
 #define COMSIG_BROADCAST_SEE_EMOTE "broadcast_see_emote"

diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm
@@ -27,8 +27,8 @@
 #define ITEM_UNCATCHABLE (1<<9)
 /// Used for nonstandard marine clothing to ignore 'specialty' var.
 #define NO_NAME_OVERRIDE (1<<10)
-/// Used for armors or uniforms that don't have a snow/desert/etc icon state set via select_gamemode_skin (not all item types currently perform this test though).
-#define NO_SNOW_TYPE (1<<11)
+/// Used for armors or uniforms that don't have a snow/desert/etc icon state set via select_gamemode_skin.
+#define NO_GAMEMODE_SKIN (1<<11)
 
 #define INVULNERABLE (1<<12)
 

diff --git a/code/__DEFINES/human.dm b/code/__DEFINES/human.dm
@@ -116,48 +116,49 @@
 #define ORDER_FOCUS_MAX_LEVEL   50
 
 //Human Overlays Indexes used in update_icons/////////
-#define BODYPARTS_LAYER 42
-#define DAMAGE_LAYER 41
+#define BODYPARTS_LAYER 43
+#define DAMAGE_LAYER 42
 
-#define UNDERWEAR_LAYER 40
-#define UNDERSHIRT_LAYER 39
-#define MUTANTRACE_LAYER 38
+#define UNDERWEAR_LAYER 41
+#define UNDERSHIRT_LAYER 40
+#define MUTANTRACE_LAYER 39
 
 /// For use by Hunter Flay
-#define FLAY_LAYER 37
-#define UNIFORM_LAYER 36
+#define FLAY_LAYER 38
+#define UNIFORM_LAYER 37
 
 /// bs12 specific. this hack is probably gonna come back to haunt me
-#define TAIL_LAYER 35
+#define TAIL_LAYER 36
 
-#define ID_LAYER 34
-#define SHOES_LAYER 33
-#define GLOVES_LAYER 32
+#define ID_LAYER 35
+#define SHOES_LAYER 34
+#define GLOVES_LAYER 33
 
 /// For splint and gauze overlays
-#define MEDICAL_LAYER 31
-
-#define SUIT_LAYER 30
-#define SUIT_GARB_LAYER 29
-#define SUIT_SQUAD_LAYER 28
-#define GLASSES_LAYER 27
-#define BELT_LAYER 26
-#define BACK_LAYER 25
-#define HAIR_LAYER 24
-#define HAIR_GRADIENT_LAYER 23
-#define SUIT_STORE_LAYER 22
-#define FACIAL_LAYER 21
-#define EARS_LAYER 20
-#define FACEMASK_LAYER 19
+#define MEDICAL_LAYER 32
+
+#define SUIT_LAYER 31
+#define SUIT_GARB_LAYER 30
+#define SUIT_SQUAD_LAYER 29
+#define GLASSES_LAYER 28
+#define BELT_LAYER 27
+#define BACK_LAYER 26
+#define HAIR_LAYER 25
+#define HAIR_GRADIENT_LAYER 24
+#define SUIT_STORE_LAYER 23
+#define FACIAL_LAYER 22
+#define EARS_LAYER 21
+#define FACEMASK_LAYER 20
 
 /// Unrevivable headshot overlays, suicide/execution.
-#define HEADSHOT_LAYER 18
-#define HEAD_LAYER 17
-#define HEAD_SQUAD_LAYER 16
-#define HEAD_GARB_LAYER_2 15 // These actual defines are unused but this space within the overlays list is
-#define HEAD_GARB_LAYER_3 14 //  |
-#define HEAD_GARB_LAYER_4 13 //  |
-#define HEAD_GARB_LAYER_5 12 // End here
+#define HEADSHOT_LAYER 19
+#define HEAD_LAYER 18
+#define HEAD_SQUAD_LAYER 17
+#define HEAD_GARB_LAYER_6 16 // These actual defines are unused but this space within the overlays list is
+#define HEAD_GARB_LAYER_5 15 //  |
+#define HEAD_GARB_LAYER_4 14 //  |
+#define HEAD_GARB_LAYER_3 13 //  |
+#define HEAD_GARB_LAYER_2 12 // End here
 #define HEAD_GARB_LAYER 11
 
 /// For backpacks when mob is facing north
@@ -177,7 +178,7 @@
 /// If you're hit by an acid DoT
 #define EFFECTS_LAYER 1
 
-#define TOTAL_LAYERS 42
+#define TOTAL_LAYERS 43
 //////////////////////////////////
 
 //Synthetic Defines

diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -77,11 +77,11 @@ GLOBAL_LIST_INIT(job_squad_roles, JOB_SQUAD_ROLES_LIST)
 #define JOB_CO "Commanding Officer"
 #define JOB_XO "Executive Officer"
 #define JOB_SO "Staff Officer"
+#define JOB_AUXILIARY_OFFICER "Auxiliary Support Officer"
 #define JOB_COMMAND_ROLES /datum/timelock/command
-#define JOB_COMMAND_ROLES_LIST   list(JOB_CO, JOB_XO, JOB_SO)
+#define JOB_COMMAND_ROLES_LIST   list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER)
 GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 
-#define JOB_AUXILIARY_OFFICER "Auxiliary Support Officer"
 #define JOB_CAS_PILOT "Gunship Pilot"
 #define JOB_DROPSHIP_PILOT "Dropship Pilot"
 #define JOB_TANK_CREW "Tank Crew"
@@ -96,7 +96,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_WARDEN "Military Warden"
 #define JOB_CHIEF_POLICE "Chief MP"
 #define JOB_POLICE_ROLES /datum/timelock/mp
-#define JOB_POLICE_ROLES_LIST    list(JOB_POLICE, JOB_WARDEN, JOB_CHIEF_POLICE)
+#define JOB_POLICE_ROLES_LIST    list(JOB_POLICE, JOB_WARDEN, JOB_CHIEF_POLICE, JOB_CO)
 
 #define JOB_SEA "Senior Enlisted Advisor"
 
@@ -280,6 +280,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_UPP_LT_DOKTOR "UPP Leytenant Doktor"
 #define JOB_UPP_SRLT_OFFICER "UPP Starshiy Leytenant"
 #define JOB_UPP_KPT_OFFICER "UPP Kapitan"
+#define JOB_UPP_CO_OFFICER "UPP Komandir"
 #define JOB_UPP_MAY_OFFICER "UPP Mayjor"
 #define JOB_UPP_LTKOL_OFFICER "UPP Podpolkovnik"
 #define JOB_UPP_KOL_OFFICER "UPP Polkovnik"
@@ -296,7 +297,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_UPP_COMBAT_SYNTH "UPP Combat Synthetic"
 #define JOB_UPP_SUPPORT_SYNTH "UPP Support Synthetic"
 
-#define UPP_JOB_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_LT_OFFICER, JOB_UPP_LT_DOKTOR, JOB_UPP_SUPPLY, JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_KOL_OFFICER, JOB_UPP_SUPPORT_SYNTH, JOB_UPP_COMMISSAR)
+#define UPP_JOB_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_LT_OFFICER, JOB_UPP_LT_DOKTOR, JOB_UPP_SUPPLY, JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_CO_OFFICER, JOB_UPP_SUPPORT_SYNTH, JOB_UPP_COMMISSAR)
 #define UPP_JOB_GRUNT_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_CREWMAN)
 
 #define JOB_UPP_COMMANDO "UPP Junior Kommando"

diff --git a/code/__DEFINES/machinery.dm b/code/__DEFINES/machinery.dm
@@ -6,6 +6,12 @@
 #define USE_POWER_IDLE 1
 #define USE_POWER_ACTIVE 2
 
+// door defines
+
+#define DOOR_OPERATING_IDLE 0
+#define DOOR_OPERATING_OPENING 1
+#define DOOR_OPERATING_CLOSING 2
+
 // used by the simulator to select mob type
 
 #define HUMAN_MODE "Unarmoured Humans"

diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -131,7 +131,7 @@ GLOBAL_LIST_INIT(ROLES_COMMAND, list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFIC
 //Marine roles
 #define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_TANK_CREW, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
 GLOBAL_LIST_INIT(ROLES_CIC, list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO))
-GLOBAL_LIST_INIT(ROLES_CIC_ANTAG, list(JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_KOL_OFFICER, JOB_UPP_COMMISSAR))
+GLOBAL_LIST_INIT(ROLES_CIC_ANTAG, list(JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_CO_OFFICER, JOB_UPP_COMMISSAR))
 GLOBAL_LIST_INIT(ROLES_AUXIL_SUPPORT, list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_TANK_CREW, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT))
 GLOBAL_LIST_INIT(ROLES_AUXIL_SUPPORT_ANTAG, list(JOB_UPP_CREWMAN))
 GLOBAL_LIST_INIT(ROLES_MISC, list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH))
@@ -193,7 +193,7 @@ GLOBAL_LIST_INIT(whitelist_hierarchy, list(WHITELIST_NORMAL, WHITELIST_COUNCIL,
 ///Old holders of YAUTJA_COUNCIL for 3 months
 #define WHITELIST_YAUTJA_COUNCIL_LEGACY (1<<3)
 #define WHITELIST_YAUTJA_LEADER (1<<4)
-#define WHITELIST_PREDATOR (WHITELIST_YAUTJA|WHITELIST_YAUTJA_LEGACY|WHITELIST_YAUTJA_COUNCIL|WHITELIST_YAUTJA_COUNCIL_LEGACY|WHITELIST_YAUTJA_LEADER)
+#define WHITELIST_PREDATOR (WHITELIST_YAUTJA|WHITELIST_YAUTJA_COUNCIL|WHITELIST_YAUTJA_LEADER)
 
 #define WHITELIST_COMMANDER (1<<5)
 #define WHITELIST_COMMANDER_COUNCIL (1<<6)

diff --git a/code/__DEFINES/paygrade_defs/upp.dm b/code/__DEFINES/paygrade_defs/upp.dm
@@ -52,11 +52,14 @@
 /// UO6, Kolonel/Polkovnik
 #define PAY_SHORT_UO6 "UO6"
 
-/// UO7, Mayjor General/General Leytenant
+/// UO7, Brigadier General/General Mayjor
 #define PAY_SHORT_UO7 "UO7"
 
-/// UO8, Leytenant General/General Polkovnik
+/// UO8, Major General/General Leytenant
 #define PAY_SHORT_UO8 "UO8"
 
-/// UO9, Army General/General Armii
+/// UO9, Lieutenant General/General Polkovnik
 #define PAY_SHORT_UO9 "UO9"
+
+/// UO10, Army General/General Armii
+#define PAY_SHORT_UO10 "UO10"
diff --git a/code/__DEFINES/typecheck/mobs_generic.dm b/code/__DEFINES/typecheck/mobs_generic.dm
@@ -20,3 +20,5 @@
 #define isnewplayer(A) (istype(A, /mob/new_player))
 #define isHellhound(A) (istype(A, /mob/living/carbon/xenomorph/hellhound))
 #define isaghost(A) (copytext(A.key, 1, 2) == "@")
+
+#define ishologram(A) (istype(A, /mob/hologram))
diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm
@@ -773,7 +773,7 @@
 #define FRENZY_DAMAGE_MULTIPLIER 2
 
 #define JOIN_AS_FACEHUGGER_DELAY (3 MINUTES)
-#define JOIN_AS_LESSER_DRONE_DELAY (30 SECONDS)
+#define JOIN_AS_LESSER_DRONE_DELAY (1 MINUTES)
 
 // larva states
 #define LARVA_STATE_BLOODY 0

diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
@@ -256,7 +256,7 @@
 
 		// copied from join as xeno
 		var/deathtime = world.time - cur_obs.timeofdeath
-		if(deathtime < XENO_JOIN_DEAD_TIME && ( !cur_obs.client.admin_holder || !(cur_obs.client.admin_holder.rights & R_ADMIN)) && !cur_obs.bypass_time_of_death_checks)
+		if(deathtime < XENO_JOIN_DEAD_TIME && !cur_obs.bypass_time_of_death_checks && !check_client_rights(cur_obs.client, R_ADMIN, FALSE))
 			continue
 
 		// AFK players cannot be drafted

diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
@@ -145,7 +145,7 @@ DEFINE_BITFIELD(flags_atom, list(
 	"RELAY_CLICK" = RELAY_CLICK,
 	"ITEM_UNCATCHABLE" = ITEM_UNCATCHABLE,
 	"NO_NAME_OVERRIDE" = NO_NAME_OVERRIDE,
-	"NO_SNOW_TYPE" = NO_SNOW_TYPE,
+	"NO_GAMEMODE_SKIN" = NO_GAMEMODE_SKIN,
 	"INVULNERABLE" = INVULNERABLE,
 	"CAN_BE_SYRINGED" = CAN_BE_SYRINGED,
 	"CAN_BE_DISPENSED_INTO" = CAN_BE_DISPENSED_INTO,

diff --git a/code/_onclick/hud/yautja.dm b/code/_onclick/hud/yautja.dm
@@ -6,6 +6,9 @@
 	pred_power_icon.screen_loc = ui_predator_power
 	infodisplay += pred_power_icon
 
+/mob/living/carbon/human/yautja
+	skin_color = "tan"
+	body_type = "pred"
 
 /mob/living/carbon/human/yautja/create_hud()
 	if(client && !hud_used)

diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
@@ -34,22 +34,29 @@
 					do_observe(xeno)
 					return FALSE
 
-				if(!SSticker.mode.xeno_bypass_timer)
-					if((!islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER) || (islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER_LARVA))
-						var/to_wait = XENO_LEAVE_TIMER - xeno.away_timer
-						if(islarva(xeno))
-							to_wait = XENO_LEAVE_TIMER_LARVA - xeno.away_timer
-						if(to_wait > 60 SECONDS) // don't spam for clearly non-AFK xenos
-							to_chat(src, SPAN_WARNING("That player hasn't been away long enough. Please wait [to_wait] second\s longer."))
-						do_observe(target)
-						return FALSE
+				if(xeno.health <= 0)
+					to_chat(src, SPAN_WARNING("You cannot join if the xenomorph is in critical condition or unconscious."))
+					do_observe(xeno)
+					return FALSE
 
+				var/required_leave_time = XENO_LEAVE_TIMER
+				var/required_dead_time = XENO_JOIN_DEAD_TIME
+				if(islarva(xeno))
+					required_leave_time = XENO_LEAVE_TIMER_LARVA
+					required_dead_time = XENO_JOIN_DEAD_LARVA_TIME
+
+				if(xeno.away_timer < required_leave_time)
+					var/to_wait = required_leave_time - xeno.away_timer
+					if(to_wait > 60 SECONDS) // don't spam for clearly non-AFK xenos
+						to_chat(src, SPAN_WARNING("That player hasn't been away long enough. Please wait [to_wait] second\s longer."))
+					do_observe(target)
+					return FALSE
+
+				if(!SSticker.mode.xeno_bypass_timer)
 					var/deathtime = world.time - timeofdeath
-					if(deathtime < XENO_JOIN_DEAD_LARVA_TIME)
-						var/message = "You have been dead for [DisplayTimeText(deathtime)]."
-						message = SPAN_WARNING("[message]")
-						to_chat(src, message)
-						to_chat(src, SPAN_WARNING("You must wait at least 2.5 minutes before rejoining the game!"))
+					if(deathtime < required_dead_time && !bypass_time_of_death_checks)
+						to_chat(src, SPAN_WARNING("You have been dead for [DisplayTimeText(deathtime)]."))
+						to_chat(src, SPAN_WARNING("You must wait at least [required_dead_time / 600] minute\s before rejoining the game!"))
 						do_observe(target)
 						return FALSE
 
@@ -60,13 +67,16 @@
 							do_observe(target)
 							return FALSE
 
-				if(alert(src, "Are you sure you want to transfer yourself into [xeno]?", "Confirm Transfer", "Yes", "No") != "Yes")
+				if(tgui_alert(src, "Are you sure you want to transfer yourself into [xeno]?", "Confirm Transfer", list("Yes", "No")) != "Yes")
 					return FALSE
-				if(((!islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER) || (islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER_LARVA)) || xeno.stat == DEAD) // Do it again, just in case
+
+				if(xeno.away_timer < required_leave_time || xeno.stat == DEAD || !(xeno in GLOB.living_xeno_list)) // Do it again, just in case
 					to_chat(src, SPAN_WARNING("That xenomorph can no longer be controlled. Please try another."))
 					return FALSE
+
 				SSticker.mode.transfer_xeno(src, xeno)
 				return TRUE
+
 			do_observe(target)
 			return TRUE
 

diff --git a/code/controllers/subsystem/hijack.dm b/code/controllers/subsystem/hijack.dm
@@ -218,7 +218,7 @@ SUBSYSTEM_DEF(hijack)
 
 	switch(announce)
 		if(1)
-			marine_announcement("Emergency fuel replenishment is at 25 percent. Lifeboat emergency early launch is now available.[marine_warning_areas ? "\nTo increase speed, restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE)
+			marine_announcement("Emergency fuel replenishment is at 25 percent. Lifeboat early launch is now available. Recommendation: wait for 100% fuel for safety purposes.[marine_warning_areas ? "\nTo increase speed, restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE)
 		if(2)
 			marine_announcement("Emergency fuel replenishment is at 50 percent.[marine_warning_areas ? "\nTo increase speed, restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE)
 		if(3)

diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm
@@ -32,6 +32,7 @@ SUBSYSTEM_DEF(tgui)
 	var/polyfill = file2text('tgui/public/tgui-polyfill.min.js')
 	polyfill = "<script>\n[polyfill]\n</script>"
 	basehtml = replacetextEx(basehtml, "<!-- tgui:inline-polyfill -->", polyfill)
+	basehtml = replacetext(basehtml, "tgui:stylesheet", MAP_STYLESHEET)
 
 /datum/controller/subsystem/tgui/Shutdown()
 	close_all_uis()

diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm
@@ -232,7 +232,7 @@
 		if(do_after(user, 3 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE) && D.density)
 			user.visible_message(SPAN_DANGER("[user] forces [D] open with their [name]."),
 			SPAN_DANGER("You force [D] open with your [name]."))
-			D.Open()
+			D.open()
 
 /obj/item/reagent_container/food/drinks/bottle/black_goo
 	name = "strange bottle"

diff --git a/code/datums/effects/xeno_strains/prae_acid_stacks.dm b/code/datums/effects/xeno_strains/prae_acid_stacks.dm
@@ -45,8 +45,9 @@
 	if (!ishuman(affected_atom))
 		return ..()
 
-	var/mob/living/carbon/human/H = affected_atom
-	addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, update_xeno_hostile_hud)), 3)
+	var/mob/living/carbon/human/human = affected_atom
+	if(!QDELETED(human))
+		addtimer(CALLBACK(human, TYPE_PROC_REF(/mob/living/carbon/human, update_xeno_hostile_hud)), 3)
 
 	return ..()
 

diff --git a/code/datums/factions/upp.dm b/code/datums/factions/upp.dm
@@ -34,21 +34,11 @@
 			hud_icon_state = "slt"
 		if(JOB_UPP_KPT_OFFICER)
 			hud_icon_state = "xo"
-		if(JOB_UPP_MAY_OFFICER)
+		if(JOB_UPP_CO_OFFICER, JOB_UPP_MAY_OFFICER, JOB_UPP_LTKOL_OFFICER, JOB_UPP_KOL_OFFICER)
 			hud_icon_state = "co"
-		if(JOB_UPP_KOL_OFFICER)
-			hud_icon_state = "co"
-		if(JOB_UPP_BRIG_GENERAL)
-			hud_icon_state = "co"
-		if(JOB_UPP_MAY_GENERAL)
-			hud_icon_state = "co"
-		if(JOB_UPP_LT_GENERAL)
-			hud_icon_state = "co"
-		if(JOB_UPP_GENERAL)
-			hud_icon_state = "co"
-		if(JOB_UPP_COMBAT_SYNTH)
-			hud_icon_state = "synth"
-		if(JOB_UPP_SUPPORT_SYNTH)
+		if(JOB_UPP_BRIG_GENERAL, JOB_UPP_MAY_GENERAL, JOB_UPP_LT_GENERAL, JOB_UPP_GENERAL)
+			hud_icon_state = "hc"
+		if(JOB_UPP_COMBAT_SYNTH, JOB_UPP_SUPPORT_SYNTH)
 			hud_icon_state = "synth"
 		if(JOB_UPP_COMMANDO)
 			hud_icon_state = "com"