Merge pull request #564 from Citadel-Station-13/upstream-merge-26584

[MIRROR] Fixes monkey transformation instantly killing a person
2017-04-25 20:36:02 -05:00
parent 2102b20409 607ab2b784
commit 87611ef7c1
1 changed files with 3 additions and 1 deletions
@@ -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)