From 5a09895489f2b9f84a7a24fc03b08e93fbf45cd0 Mon Sep 17 00:00:00 2001 From: Charlie <69320440+hal9000PR@users.noreply.github.com> Date: Wed, 3 Aug 2022 23:33:36 +0100 Subject: [PATCH] reverts #18618, fixing the melee attack chain (#18687) * reverts #18618 * refixes the chainsaw --- code/game/objects/items/weapons/twohanded.dm | 2 +- code/modules/mob/living/carbon/human/human_defense.dm | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 3558b1f7753..3414c096764 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -627,7 +627,7 @@ else if(target.stat != DEAD) user.apply_status_effect(STATUS_EFFECT_CHAINSAW_SLAYING) - if(..()) + if(isnull(..())) // attack returns null if the attack was successful, (against humans) target.KnockDown(8 SECONDS) return else diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 8760a97bce6..f77be18e688 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -473,7 +473,6 @@ emp_act bonus_damage = H.physiology.melee_bonus apply_damage(I.force + bonus_damage , I.damtype, affecting, armor, sharp = weapon_sharp, used_weapon = I) - . = TRUE // at this point the attack has succeeded. var/bloody = 0 if(I.damtype == BRUTE && I.force && prob(25 + I.force * 2))