From ec33c25a31e11790d5c987938a884332b9a2d9ce Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Sun, 1 Dec 2024 02:19:34 +0000 Subject: [PATCH] Adds ASO to Command Timelocks, and CO to MP timelocks. (#7666) # About the pull request As title # Explain why it's good for the game CO is head of Marine Law, and should count towards MP timelocks. Likewise, ASO is third in command and should be considered a command role. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: Added CO to MP timelocks, and ASO to command timelocks. /:cl: --- code/__DEFINES/job.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index ebd4a7a38179..31c67f166a3c 100644 --- 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"