From 607ab2b784f68bfe68c8beb967a86127007f806d Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Tue, 25 Apr 2017 15:45:27 -0500
Subject: [PATCH] Fixes monkey transformation instantly killing a person

---
 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 eced9ff528..41bbba6a7a 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)