From c601163cfa6c77735f7383f6a78ccf6ce04d5392 Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Wed, 21 Apr 2021 18:56:01 -0700 Subject: [PATCH] fixes job.after_spawn --- code/controllers/subsystem/job.dm | 4 +++- code/modules/jobs/job_types/civilian.dm | 3 ++- code/modules/jobs/job_types/job.dm | 2 +- code/modules/jobs/job_types/silicon.dm | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 88c19401..6aea7611 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -454,7 +454,9 @@ SUBSYSTEM_DEF(job) to_chat(M, "[job.custom_spawn_text]") if(CONFIG_GET(number/minimal_access_threshold)) to_chat(M, "As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.") - + + job.after_spawn(H, M, joined_late) + //Account ID. ID is handled by human initialization if(ishuman(H)) var/mob/living/carbon/human/wageslave = H diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm index feca1a40..7d97858f 100644 --- a/code/modules/jobs/job_types/civilian.dm +++ b/code/modules/jobs/job_types/civilian.dm @@ -18,7 +18,7 @@ Clown minimal_access = list(ACCESS_THEATRE) /datum/job/clown/after_spawn(mob/living/carbon/human/H, mob/M) - . = ..() + ..() H.apply_pref_name("clown", M.client) /datum/outfit/job/clown @@ -83,6 +83,7 @@ Mime minimal_access = list(ACCESS_THEATRE) /datum/job/mime/after_spawn(mob/living/carbon/human/H, mob/M) + ..() H.apply_pref_name("mime", M.client) /datum/outfit/job/mime diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm index d593bfd8..7b4ed75c 100644 --- a/code/modules/jobs/job_types/job.dm +++ b/code/modules/jobs/job_types/job.dm @@ -66,7 +66,7 @@ //Only override this proc //H is usually a human unless an /equip override transformed it /datum/job/proc/after_spawn(mob/living/H, mob/M, latejoin = FALSE) - //do actions on H but send messages to M as the key may not have been transferred_yet + //do actions on H but send messages to M as the key may not have been transferred yet if(mind_traits) for(var/t in mind_traits) ADD_TRAIT(H.mind, t, JOB_TRAIT) diff --git a/code/modules/jobs/job_types/silicon.dm b/code/modules/jobs/job_types/silicon.dm index 31f0c87f..4d0b4d66 100644 --- a/code/modules/jobs/job_types/silicon.dm +++ b/code/modules/jobs/job_types/silicon.dm @@ -21,7 +21,7 @@ AI . = H.AIize(latejoin) /datum/job/ai/after_spawn(mob/H, mob/M, latejoin) - . = ..() + ..() if(latejoin) var/obj/structure/AIcore/latejoin_inactive/lateJoinCore for(var/obj/structure/AIcore/latejoin_inactive/P in GLOB.latejoin_ai_cores)