From 7e369f2fa3ddd36ed214f331be91847ec098e03a Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 15 Sep 2020 02:10:41 -0700 Subject: [PATCH] hides silly cones, refactor, split off supply jobs in list --- code/game/jobs/jobs.dm | 2 +- code/game/machinery/computer/card.dm | 9 ++++++--- tgui/packages/tgui/interfaces/CardComputer.js | 13 +++++++++++-- tgui/packages/tgui/public/tgui.bundle.js | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 81cc54aa3c3..2f8e426e030 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(supply_positions, list( "Shaft Miner" )) -GLOBAL_LIST_INIT(service_positions, (support_positions - supply_positions + list("Head of Personnel"))) +GLOBAL_LIST_INIT(service_positions, (list("Head of Personnel") + (support_positions - supply_positions))) GLOBAL_LIST_INIT(security_positions, list( diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 3161e6390cc..be7d2683d7c 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -239,6 +239,8 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card/proc/get_subordinates(rank, addcivs) var/list/jobs_returned = list() for(var/datum/job/thisjob in SSjobs.occupations) + if(thisjob.title in GLOB.nonhuman_positions) // hides AI from list when Captain ID is inserted into dept console + continue if(rank in thisjob.department_head) jobs_returned += thisjob.title if(addcivs) @@ -294,7 +296,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "CardComputer", name, 800, 700, master_ui, state) + ui = new(user, src, ui_key, "CardComputer", name, 800, 800, master_ui, state) ui.open() /obj/machinery/computer/card/tgui_data(mob/user) @@ -324,7 +326,8 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) data["jobs_medical"] = GLOB.medical_positions data["jobs_science"] = GLOB.science_positions data["jobs_security"] = GLOB.security_positions - data["jobs_support"] = GLOB.support_positions + data["jobs_service"] = GLOB.service_positions + data["jobs_supply"] = GLOB.supply_positions - "Head of Personnel" data["jobs_civilian"] = GLOB.civilian_positions data["jobs_karma"] = GLOB.whitelisted_positions data["jobs_centcom"] = get_all_centcom_jobs() @@ -398,7 +401,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if("modify") // inserting or removing the ID you plan to modify if(modify) GLOB.data_core.manifest_modify(modify.registered_name, modify.assignment) - modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])") + regenerate_id_name() if(ishuman(usr)) modify.forceMove(get_turf(src)) if(!usr.get_active_hand() && Adjacent(usr)) diff --git a/tgui/packages/tgui/interfaces/CardComputer.js b/tgui/packages/tgui/interfaces/CardComputer.js index 52f37ce20da..05ecfbecf17 100644 --- a/tgui/packages/tgui/interfaces/CardComputer.js +++ b/tgui/packages/tgui/interfaces/CardComputer.js @@ -197,8 +197,17 @@ export const CardComputer = (props, context) => { onClick={() => act("assign", { assign_target: v })} /> ))} - - {data.jobs_support.map(v => ( + + {data.jobs_service.map(v => ( +