Merge pull request tgstation#17853 from ChangelingRain/suicidalshade

Shades cannot suicide inside soulstones
flangela · May 24, 2016 · fa19b3a · fa19b3a
2 parents e84f0ca + 96f3b6d
commit fa19b3a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
@@ -30,6 +30,11 @@
 	del_on_death = 1
 	deathmessage = "lets out a contented sigh as their form unwinds."
 
+/mob/living/simple_animal/shade/canSuicide()
+	if(istype(loc, /obj/item/device/soulstone)) //do not suicide inside the soulstone
+		return 0
+	return ..()
+
 /mob/living/simple_animal/shade/Process_Spacemove(movement_dir = 0)
 	return TRUE //this doesn't make much sense; you'd thing TRUE would mean it'd process spacemove but it means it doesn't