From 7d399bb07ca22ae6827e669dbeebf6b8356771d5 Mon Sep 17 00:00:00 2001 From: Mark Suckerberg Date: Wed, 5 Jul 2023 00:21:47 -0500 Subject: [PATCH] oops, fixes --- code/__HELPERS/global_lists.dm | 4 +++- code/game/machinery/computer/crew.dm | 29 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 4f9e234b0d27b..7c04705c6294a 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -84,7 +84,9 @@ //Default Jobs for(var/path in subtypesof(/datum/job)) var/datum/job/new_job = new path() - new_job.register() + GLOB.occupations += new_job + GLOB.name_occupations[new_job.name] = new_job + GLOB.type_occupations[path] = new_job // Keybindings init_keybindings() diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index c47333a80a0d0..589289c595dbd 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -66,22 +66,23 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) return data_by_z["[z]"] var/list/results = list() - var/obj/item/clothing/under/U - var/obj/item/card/id/I - var/turf/pos - var/ijob = JOB_DISPLAY_ORDER_DEFAULT - var/name = "Unknown" - var/assignment - var/oxydam - var/toxdam - var/burndam - var/brutedam - var/area - var/pos_x - var/pos_y - var/life_status for(var/i in GLOB.human_list) + var/obj/item/clothing/under/U + var/obj/item/card/id/I + var/turf/pos + var/ijob = JOB_DISPLAY_ORDER_DEFAULT + var/name = "Unknown" + var/assignment + var/oxydam + var/toxdam + var/burndam + var/brutedam + var/area + var/pos_x + var/pos_y + var/life_status + var/mob/living/carbon/human/H = i var/nanite_sensors = FALSE if(H in SSnanites.nanite_monitored_mobs)