From 16fafcdf5f6cef9ec367df1650ecb6cc3bbf6c16 Mon Sep 17 00:00:00 2001 From: DZD Date: Sun, 1 Feb 2015 10:37:35 -0500 Subject: [PATCH] Cyborg Cell Recharging Fix - Fix for syndicate borg LMG and security borg draining extra charge while in the hotbar, despite being fully charged. --- code/modules/projectiles/guns/energy/special.dm | 5 ++++- code/modules/projectiles/guns/energy/stun.dm | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 558745deac3..40b8c6d022c 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -286,8 +286,11 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. ..() /obj/item/weapon/gun/energy/printer/process() + if(power_supply.charge == power_supply.maxcharge) + return 0 charge_tick++ - if(charge_tick < recharge_time) return 0 + if(charge_tick < recharge_time) + return 0 charge_tick = 0 if(!power_supply) return 0 //sanity diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index ce9e12a51f8..cf3ba6028d6 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -28,8 +28,11 @@ ..() /obj/item/weapon/gun/energy/taser/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg + if(power_supply.charge == power_supply.maxcharge) + return 0 charge_tick++ - if(charge_tick < recharge_time) return 0 + if(charge_tick < recharge_time) + return 0 charge_tick = 0 if(!power_supply) return 0 //sanity