From 472a05efe9589e86f986e54f0e53ef78b7c947de Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Tue, 11 May 2021 10:29:00 +0100 Subject: [PATCH] Fixes infinite charge stunbaton and stunprod exploit (#16012) * Fixes infinite baton charge exploit * moved it to the right proc --- code/game/objects/items/weapons/stunbaton.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index f8104a2d9ea..0df5817f598 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -76,6 +76,10 @@ if(!cell) return cell.use(amount) + if(cell.rigged) + cell = null + turned_on = FALSE + update_icon() if(cell.charge < (hitcost)) // If after the deduction the baton doesn't have enough charge for a stun hit it turns off. turned_on = FALSE update_icon()