upstream-merge-27899

2017-06-11 00:09:55 -05:00
parent e596e3eea4
commit 4624ec7e04
3 changed files with 15 additions and 4 deletions
@@ -6,17 +6,20 @@
 /mob/living/carbon/human/Weaken(amount, updating = 1, ignore_canstun = 0)
 	amount = dna.species.spec_stun(src,amount)
 	return ..()
-	
+
 /mob/living/carbon/human/Paralyse(amount, updating = 1, ignore_canstun = 0)
 	amount = dna.species.spec_stun(src,amount)
 	return ..()
-	
+
 /mob/living/carbon/human/cure_husk()
 	. = ..()
 	if(.)
 		update_hair()

 /mob/living/carbon/human/become_husk()
+	if(istype(dna.species, /datum/species/skeleton)) //skeletons shouldn't be husks.
+		cure_husk()
+		return
 	. = ..()
 	if(.)
 		update_hair()