From 827920dba7b7e27e5ebdc9be8a58b6ade64d21d2 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 9 Dec 2020 17:54:44 +0200 Subject: [PATCH 1/2] Paranoid ramblings --- code/modules/mob/living/simple_animal/constructs.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 61187006a4..dc28ffa9a5 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -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) ..() From ef13b07dd4d88c67f5198714e5accfd6706e6e96 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 9 Dec 2020 17:56:28 +0200 Subject: [PATCH 2/2] Forgot this --- code/modules/mob/living/simple_animal/constructs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index dc28ffa9a5..7b1e2dcaba 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -72,7 +72,7 @@ . = ..() /mob/living/simple_animal/hostile/construct/death() - if(original_mind && QDELETED(original_mind)) + if(original_mind && !(QDELETED(original_mind))) transfer_ckey(original_mind.current) ..()