mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Makes the into-resist proc solely responsible for checking click delays.
Because it sets the click cooldown itself downstream procs fail when they in turn check the click delay. Fixes #11839. Fixes #12062. Fixes #12114.
This commit is contained in:
@@ -155,9 +155,6 @@
|
||||
return ..()
|
||||
|
||||
/mob/living/carbon/escape_buckle()
|
||||
if(!canClick())
|
||||
return
|
||||
|
||||
setClickCooldown(100)
|
||||
if(!buckled) return
|
||||
|
||||
|
||||
@@ -580,7 +580,7 @@ default behaviour is:
|
||||
set name = "Resist"
|
||||
set category = "IC"
|
||||
|
||||
if(!(stat || next_move > world.time))
|
||||
if(!stat && canClick())
|
||||
setClickCooldown(20)
|
||||
resist_grab()
|
||||
if(!weakened)
|
||||
|
||||
Reference in New Issue
Block a user