From d55716824ce7fb3ddc44a1b3cd35ec8ddc246869 Mon Sep 17 00:00:00 2001 From: mochi Date: Fri, 18 Sep 2020 11:05:50 +0200 Subject: [PATCH] Add brackets, use proper command globals --- code/datums/cache/crew.dm | 11 +++++++---- tgui/packages/tgui/components/NanoMap.js | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/code/datums/cache/crew.dm b/code/datums/cache/crew.dm index 2a41932fc1e..84308dd4262 100644 --- a/code/datums/cache/crew.dm +++ b/code/datums/cache/crew.dm @@ -5,10 +5,6 @@ GLOBAL_DATUM_INIT(crew_repository, /datum/repository/crew, new()) /datum/repository/crew/New() cache_data = list() - if(!bold_jobs) - // These jobs are used to highlight those with a command ID. Stolen from nttc.dm - bold_jobs = list("Captain", "Head of Personnel", "Nanotrasen Representative", "Blueshield", "Chief Engineer", "Chief Medical Officer", "Research Director", "Head of Security", "Magistrate") - bold_jobs += list("Emergency Response Team Officer", "Emergency Response Team Engineer", "Emergency Response Team Medic", "Emergency Response Team Leader", "Emergency Response Team Member") ..() /datum/repository/crew/proc/health_data(turf/T) @@ -25,6 +21,13 @@ GLOBAL_DATUM_INIT(crew_repository, /datum/repository/crew, new()) if(world.time < cache_entry.timestamp) return cache_entry.data + // Initialize the jobs here because in New(), GLOB.command_positions may not be inited yet + if(!bold_jobs) + bold_jobs = list() + bold_jobs += GLOB.command_positions + bold_jobs += get_all_centcom_jobs() + bold_jobs += list("Nanotrasen Representative", "Blueshield", "Magistrate") + for(var/thing in GLOB.human_list) var/mob/living/carbon/human/H = thing var/obj/item/clothing/under/C = H.w_uniform diff --git a/tgui/packages/tgui/components/NanoMap.js b/tgui/packages/tgui/components/NanoMap.js index b696e413b79..8f3c9445e12 100644 --- a/tgui/packages/tgui/components/NanoMap.js +++ b/tgui/packages/tgui/components/NanoMap.js @@ -134,8 +134,8 @@ const NanoMapMarker = (props, context) => { tooltip, color, } = props; - const rx = x * 2 * zoom - zoom - 3; - const ry = y * 2 * zoom - zoom - 3; + const rx = ((x * 2 * zoom) - zoom) - 3; + const ry = ((y * 2 * zoom) - zoom) - 3; return (