From 17d2ff88c56f0d76beddc384b9aed0c1499bea55 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sat, 21 Oct 2017 19:52:57 -0400
Subject: [PATCH] Merge pull request #31935 from ShizCalev/shade-qdel-fix

Fixes shades being sent back to the arrival shuttle when their stone is qdel'd
---
 code/game/gamemodes/wizard/soulstone.dm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index 149c2ae912..b38ac384fb 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -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)