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

Update job.dm

Browse Source
This commit is contained in:
deathride58
2018-04-06 20:53:15 -04:00
committed by GitHub
parent 38ae8beefc
commit b88da782aa
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/controllers/subsystem/job.dm
View File

@@ -399,13 +399,9 @@ SUBSYSTEM_DEF(job)
H.mind.assigned_role = rank
if(job)
<<<<<<< HEAD
if(!job.dresscodecompliant)// CIT CHANGE - dress code compliance
equip_loadout(N, H) // CIT CHANGE - allows players to spawn with loadout items
var/new_mob = job.equip(H)
=======
var/new_mob = job.equip(H, null, null, joined_late)
>>>>>>> 0c27e22... Latejoin Silicons (#36560)
if(ismob(new_mob))
H = new_mob
if(!joined_late)
@@ -425,16 +421,12 @@ SUBSYSTEM_DEF(job)
to_chat(M, "<FONT color='blue'><B>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.</B></font>")
if(job && H)
<<<<<<< HEAD
if(job.dresscodecompliant)// CIT CHANGE - dress code compliance
equip_loadout(N, H) // CIT CHANGE - allows players to spawn with loadout items
job.after_spawn(H, M)
job.after_spawn(H, M, joined_late)
equip_loadout(N, H, TRUE)//CIT CHANGE - makes players spawn with in-backpack loadout items properly. A little hacky but it works
//handle_roundstart_items(H, M.ckey, H.mind.assigned_role, H.mind.special_role) //CIT CHANGE - makes donators spawn with their items. This can safely be commented out when all of the donator items are migrated to the loadout system
=======
job.after_spawn(H, M, joined_late)
>>>>>>> 0c27e22... Latejoin Silicons (#36560)
return H