From 97d9925101f6b8a1ab86d26723a48d91a0a201fd Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Mon, 26 Feb 2024 22:57:43 -0500 Subject: [PATCH] [MIRROR] Make lobby manifest use trim instead of rank to determine command status (#1173) * Make lobby manifest use trim instead of rank to determine command status * Update manifest.dm * Update CrewManifest.jsx * No longer an edit --------- Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com> Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- code/datums/records/manifest.dm | 4 ++-- tgui/packages/tgui/interfaces/CrewManifest.jsx | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/code/datums/records/manifest.dm b/code/datums/records/manifest.dm index 1ba59b72d86..4b1aaeda9a5 100644 --- a/code/datums/records/manifest.dm +++ b/code/datums/records/manifest.dm @@ -38,7 +38,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) misc_list[++misc_list.len] = list( "name" = name, "rank" = rank, - "trim" = trim, // NOVA EDIT ADDITION - Alt Titles + "trim" = trim, ) continue for(var/department_type as anything in job.departments_list) @@ -52,7 +52,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) var/list/entry = list( "name" = name, "rank" = rank, - "trim" = trim, // NOVA EDIT ADDITION - Alt Titles + "trim" = trim, ) var/list/department_list = manifest_out[department.department_name] if(istype(job, department.department_head)) diff --git a/tgui/packages/tgui/interfaces/CrewManifest.jsx b/tgui/packages/tgui/interfaces/CrewManifest.jsx index 0241ef5e70b..01ddb4e544f 100644 --- a/tgui/packages/tgui/interfaces/CrewManifest.jsx +++ b/tgui/packages/tgui/interfaces/CrewManifest.jsx @@ -10,12 +10,10 @@ const commandJobs = [ 'Chief Engineer', 'Research Director', 'Chief Medical Officer', - 'Quartermaster', // NOVA EDIT - 'Nanotrasen Consultant', // NOVA EDIT + 'Quartermaster', + 'Nanotrasen Consultant', // NOVA EDIT ADDITION ]; -// NOVA EDIT CHANGE BEGIN - ALTERNATIVE_JOB_TITLES -// Any instance of crewMember.trim was originally crewMember.rank export const CrewManifest = (props) => { const { data: { manifest, positions }, @@ -105,4 +103,3 @@ export const CrewManifest = (props) => { ); }; -// NOVA EDIT CHANGE END - ALTERNATIVE_JOB_TITLES