From 34cad3786b4c59e756bc35967bf26f4d07f350c8 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sat, 25 May 2019 07:35:48 +0200 Subject: [PATCH 1/5] Reduces stunprod's delay. --- code/game/objects/items/stunbaton.dm | 1 + code/modules/assembly/assembly.dm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index c0e81a7949..b6a8ab718a 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -207,6 +207,7 @@ /obj/item/melee/baton/cattleprod/Initialize() . = ..() sparkler = new (src) + sparkler.activate_cooldown = 18 /obj/item/melee/baton/cattleprod/baton_stun() if(sparkler.activate()) diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 67527b2e91..1e7a9b7c15 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -27,6 +27,7 @@ var/datum/wires/connected = null var/next_activate = 0 //When we're next allowed to activate - for spam control + var/activate_cooldown = 3 SECONDS /obj/item/assembly/get_part_rating() return 1 @@ -78,7 +79,7 @@ /obj/item/assembly/proc/activate() if(QDELETED(src) || !secured || (next_activate > world.time)) return FALSE - next_activate = world.time + 30 + next_activate = world.time + activate_cooldown return TRUE From 521c371253228b0d9b80c8ebf9f43d2103c41239 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sat, 25 May 2019 07:44:45 +0200 Subject: [PATCH 2/5] actually, let's just halve it, won't be an issue I suppose. --- code/game/objects/items/stunbaton.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index b6a8ab718a..0a5d528ad7 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -207,7 +207,7 @@ /obj/item/melee/baton/cattleprod/Initialize() . = ..() sparkler = new (src) - sparkler.activate_cooldown = 18 + sparkler.activate_cooldown = 15 /obj/item/melee/baton/cattleprod/baton_stun() if(sparkler.activate()) From 2fe1431db61ca2e344ec1fd04879105c875c85d4 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sun, 26 May 2019 03:40:48 +0200 Subject: [PATCH 3/5] Applying suggestion, ?. so no theorical runtime. --- code/game/objects/items/stunbaton.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 0a5d528ad7..d6f6bc58fd 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -202,13 +202,13 @@ hitcost = 2000 throw_hit_chance = 10 slot_flags = ITEM_SLOT_BACK - var/obj/item/assembly/igniter/sparkler = 0 + var/obj/item/assembly/igniter/sparkler /obj/item/melee/baton/cattleprod/Initialize() . = ..() sparkler = new (src) - sparkler.activate_cooldown = 15 + sparkler.activate_cooldown = 5 /obj/item/melee/baton/cattleprod/baton_stun() - if(sparkler.activate()) - ..() + sparkler.activate() + return ..() From b2eea5e3f47a3f5a7d6c046a5fb21d3702f9e422 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 26 May 2019 04:11:52 +0200 Subject: [PATCH 4/5] Sorry, web edit because I didn't commit the ?. --- code/game/objects/items/stunbaton.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index d6f6bc58fd..1a6f9ad3ab 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -210,5 +210,5 @@ sparkler.activate_cooldown = 5 /obj/item/melee/baton/cattleprod/baton_stun() - sparkler.activate() + sparkler?.activate() return ..() From 7e10b4bed9bf3d7b4d2238c51109b6a5983de34e Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 26 May 2019 22:03:38 +0200 Subject: [PATCH 5/5] Update code/game/objects/items/stunbaton.dm Co-Authored-By: deathride58 --- code/game/objects/items/stunbaton.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 1a6f9ad3ab..e55368b91c 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -211,4 +211,4 @@ /obj/item/melee/baton/cattleprod/baton_stun() sparkler?.activate() - return ..() + . = ..()