cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 14:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates instances of if(cell.use(...))

Browse Source
This commit is contained in:
mwerezak
2015-05-14 01:52:04 -04:00
parent 929e64311e
commit aeb1f5ae68
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot.dm
+4 -2
View File
@@ -1233,8 +1233,10 @@ var/list/robot_verbs_default = list(
if(cell.charge == 0)
return 0
if(cell.use(amount * CELLRATE * CYBORG_POWER_USAGE_MULTIPLIER))
used_power_this_tick += amount * CYBORG_POWER_USAGE_MULTIPLIER
var/power_use = amount * CYBORG_POWER_USAGE_MULTIPLIER
if(cell.charge >= CELLRATE * power_use)
cell.use(CELLRATE * power_use)
used_power_this_tick += power_use
return 1
return 0
code/modules/projectiles/guns/energy.dm
+1 -1
View File
@@ -57,7 +57,7 @@
/obj/item/weapon/gun/energy/consume_next_projectile()
if(!power_supply) return null
if(!ispath(projectile_type)) return null
if(!power_supply.use(charge_cost)) return null
if(power_supply.charge < charge_cost || !power_supply.use(charge_cost)) return null
return new projectile_type(src)
/obj/item/weapon/gun/energy/proc/get_external_power_supply()