cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict fix.

Browse Source
This commit is contained in:
Segrain
2013-09-14 22:49:11 +03:00
parent e7fe8f3945 b779059f33
commit 35621466e1
21 changed files with 147 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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