cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes the into-resist proc solely responsible for checking click delays.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/structures/crates_lockers/closets.dm
View File

@@ -331,9 +331,6 @@
if(!req_breakout()) if(!req_breakout())
return return
if(!escapee.canClick())
return
escapee.setClickCooldown(100) escapee.setClickCooldown(100)
//okay, so the closet is either welded or locked... resist!!! //okay, so the closet is either welded or locked... resist!!!

3
code/modules/mob/living/carbon/resist.dm
View File

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

2
code/modules/mob/living/living.dm
View File

@@ -580,7 +580,7 @@ default behaviour is:
set name = "Resist" set name = "Resist"
set category = "IC" set category = "IC"
if(!(stat || next_move > world.time)) if(!stat && canClick())
setClickCooldown(20) setClickCooldown(20)
resist_grab() resist_grab()
if(!weakened) if(!weakened)