From e73c06e51c283bf93190dea2d159212adce7ec03 Mon Sep 17 00:00:00 2001 From: jack-fractal Date: Wed, 11 Sep 2013 23:33:23 -0400 Subject: [PATCH] Fixing a bug in the cyborg taser that caused it to continue draining cell-power from the cyborg even after it had finished recharging. --- code/modules/projectiles/guns/energy/stun.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 3efe6ee88b4..ffa49d8122d 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -33,14 +33,16 @@ charge_tick++ if(charge_tick < recharge_time) return 0 charge_tick = 0 - + if(!power_supply) return 0 //sanity + if(power_supply.charge >= power_supply.maxcharge) return 0 // check if we actually need to recharge + if(isrobot(src.loc)) var/mob/living/silicon/robot/R = src.loc if(R && R.cell) R.cell.use(charge_cost) //Take power from the borg... power_supply.give(charge_cost) //... to recharge the shot - + update_icon() return 1