Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

you can now track pltcos with your tracker #127

Merged
merged 1 commit into from
Feb 28, 2024
Merged

you can now track pltcos with your tracker #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/mob_hud.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
#define TRACKER_CO "track_co"
#define TRACKER_XO "track_xo"
#define TRACKER_CL "track_cl"
#define TRACKER_PLTCO "track_pltco"

#define TRACKER_ASL "_asl" // Alpha Squad Leader
#define TRACKER_BSL "_bsl" // Bravo Squad Leader
Expand Down
9 changes: 9 additions & 0 deletions code/game/jobs/job/command/cic/staffofficer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,14 @@ AddTimelock(/datum/job/command/bridge, list(
/datum/job/command/bridge/ai/get_total_positions(latejoin = 0)
return latejoin ? total_positions : spawn_positions

/datum/job/command/bridge/ai/generate_entry_conditions(mob/living/M, whitelist_status)
. = ..()
GLOB.marine_leaders[JOB_SO] = M
RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_leader_candidate))

/datum/job/command/bridge/ai/proc/cleanup_leader_candidate(mob/M)
SIGNAL_HANDLER
GLOB.marine_leaders -= JOB_SO

#undef SECOND_LT_VARIANT
#undef FIRST_LT_VARIANT
1 change: 1 addition & 0 deletions code/game/objects/items/devices/radio/headset.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
maxf = 1489

var/list/inbuilt_tracking_options = list(
"Platoon Commander" = TRACKER_PLTCO,
"Platoon Sergeant" = TRACKER_SL,
"Squad Sergeant" = TRACKER_FTL,
"Landing Zone" = TRACKER_LZ
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/human/human.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,6 +1255,9 @@
if(TRACKER_XO)
H = GLOB.marine_leaders[JOB_XO]
tracking_suffix = "_xo"
if(TRACKER_PLTCO)
H = GLOB.marine_leaders[JOB_SO]
tracking_suffix = "_co"
if(TRACKER_CL)
var/datum/job/civilian/liaison/liaison_job = RoleAuthority.roles_for_mode[JOB_CORPORATE_LIAISON]
if(liaison_job?.active_liaison)
Expand Down
Loading