From e8bb79d7c9fcf4cb6cafa91e5f0bd7bdfe362847 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Fri, 1 Sep 2017 07:12:08 -0700 Subject: [PATCH] kk --- code/citadel/custom_loadout/load_to_mob.dm | 6 +++--- code/controllers/subsystem/job.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/citadel/custom_loadout/load_to_mob.dm b/code/citadel/custom_loadout/load_to_mob.dm index 9b2684996f..64eec2ba06 100644 --- a/code/citadel/custom_loadout/load_to_mob.dm +++ b/code/citadel/custom_loadout/load_to_mob.dm @@ -7,10 +7,10 @@ #define DROP_TO_FLOOR 0 #define LOADING_TO_HUMAN 1 -/proc/handle_roundstart_items(mob/living/M) - if(!istype(M) || !M.ckey || !M.mind) +/proc/handle_roundstart_items(mob/living/M, ckey_override, job_override, special_override) + if(!istype(M) || (!M.ckey && !ckey_override) || (!M.mind && (!job_override || !special_override))) return FALSE - return load_itemlist_to_mob(M, parse_custom_roundstart_items(M.ckey, M.name, M.mind.assigned_role, M.mind.special_role), TRUE, TRUE, FALSE) + return load_itemlist_to_mob(M, parse_custom_roundstart_items(ckey_override? ckey_override : M.ckey, M.name, job_override? job_override : M.mind.assigned_role, special_override? special_override : M.mind.special_role), TRUE, TRUE, FALSE) //Just incase there's extra mob selections in the future..... /proc/load_itemlist_to_mob(mob/living/L, list/itemlist, drop_on_floor_if_full = TRUE, load_to_all_slots = TRUE, replace_slots = FALSE) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index ac2ffec42f..012c2e33af 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -407,7 +407,7 @@ SUBSYSTEM_DEF(job) if(job && H) job.after_spawn(H, M) - handle_roundstart_items(H) + handle_roundstart_items(H, M.ckey, H.mind.assigned_role, H.mind.special_role) return H