From b49c1c49e5faa219956b8d8ecf1296b72f447134 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 20 Aug 2022 12:32:37 -0700 Subject: [PATCH] Update security_officer.dm --- code/modules/jobs/job_types/security_officer.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index f5d64b101a..cd3612136e 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -35,11 +35,14 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY)) -/datum/job/officer/after_spawn(mob/living/carbon/human/H, mob/M) +/datum/job/officer/after_spawn(mob/living/spawned, client/player_client, latejoin = FALSE) . = ..() + if(!ishuman(spawned)) + return + var/mob/living/carbon/human/H = spawned // Assign department security var/department - if(M && M.client && M.client.prefs) + if(player_client?.prefs) department = M.client.prefs.prefered_security_department if(!LAZYLEN(GLOB.available_depts) || department == "None") return