shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Standardized power displays (#2539)

Browse Source 
* Standardized power displays

* Update tgui.js

* Delete tgui.js.rej
This commit is contained in:
CitadelStationBot
2017-09-13 17:57:16 -05:00
committed by Poojawa
parent f6dfc177f5
commit 083fc1a7b4
25 changed files with 75 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/modular_computers/file_system/programs/powermonitor.dm
View File

@@ -58,8 +58,8 @@
data["interval"] = record_interval / 10
data["attached"] = attached ? TRUE : FALSE
if(attached)
data["supply"] = attached.powernet.viewavail
data["demand"] = attached.powernet.viewload
data["supply"] = DisplayPower(attached.powernet.viewavail)
data["demand"] = DisplayPower(attached.powernet.viewload)
data["history"] = history
data["areas"] = list()
@@ -70,7 +70,7 @@
data["areas"] += list(list(
"name" = A.area.name,
"charge" = A.cell ? A.cell.percent() : 0,
"load" = A.lastused_total,
"load" = DisplayPower(A.lastused_total),
"charging" = A.charging,
"eqp" = A.equipment,
"lgt" = A.lighting,