From ad51869e82623cf007ff5ec993e089770d38f519 Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Wed, 28 Aug 2024 04:23:21 +0200 Subject: [PATCH] Reorders Groundside Operations console sorting (#7042) # About the pull request FTLs are now below SLs SGs are now below specs, instead of medics. FTLs were not getting sorted. (Unintentional revert in earlier PR) # Explain why it's good for the game ASL priority is: SL -> FTL -> Spec/SG, let's sort according to that # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: CIC groundside operations console now correctly sorts FTLs and SGs /:cl: --- code/game/machinery/computer/groundside_operations.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/groundside_operations.dm b/code/game/machinery/computer/groundside_operations.dm index 376357a49174..a4c3afeb7e7e 100644 --- a/code/game/machinery/computer/groundside_operations.dm +++ b/code/game/machinery/computer/groundside_operations.dm @@ -113,7 +113,7 @@ if(show_command_squad) dat += format_list_of_marines(list(GLOB.marine_leaders[JOB_CO], GLOB.marine_leaders[JOB_XO]) + GLOB.marine_leaders[JOB_SO], list(JOB_CO, JOB_XO, JOB_SO)) else if(current_squad) - dat += format_list_of_marines(current_squad.marines_list, list(JOB_SQUAD_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE)) + dat += format_list_of_marines(current_squad.marines_list, list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE)) else dat += "No Squad selected!
" dat += "
"