From ba72b0023b5cd39b5c32a03a9f23e7da72ec03cb Mon Sep 17 00:00:00 2001 From: emmanuelbassil <6874235+emmanuelbassil@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:35:19 +0300 Subject: [PATCH] [MIRROR] Fixes speedpunching --- code/game/objects/objs.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index d96f2c259d6ad..dd8c587cfa014 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -251,6 +251,8 @@ var/datum/unarmed_attack/attack = assailant.get_unarmed_attack(src) if (!attack) return ..() + assailant.do_attack_animation(src) + assailant.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) var/damage = attack.damage + rand(1,5) var/attack_verb = "[pick(attack.attack_verb)]" @@ -268,11 +270,8 @@ SPAN_WARNING("\The [assailant] [attack_verb] \the [src]!"), SPAN_WARNING("You [attack_verb] \the [src]!") ) - assailant.do_attack_animation(src) - assailant.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) damage_health(damage, attack.get_damage_type(), attack.damage_flags()) return - ..() /obj/is_fluid_pushable(amt)