From b5b084976837d1782e06d07905f28ad22364701a Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Fri, 9 Aug 2024 18:06:46 -0700 Subject: [PATCH 1/2] yeah --- code/__DEFINES/mode.dm | 3 ++- code/modules/mob/dead/observer/orbit.dm | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 4c3a658ff421..368553468af0 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -280,7 +280,8 @@ DEFINE_BITFIELD(whitelist_status, list( #define FACTION_LIST_MARINE list(FACTION_MARINE) #define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE) -#define FACTION_LIST_ERT list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO) +#define FACTION_LIST_ERT_OTHER list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO) +#define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE) #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY) #define FACTION_LIST_UPP list(FACTION_UPP) #define FACTION_LIST_CLF list(FACTION_CLF) diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index 4bc4abf7036c..1829337237b4 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -144,7 +144,8 @@ else serialized["background_color"] = human.assigned_equipment_preset?.minimap_background - if(SSticker.mode.is_in_endgame == TRUE && !is_mainship_level(M.z) && !(human.faction in FACTION_LIST_ERT)) + var/turf/mob_turf = get_turf(M) + if(SSticker.mode.is_in_endgame == TRUE && !is_mainship_level(mob_turf.z) && !(human.faction in FACTION_LIST_ERT_ALL)) escaped += list(serialized) else if(human.faction in FACTION_LIST_WY) wy += list(serialized) @@ -152,7 +153,7 @@ synthetics += list(serialized) else if(isyautja(human)) predators += list(serialized) - else if(human.faction in FACTION_LIST_ERT) + else if(human.faction in FACTION_LIST_ERT_OTHER) ert_members += list(serialized) else if(human.faction in FACTION_LIST_UPP) upp += list(serialized) From b1a6f7bb42d981a5eaeb95400d92fa43c6be098b Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Fri, 9 Aug 2024 18:19:08 -0700 Subject: [PATCH 2/2] apparently escaping works this way --- code/modules/mob/dead/observer/orbit.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index 1829337237b4..8c8d653331c9 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -144,8 +144,7 @@ else serialized["background_color"] = human.assigned_equipment_preset?.minimap_background - var/turf/mob_turf = get_turf(M) - if(SSticker.mode.is_in_endgame == TRUE && !is_mainship_level(mob_turf.z) && !(human.faction in FACTION_LIST_ERT_ALL)) + if(SSticker.mode.is_in_endgame == TRUE && !is_mainship_level(M.z) && !(human.faction in FACTION_LIST_ERT_ALL)) escaped += list(serialized) else if(human.faction in FACTION_LIST_WY) wy += list(serialized)