Merge pull request #5147 from Citadel-Station-13/upstream-merge-34994

[MIRROR] Fixes species.after_equip_job() running before a player's joining species is finalized
2018-01-28 15:16:06 -06:00
parent 898aead882 8c353f9ca2
commit 2fb11b13b7
1 changed files with 2 additions and 2 deletions
@@ -70,14 +70,14 @@
 	if(outfit)
 		H.equipOutfit(outfit, visualsOnly)

-	H.dna.species.after_equip_job(src, H, 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)

+	H.dna.species.after_equip_job(src, H, visualsOnly)
+
 	if(!visualsOnly && announce)
 		announce(H)