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:
PsiOmegaDelta
2016-02-05 10:37:09 +01:00
committed by Yoshax
parent d85b8f95f6
commit afdafb3862
3 changed files with 1 additions and 7 deletions

View File

@@ -155,9 +155,6 @@
return ..()
/mob/living/carbon/escape_buckle()
if(!canClick())
return
setClickCooldown(100)
if(!buckled) return

View File

@@ -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)