reverts #18618, fixing the melee attack chain (#18687)

* reverts #18618

* refixes the chainsaw
This commit is contained in:
Charlie
2022-08-03 23:33:36 +01:00
committed by GitHub
parent b282f24f9a
commit 5a09895489
2 changed files with 1 additions and 2 deletions
+1 -1
View File
@@ -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
@@ -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))