Merge pull request #3543 from Citadel-Station-13/upstream-merge-31935

[MIRROR] Fixes shades being sent back to the arrival shuttle when their stone is qdel'd
2017-10-22 12:25:42 -04:00
parent 2970c7d66f ede833ef58
commit 000f1c89a3
1 changed files with 5 additions and 0 deletions
@@ -44,6 +44,11 @@
 		if(spent)
 			to_chat(user, "<span class='cult'>This shard is spent; it is now just a creepy rock.</span>")

+/obj/item/device/soulstone/Destroy() //Stops the shade from being qdel'd immediately and their ghost being sent back to the arrival shuttle.
+	for(var/mob/living/simple_animal/shade/A in src)
+		A.death()
+	return ..()
+
 //////////////////////////////Capturing////////////////////////////////////////////////////////

 /obj/item/device/soulstone/attack(mob/living/carbon/human/M, mob/living/user)