Merge pull request #13745 from Arturlang/soulstone_references

Adds more sanity to construct soul returning
2020-12-11 00:42:30 +01:00
parent 71343bf130 ef13b07dd4
commit bece5971b8
1 changed files with 5 additions and 1 deletions
@@ -67,8 +67,12 @@
 		CR.button.screen_loc = "6:[pos],4:-2"
 		CR.button.moved = "6:[pos],4:-2"

+/mob/living/simple_animal/hostile/construct/Destroy()
+	original_mind = null
+	. = ..()
+
 /mob/living/simple_animal/hostile/construct/death()
-	if(original_mind)
+	if(original_mind && !(QDELETED(original_mind)))
 		transfer_ckey(original_mind.current)
 	..()