From af1f42fa2f1bb06e77975c9328f5bad554377c22 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Thu, 26 Jan 2017 16:25:20 -0800 Subject: [PATCH] Update carbon.dm --- code/modules/mob/living/carbon/carbon.dm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index d26a721dbc8..0e212497035 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -279,13 +279,20 @@ /mob/living/carbon/resist_restraints() var/obj/item/I = null + var/type = 0 if(handcuffed) I = handcuffed + type = 1 else if(legcuffed) I = legcuffed + type = 2 if(I) - changeNext_move(CLICK_CD_BREAKOUT) - last_special = world.time + CLICK_CD_BREAKOUT + if(type == 1) + changeNext_move(CLICK_CD_BREAKOUT) + last_special = world.time + CLICK_CD_BREAKOUT + if(type == 2) + changeNext_move(CLICK_CD_RANGED) + last_special = world.time + CLICK_CD_RANGED cuff_resist(I)