Skip to content

Commit

Permalink
[MIRROR] Fixes speedpunching
Browse files Browse the repository at this point in the history
  • Loading branch information
emmanuelbassil authored and SuhEugene committed Oct 26, 2023
1 parent 2500b8a commit ba72b00
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions code/game/objects/objs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)]"

Expand All @@ -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)
Expand Down

0 comments on commit ba72b00

Please sign in to comment.