Skip to content

Commit

Permalink
[MIRROR] Make lobby manifest use trim instead of rank to determine co…
Browse files Browse the repository at this point in the history
…mmand 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 <[email protected]>
Co-authored-by: Bloop <[email protected]>
  • Loading branch information
3 people authored and StealsThePRs committed Feb 27, 2024
1 parent 958f76d commit 97d9925
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
4 changes: 2 additions & 2 deletions code/datums/records/manifest.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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))
Expand Down
7 changes: 2 additions & 5 deletions tgui/packages/tgui/interfaces/CrewManifest.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down Expand Up @@ -105,4 +103,3 @@ export const CrewManifest = (props) => {
</Window>
);
};
// NOVA EDIT CHANGE END - ALTERNATIVE_JOB_TITLES

0 comments on commit 97d9925

Please sign in to comment.