Merge pull request #3116 from Citadel-Station-13/upstream-merge-31261

[MIRROR] Fixes species locked slots alpha.
2017-10-04 12:28:25 -04:00
parent 67bf519df5 90bd29cba5
commit c08ff0dead
1 changed files with 4 additions and 0 deletions
@@ -313,11 +313,15 @@
 			inv.hud = src
 			inv_slots[inv.slot_id] = inv
 			inv.update_icon()
+	
+	update_locked_slots()

 /datum/hud/human/update_locked_slots()
 	if(!mymob)
 		return
 	var/mob/living/carbon/human/H = mymob
+	if(!istype(H) || !H.dna.species)
+		return
 	var/datum/species/S = H.dna.species
 	for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
 		if(inv.slot_id)