From ddd6247f63fc3bb65b433501cd0ede9b36d8b658 Mon Sep 17 00:00:00 2001 From: Azarak Date: Mon, 12 Oct 2020 03:10:10 +0200 Subject: [PATCH] weh (#1253) --- code/controllers/subsystem/job.dm | 6 +++--- modular_skyrat/modules/customization/modules/jobs/_job.dm | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 2d87ce3d248..0e1041c5fbc 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -470,8 +470,8 @@ SUBSYSTEM_DEF(job) if(job) var/new_mob = job.equip(living_mob, null, null, joined_late , null, M.client)//silicons override this proc to return a mob //SKYRAT CHANGE ADDITION BEGIN - CUSTOMIZATION - if(job.no_dresscode) - if(M.client && isliving(new_mob)) + if(job.no_dresscode && job.loadout) + if(M.client) packed_items = M.client.prefs.equip_preference_loadout(M, FALSE, job) //SKYRAT CHANGE ADDITION END if(ismob(new_mob)) @@ -505,7 +505,7 @@ SUBSYSTEM_DEF(job) if(job && living_mob) job.after_spawn(living_mob, M, joined_late) // note: this happens before the mob has a key! M will always have a client, H might not. //SKYRAT CHANGE ADDITION BEGIN - CUSTOMIZATION - if(!job.no_dresscode) + if(!job.no_dresscode && job.loadout) if(M.client) packed_items = M.client.prefs.equip_preference_loadout(M, FALSE, job) if(packed_items) diff --git a/modular_skyrat/modules/customization/modules/jobs/_job.dm b/modular_skyrat/modules/customization/modules/jobs/_job.dm index b0fda34a64f..1b903afe233 100644 --- a/modular_skyrat/modules/customization/modules/jobs/_job.dm +++ b/modular_skyrat/modules/customization/modules/jobs/_job.dm @@ -1,6 +1,8 @@ /datum/job ///With this set to TRUE, the loadout will be applied before a job clothing will be var/no_dresscode + //Whether the job can use the loadout system + var/loadout = TRUE //List of banned quirks in their names(dont blame me, that's how they're stored), players can't join as the job if they have the quirk. Associative for the purposes of performance var/list/banned_quirks @@ -45,3 +47,9 @@ /datum/job/qm banned_quirks = list(HEAD_RESTRICTED_QUIRKS) + +/datum/job/ai + loadout = FALSE + +/datum/job/cyborg + loadout = FALSE