From ecf6d798b1170162f2a92a8511e8ef8cc0fcc981 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri, 6 Jan 2023 16:17:13 -0500 Subject: [PATCH] Sharp burn weapons can now disember (#20043) * Sharp burn weapons can now disember * Update code/modules/surgery/organs/organ_external.dm Co-authored-by: Farie82 Co-authored-by: Farie82 --- code/modules/surgery/organs/organ_external.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 7d7bcf3eb76..e20ff9e9c48 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -262,10 +262,11 @@ var/mob/living/carbon/owner_old = owner //Need to update health, but need a reference in case the below check cuts off a limb. //If limb took enough damage, try to cut or tear it off if(owner) - if(!(limb_flags & CANNOT_DISMEMBER) && brute_dam >= max_damage) - if(prob(brute / 2)) - if(sharp) - droplimb(0, DROPLIMB_SHARP) + if(sharp && !(limb_flags & CANNOT_DISMEMBER)) + if(brute_dam >= max_damage && prob(brute / 2)) + droplimb(0, DROPLIMB_SHARP) + if(burn_dam >= max_damage && prob(burn / 2)) + droplimb(0, DROPLIMB_BURN) if(owner_old) owner_old.updatehealth("limb receive damage") @@ -493,6 +494,8 @@ Note that amputating the affected organ does in fact remove the infection from t if(!disintegrate) disintegrate = DROPLIMB_SHARP + if(disintegrate == DROPLIMB_BURN && istype(src, /obj/item/organ/external/head)) + disintegrate = DROPLIMB_SHARP //Lets not make sharp burn weapons delete brains. switch(disintegrate) if(DROPLIMB_SHARP)