From 220d034cf553bef5510cce43060735e4b385ef90 Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Mon, 16 Mar 2026 22:10:21 +0100 Subject: [PATCH] Energy Net Attack Cooldown Fix (#22050) fixes attacking energy nets with a weapon having no cooldown. fixes #22028. --- code/game/objects/items/weapons/weaponry.dm | 1 + html/changelogs/SleepyGemmy-energy_net_cooldown.yml | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 html/changelogs/SleepyGemmy-energy_net_cooldown.yml diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index b0092c5912f..bc241ec83ea 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -108,6 +108,7 @@ health_check() /obj/effect/energy_net/attackby(obj/item/attacking_item, mob/user) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.do_attack_animation(src, attacking_item) var/attack_force = attacking_item.force if(user == affecting) diff --git a/html/changelogs/SleepyGemmy-energy_net_cooldown.yml b/html/changelogs/SleepyGemmy-energy_net_cooldown.yml new file mode 100644 index 00000000000..52821c8c20e --- /dev/null +++ b/html/changelogs/SleepyGemmy-energy_net_cooldown.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - bugfix: "Fixed attacking energy nets with a weapon having no cooldown."