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

Merge pull request #6268 from Citadel-Station-13/upstream-merge-36969

Browse Source 
[MIRROR] move enforce_human_authority check before species.before_equip_job()
This commit is contained in:
deathride58
2018-04-04 21:04:30 +00:00
committed by GitHub
parent 3eec79f992 6912680b2f
commit e6f411ae5d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/jobs/job_types/job.dm
+6 -6
View File
@@ -67,18 +67,18 @@
if(!H)
return 0
//Equip the rest of the gear
H.dna.species.before_equip_job(src, H, visualsOnly)
if(outfit)
H.equipOutfit(outfit, visualsOnly)
if(CONFIG_GET(flag/enforce_human_authority) && (title in GLOB.command_positions))
if(H.dna.species.id != "human")
H.set_species(/datum/species/human)
H.rename_self("human", H.client)
purrbation_remove(H, silent=TRUE)
//Equip the rest of the gear
H.dna.species.before_equip_job(src, H, visualsOnly)
if(outfit)
H.equipOutfit(outfit, visualsOnly)
H.dna.species.after_equip_job(src, H, visualsOnly)
if(!visualsOnly && announce)