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

Merge pull request #6036 from mwerezak/power-net

Browse Source 
Fixes laptop power draw, improves cell chargers
This commit is contained in:
Zuhayr
2014-08-18 21:04:02 +09:30
parent 83787d5c06 6d6413a59b
commit df6723deb0
3 changed files with 115 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/WorkInProgress/computer3/laptop.dm
View File

@@ -157,15 +157,15 @@
return
if(use_power && istype(battery) && battery.charge > 0)
if(use_power == 1)
battery.use(idle_power_usage)
battery.use(idle_power_usage*CELLRATE) //idle and active_power_usage are in WATTS. battery.use() expects CHARGE.
else
battery.use(active_power_usage)
battery.use(active_power_usage*CELLRATE)
return 1
return 0
use_power(var/amount, var/chan = -1)
if(battery && battery.charge > 0)
battery.use(amount)
battery.use(amount*CELLRATE)
power_change()
if( !battery || battery.charge <= 0 )