From 388b69d78eca53e4f327a2492db5edd47a121253 Mon Sep 17 00:00:00 2001 From: moxian Date: Thu, 26 Nov 2020 01:44:37 -0800 Subject: [PATCH] Deletes CLICK_CD_BREAKOUT. (#14992) There's no reason to prevent people from *clicking* on things for 10 seconds. They won't be able to do anything useful while being constrained anyway. And also, all paths leading to CLICK_CD_BREAKOUT go through CLICK_CD_RESIST, so this change effectively lowers the "can't click anything" time from 10s to 2s (not to zero) --- code/__DEFINES/misc.dm | 1 - code/game/machinery/suit_storage_unit.dm | 4 +--- code/game/objects/structures/crates_lockers/closets.dm | 2 -- .../crates_lockers/closets/secure/secure_closets.dm | 2 -- code/modules/mob/living/carbon/carbon.dm | 4 ---- code/modules/mob/living/carbon/human/human.dm | 2 -- 6 files changed, 1 insertion(+), 14 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 8a64270dbfa..657e4db1666 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -22,7 +22,6 @@ //Click cooldowns, in tenths of a second #define CLICK_CD_MELEE 8 #define CLICK_CD_RANGE 4 -#define CLICK_CD_BREAKOUT 100 #define CLICK_CD_HANDCUFFED 10 #define CLICK_CD_TKSTRANGLE 10 #define CLICK_CD_POINT 10 diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 2b949734390..b307c91b5df 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -420,7 +420,7 @@ qdel(mask) qdel(magboots) qdel(storage) - qdel(suit) + qdel(suit) helmet = null suit = null mask = null @@ -451,8 +451,6 @@ open_machine() dump_contents() return - user.changeNext_move(CLICK_CD_BREAKOUT) - user.last_special = world.time + CLICK_CD_BREAKOUT user.visible_message("You see [user] kicking against the doors of [src]!", \ "You start kicking against the doors... (this will take about [DisplayTimeText(breakout_time)].)", \ "You hear a thump from [src].") diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index bd1b9800db0..124fb69f8d3 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -309,8 +309,6 @@ // breakout_time++ //Harder to get out of welded lockers than locked lockers //okay, so the closet is either welded or locked... resist!!! - L.changeNext_move(CLICK_CD_BREAKOUT) - L.last_special = world.time + CLICK_CD_BREAKOUT to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") for(var/mob/O in viewers(usr.loc)) O.show_message("The [src] begins to shake violently!", 1) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 7a648aa74e4..6c10146321f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -125,8 +125,6 @@ return //It's a secure closet, but isn't locked. Easily escapable from, no need to 'resist' //okay, so the closet is either welded or locked... resist!!! - L.changeNext_move(CLICK_CD_BREAKOUT) - L.last_special = world.time + CLICK_CD_BREAKOUT to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") for(var/mob/O in viewers(src)) O.show_message("The [src] begins to shake violently!", 1) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index be15d47a054..fd1e338fa94 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -787,8 +787,6 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven if((I = get_restraining_item())) // If there is nothing to restrain him then he is not restrained var/breakouttime = I.breakouttime var/displaytime = breakouttime / 10 - changeNext_move(CLICK_CD_BREAKOUT) - last_special = world.time + CLICK_CD_BREAKOUT visible_message("[src] attempts to unbuckle [p_them()]self!", \ "You attempt to unbuckle yourself... (This will take around [displaytime] seconds and you need to stay still.)") if(do_after(src, breakouttime, 0, target = src)) @@ -824,8 +822,6 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven else if(legcuffed) I = legcuffed if(I) - changeNext_move(CLICK_CD_BREAKOUT) - last_special = world.time + CLICK_CD_BREAKOUT cuff_resist(I) /mob/living/carbon/resist_muzzle() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 7972edcb69d..5d53e7974db 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1181,8 +1181,6 @@ /mob/living/carbon/human/resist_restraints() if(wear_suit && wear_suit.breakouttime) - changeNext_move(CLICK_CD_BREAKOUT) - last_special = world.time + CLICK_CD_BREAKOUT cuff_resist(wear_suit) else ..()