diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index c722ea43987..66861a5d890 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -95,9 +95,6 @@ bodypart_flags &= ~BODYPART_IMPLANTED //limb is out and about, it can't really be considered an implant owner.remove_bodypart(src) - for(var/datum/wound/wound as anything in wounds) - wound.remove_wound(TRUE) - for(var/datum/scar/scar as anything in scars) scar.victim = null LAZYREMOVE(owner.all_scars, scar) @@ -107,6 +104,9 @@ var/mob/living/carbon/phantom_owner = set_owner(null) // so we can still refer to the guy who lost their limb after said limb forgets 'em + for(var/datum/wound/wound as anything in wounds) + wound.remove_wound(TRUE) + for(var/datum/surgery/surgery as anything in phantom_owner.surgeries) //if we had an ongoing surgery on that limb, we stop it. if(surgery.operated_bodypart == src) phantom_owner.surgeries -= surgery