From 3a4be7c458fa270fa91ae6cb9bca55b54dba3d75 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 14 Aug 2023 00:36:41 +0200 Subject: [PATCH] [MIRROR] You can no longer stand up without legs [MDB IGNORE] (#23066) * You can no longer stand up without legs (#77572) ## About The Pull Request Fixes issue #73211 by removing wounds from dismembered limbs after their owner is removed, rather than before. ## Why It's Good For The Game Fixes a bug. ## Changelog :cl: fix: You can no longer stand up without legs. /:cl: * You can no longer stand up without legs --------- Co-authored-by: Shroopy --- code/modules/surgery/bodyparts/dismemberment.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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