From b7768c3b95b7d7d1c48e56eef8d121d95e82134d Mon Sep 17 00:00:00 2001 From: coiax Date: Tue, 25 Apr 2017 21:44:52 +0100 Subject: [PATCH] Fixes monkey transformation instantly killing a person (#26584) :cl: coiax fix: You no longer die when turning into a monkey. /:cl: --- code/modules/surgery/organs/organ_internal.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index f8deed5b289..d90e1448634 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -78,7 +78,9 @@ /obj/item/organ/Destroy() if(owner) - Remove(owner) + // The special flag is important, because otherwise mobs can die + // while undergoing transformation into different mobs. + Remove(owner, special=TRUE) return ..() /obj/item/organ/attack(mob/living/carbon/M, mob/user)