cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/game/objects/items/weapons/power_cells.dm
This commit is contained in:
PsiOmega
2015-05-22 08:26:13 +02:00
parent a677ec3b83 3377f8bbf1
commit e74c0e65bf
12 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -1081,8 +1081,9 @@
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.checked_use(CELLRATE * power_use))
used_power_this_tick += power_use
return 1
return 0