Skip to content

Commit

Permalink
[MIRROR] Increase throat-slit cooldown (#2630)
Browse files Browse the repository at this point in the history
Co-authored-by: Ryan180602 <[email protected]>
Co-authored-by: Lexanx <[email protected]>
  • Loading branch information
3 people authored Nov 6, 2024
1 parent a58380d commit fb84a6c
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions code/modules/mob/grab/normal/grab_normal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,12 @@
return 0 //unsuitable weapon
user.visible_message(SPAN_DANGER("\The [user] begins to slit \the [affecting]'s throat with \the [W]!"))

user.next_move = world.time + 20 //also should prevent user from triggering this repeatedly
if(!do_after(user, 2 SECONDS * user.skill_delay_mult(SKILL_COMBAT), affecting, DO_DEFAULT | DO_USER_UNIQUE_ACT | DO_PUBLIC_PROGRESS))
var/attack_time = 3 SECONDS * user.skill_delay_mult(SKILL_COMBAT, 0.125) // 3.75 ~ 2.25 seconds
if(!do_after(user, attack_time, affecting, DO_DEFAULT | DO_USER_UNIQUE_ACT | DO_PUBLIC_PROGRESS))
return 0
if(!(G && G.affecting == affecting)) //check that we still have a grab
if(!(G && G.affecting == affecting))
return 0
user.next_move = world.time + 1 SECOND

var/damage_mod = 1
var/damage_flags = W.damage_flags()
Expand Down

0 comments on commit fb84a6c

Please sign in to comment.