From a07ab809ffed12403b77ac25ad54e89fadfe86e9 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 31 Oct 2020 18:04:59 +0100 Subject: [PATCH] fixes a thing Previously, if a wound was removed while there wasa surgery related to it going on, it'd just qdel() the surgery, which is.. kinda weird, since it, y'know, takes the closing step away from you, and all wound surgeries have checks for no wound being present anyways. --- code/datums/wounds/_wounds.dm | 2 -- code/modules/surgery/repair_puncture.dm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index 29c87b32d4..02421b1e52 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -91,8 +91,6 @@ var/wound_flags = (FLESH_WOUND | BONE_WOUND | ACCEPTS_GAUZE) /datum/wound/Destroy() - if(attached_surgery) - QDEL_NULL(attached_surgery) if(limb?.wounds && (src in limb.wounds)) // destroy can call remove_wound() and remove_wound() calls qdel, so we check to make sure there's anything to remove first remove_wound() limb = null diff --git a/code/modules/surgery/repair_puncture.dm b/code/modules/surgery/repair_puncture.dm index b55fee199b..d6dde5c007 100644 --- a/code/modules/surgery/repair_puncture.dm +++ b/code/modules/surgery/repair_puncture.dm @@ -1,5 +1,5 @@ -/////BURN FIXING SURGERIES////// +/////PUNCTURE FIXING SURGERIES////// //the step numbers of each of these two, we only currently use the first to switch back and forth due to advancing after finishing steps anyway #define REALIGN_INNARDS 1