From f811603c85c056c5984a28c75b9e44d0133abcd7 Mon Sep 17 00:00:00 2001 From: JMoldy Date: Fri, 3 Jan 2020 02:31:10 -0800 Subject: [PATCH] Fixes wand recharge Self-charging wands were able to hold one extra charge by allowing the recharge counter to increase indefinitely when the number of charges reached the maximum number of charges. --- code/modules/projectiles/guns/magic.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index e027914545d..a110c9800b5 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -63,8 +63,11 @@ /obj/item/gun/magic/process() + if (charges >= max_charges) + charge_tick = 0 + return charge_tick++ - if(charge_tick < recharge_rate || charges >= max_charges) + if(charge_tick < recharge_rate) return 0 charge_tick = 0 charges++