From 2e98eef84be43d26125a48d9e58f45daaf28452a Mon Sep 17 00:00:00 2001 From: BingusTheClown Date: Mon, 26 Jan 2026 14:42:07 -0500 Subject: [PATCH] Fix Last Command Member Cryo Announcement (#5174) ## About The Pull Request Properly marks BA, NT Rep, and Blueshield as members of command within the job flags. (when other parts of the code already consider them as 'command', e.g. the biscuit handout) ## Why It's Good For The Game Resolves issue: https://github.com/Bubberstation/Bubberstation/issues/5070 ## Proof Of Testing
Screenshots/Videos image ^ The manifest after the RD has cryo'd (Note lack of RD, which is triggering the variable in the next screenshot), note that the count is important here. image ^ The command member count, as the RD is entering cryo. Note: Before this fix, the count for this exact setup was `8` as it was not counting the BA, NT Rep, and Blueshield. This means that now on lowpop shifts where a BA would sign up, then a member of command joining and then BA cryo'ing will now have the proper count and will not fire off a 'last member of command has cryo'd message'
## Changelog :cl: fix: Fix last member of command has cryo'd announcement when there are still member's of command on board. /:cl: --------- Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com> --- code/modules/jobs/job_types/bridge_assistant.dm | 3 ++- modular_skyrat/modules/blueshield/code/blueshield.dm | 2 +- .../modules/nanotrasen_rep/code/nanotrasen_consultant.dm | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/jobs/job_types/bridge_assistant.dm b/code/modules/jobs/job_types/bridge_assistant.dm index 01ef0e78ef9..263369e050a 100644 --- a/code/modules/jobs/job_types/bridge_assistant.dm +++ b/code/modules/jobs/job_types/bridge_assistant.dm @@ -32,7 +32,8 @@ ) rpg_title = "Royal Guard" allow_bureaucratic_error = FALSE - job_flags = STATION_JOB_FLAGS | JOB_ANTAG_BLACKLISTED | JOB_CANNOT_OPEN_SLOTS + // BUBBER EDIT - Previous: job_flags = STATION_JOB_FLAGS | JOB_ANTAG_BLACKLISTED | JOB_CANNOT_OPEN_SLOTS + job_flags = STATION_JOB_FLAGS | JOB_ANTAG_BLACKLISTED | HEAD_OF_STAFF_JOB_FLAGS human_authority = JOB_AUTHORITY_NON_HUMANS_ALLOWED /obj/effect/landmark/start/bridge_assistant diff --git a/modular_skyrat/modules/blueshield/code/blueshield.dm b/modular_skyrat/modules/blueshield/code/blueshield.dm index 111c24bc919..c22a925b44b 100644 --- a/modular_skyrat/modules/blueshield/code/blueshield.dm +++ b/modular_skyrat/modules/blueshield/code/blueshield.dm @@ -40,7 +40,7 @@ /obj/item/restraints/legcuffs/bola/energy = 10, ) - job_flags = STATION_JOB_FLAGS | JOB_CANNOT_OPEN_SLOTS + job_flags = STATION_JOB_FLAGS | HEAD_OF_STAFF_JOB_FLAGS /datum/outfit/job/blueshield name = "Blueshield" diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm index 50fa3fdee2a..e4101ba9c1e 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm @@ -36,7 +36,7 @@ /obj/item/reagent_containers/cup/glass/bottle/champagne = 10 ) - job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT | JOB_CANNOT_OPEN_SLOTS + job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT | HEAD_OF_STAFF_JOB_FLAGS /datum/outfit/job/nanotrasen_consultant name = "Nanotrasen Consultant"