From 515ee2671cb2022945c18fefa1561a5ebff87bd2 Mon Sep 17 00:00:00 2001 From: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Fri, 6 Jan 2023 17:57:28 -0300 Subject: [PATCH] Tweaks to unfasten times (#19996) --- code/game/machinery/recycler.dm | 2 +- code/game/objects/items/decorations.dm | 2 +- code/modules/arcade/prize_counter.dm | 2 +- code/modules/food_and_drinks/kitchen_machinery/gibber.dm | 2 +- .../modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm | 2 +- code/modules/food_and_drinks/kitchen_machinery/processor.dm | 2 +- code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm | 2 +- code/modules/hydroponics/seed_extractor.dm | 2 +- code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 2 +- code/modules/reagents/chemistry/machinery/chem_master.dm | 2 +- code/modules/reagents/chemistry/machinery/pandemic.dm | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index c8f2e99703c..90865d9e3e7 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -67,7 +67,7 @@ return TRUE /obj/machinery/recycler/wrench_act(mob/user, obj/item/I) - if(default_unfasten_wrench(user, I)) + if(default_unfasten_wrench(user, I, time = 6 SECONDS)) return TRUE diff --git a/code/game/objects/items/decorations.dm b/code/game/objects/items/decorations.dm index e5949ec5b7f..a410d0e59f0 100644 --- a/code/game/objects/items/decorations.dm +++ b/code/game/objects/items/decorations.dm @@ -226,7 +226,7 @@ add_fingerprint(user) if(!I.tool_use_check(user, 0)) return - default_unfasten_wrench(user, I, 0) + default_unfasten_wrench(user, I) /obj/structure/decorative_structures/metal flags = CONDUCT diff --git a/code/modules/arcade/prize_counter.dm b/code/modules/arcade/prize_counter.dm index 506bb5fef4c..fd24b03d9e9 100644 --- a/code/modules/arcade/prize_counter.dm +++ b/code/modules/arcade/prize_counter.dm @@ -41,7 +41,7 @@ return if(panel_open) if(istype(O, /obj/item/wrench)) - default_unfasten_wrench(user, O) + default_unfasten_wrench(user, O, time = 6 SECONDS) if(component_parts && istype(O, /obj/item/crowbar)) if(tickets) //save the tickets! print_tickets() diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 568e53f691f..97fcc57c265 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -100,7 +100,7 @@ if(exchange_parts(user, P)) return - if(default_unfasten_wrench(user, P)) + if(default_unfasten_wrench(user, P, time = 4 SECONDS)) return if(default_deconstruction_crowbar(user, P)) diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index 50aa9149a37..1d85ab1facf 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -52,7 +52,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) if(exchange_parts(user, O)) return - if(default_unfasten_wrench(user, O)) + if(default_unfasten_wrench(user, O, time = 4 SECONDS)) power_change() return diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 83c2783ddb2..5abc6b962ae 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -171,7 +171,7 @@ if(exchange_parts(user, O)) return - if(default_unfasten_wrench(user, O)) + if(default_unfasten_wrench(user, O, time = 4 SECONDS)) return default_deconstruction_crowbar(user, O) diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 6bd4cbc4b7c..2663c975b87 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -159,7 +159,7 @@ update_icon(UPDATE_OVERLAYS) /obj/machinery/smartfridge/wrench_act(mob/living/user, obj/item/I) - . = default_unfasten_wrench(user, I) + . = default_unfasten_wrench(user, I, time = 4 SECONDS) if(.) power_change() diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index d3933090f73..5cbee6a3192 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -79,7 +79,7 @@ return if(exchange_parts(user, O)) return - if(default_unfasten_wrench(user, O)) + if(default_unfasten_wrench(user, O, time = 4 SECONDS)) return if(default_deconstruction_crowbar(user, O)) return diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 0f1940f03f7..1502f88dd14 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -297,7 +297,7 @@ /obj/machinery/chem_dispenser/wrench_act(mob/user, obj/item/I) . = TRUE - if(!I.use_tool(src, user, 0, volume = I.tool_volume)) + if(!I.use_tool(src, user, 4 SECONDS, volume = I.tool_volume)) return if(anchored) anchored = FALSE diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 9a46cfec5ad..9bd1059e321 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -143,7 +143,7 @@ /obj/machinery/chem_master/wrench_act(mob/user, obj/item/I) if(panel_open) return - if(default_unfasten_wrench(user, I)) + if(default_unfasten_wrench(user, I, time = 4 SECONDS)) power_change() return TRUE diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index aa6d8f2ac10..4b3597b347d 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -321,7 +321,7 @@ /obj/machinery/computer/pandemic/attackby(obj/item/I, mob/user, params) - if(default_unfasten_wrench(user, I)) + if(default_unfasten_wrench(user, I, time = 4 SECONDS)) power_change() return if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER))