shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15804 from Citadel-Station-13/silicons-patch-14

Browse Source 
fixes security officer mob init runtimes
This commit is contained in:
Lin
2022-08-23 00:17:14 +00:00
committed by GitHub
parent e1354c8553 27c404abd2
commit fca2f71b7b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/jobs/job_types/security_officer.dm
View File

@@ -35,12 +35,15 @@
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)
department = M.client.prefs.prefered_security_department
if(player_client?.prefs)
department = player_client.prefs.prefered_security_department
if(!LAZYLEN(GLOB.available_depts) || department == "None")
return
else if(department in GLOB.available_depts)
@@ -108,11 +111,9 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
else
break
if(department)
to_chat(M, "<b>You have been assigned to [department]!</b>")
to_chat(H, "<b>You have been assigned to [department]!</b>")
else
to_chat(M, "<b>You have not been assigned to any department. Patrol the halls and help where needed.</b>")
to_chat(H, "<b>You have not been assigned to any department. Patrol the halls and help where needed.</b>")
/datum/outfit/job/security
name = "Security Officer"