From 5f8380304a7b1f3f080be123f2f01a91e0122977 Mon Sep 17 00:00:00 2001 From: Francis Date: Mon, 20 Oct 2014 22:23:07 +1300 Subject: [PATCH] Revert "Make handcuff click cooldown a define" This reverts commit 7da7fdbaaba87c76078f9c8276f06568670320c8. --- code/__DEFINES/misc.dm | 3 +-- code/_onclick/click.dm | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 253b2d3a13c..66998d42a31 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -34,10 +34,9 @@ #define CLICK_CD_MELEE 8 #define CLICK_CD_RANGE 4 -#define CLICK_CD_HANDCUFFED 10 //click cooldowns, in tenths of a second #define BE_CLOSE 1 //in the case of a silicon, to select if they need to be next to the atom #define NO_DEXTERY 1 //if other mobs (monkeys, aliens, etc) can use this -//used by canUseTopic() +//used by canUseTopic() \ No newline at end of file diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index fc5fcd5e99d..49c617c09b6 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -74,7 +74,7 @@ return M.click_action(A,src) if(restrained()) - changeNext_move(CLICK_CD_HANDCUFFED) //Doing shit in cuffs shall be vey slow + changeNext_move(10) //Doing shit in cuffs shall be vey slow RestrainedClickOn(A) return