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)