From 4466609c9e66e93e1fb372cb63c45ce2f4a5a5fe Mon Sep 17 00:00:00 2001 From: bgobandit Date: Tue, 15 Jan 2019 12:11:32 -0500 Subject: [PATCH] Resisting out of bucklecuffs takes an amount of time dependent on cuffs used. (#42344) * Resisting out of bucklecuffing will now take different amounts of time based on the cuffs used. * removes stray reference to "one minute" * makes cobby's change --- code/modules/mob/living/carbon/carbon.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 6b417474c5e..951cd3e7a87 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -268,9 +268,13 @@ if(restrained()) changeNext_move(CLICK_CD_BREAKOUT) last_special = world.time + CLICK_CD_BREAKOUT + var/buckle_cd = 600 + if(handcuffed) + var/obj/item/restraints/O = src.get_item_by_slot(SLOT_HANDCUFFED) + buckle_cd = O.breakouttime visible_message("[src] attempts to unbuckle [p_them()]self!", \ - "You attempt to unbuckle yourself... (This will take around one minute and you need to stay still.)") - if(do_after(src, 600, 0, target = src)) + "You attempt to unbuckle yourself... (This will take around [round(buckle_cd/600,1)] minute\s, and you need to stay still.)") + if(do_after(src, buckle_cd, 0, target = src)) if(!buckled) return buckled.user_unbuckle_mob(src,src)