Skip to content

Commit

Permalink
Adds ASO to Command Timelocks, and CO to MP timelocks. (#7666)
Browse files Browse the repository at this point in the history
# 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
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: Added CO to MP timelocks, and ASO to command timelocks.
/:cl:
  • Loading branch information
realforest2001 authored Dec 1, 2024
1 parent 91b9c6e commit ec33c25
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions code/__DEFINES/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down

0 comments on commit ec33c25

Please sign in to comment.