cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 12:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #247 from TheDZD/minor-fixes

Browse Source 
Cyborg Cell Recharging Fix
This commit is contained in:
Fox-McCloud
2015-02-01 14:55:55 -05:00
parent e2525ec361 16fafcdf5f
commit 6e7ac1ec5e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/projectiles/guns/energy/special.dm
View File

@@ -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

5
code/modules/projectiles/guns/energy/stun.dm
View File

@@ -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