From cd2eaacf3e08aaead170b319908a9732a5afa20b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 7 Feb 2021 10:39:49 +0100 Subject: [PATCH] [MIRROR] Fixes attacks doing 0 damage when dismemberment wound fails (#3160) * Fixes attacks doing 0 damage when dismemberment wound fails (#56697) * Fixes attacks doing 0 damage when dismemberment wound fails Co-authored-by: YPOQ <30683121+YPOQ@users.noreply.github.com> --- code/datums/wounds/loss.dm | 1 + code/modules/surgery/bodyparts/dismemberment.dm | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/wounds/loss.dm b/code/datums/wounds/loss.dm index b62555d46bb..17ffa7cec83 100644 --- a/code/datums/wounds/loss.dm +++ b/code/datums/wounds/loss.dm @@ -51,3 +51,4 @@ log_wound(victim, src) dismembered_part.dismember(wounding_type == WOUND_BURN ? BURN : BRUTE) qdel(src) + return TRUE diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 3e930764fe7..3a6542f8be7 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -191,8 +191,7 @@ if(prob(base_chance)) var/datum/wound/loss/dismembering = new - dismembering.apply_dismember(src, wounding_type) - return TRUE + return dismembering.apply_dismember(src, wounding_type) //when a limb is dropped, the internal organs are removed from the mob and put into the limb /obj/item/organ/proc/transfer_to_limb(obj/item/bodypart/LB, mob/living/carbon/C)