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

Merge pull request #7240 from Citadel-Station-13/upstream-merge-38675

Browse Source 
[MIRROR] Fixed cyborgs not getting their names at round start
This commit is contained in:
LetterJay
2018-07-01 09:24:46 -05:00
committed by GitHub
parent 0029919b80 cdd285f5c7
commit 605f7a1bf6
7 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/job.dm
+1 -6
View File
@@ -434,12 +434,7 @@ 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)
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, 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) // note: this happens before the mob has a key! M will always have a client, H might not.
return H