cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 21:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into nanoui-is-dead

Browse Source
This commit is contained in:
AffectedArc07
2020-11-26 09:34:14 +00:00
committed by GitHub
parent afa8d97288 e859088889
commit 44012814d0
70 changed files with 719 additions and 1906 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/tgui/modules/power_monitor.dm
+9 -5
View File
@@ -29,14 +29,18 @@
data["select_monitor"] = TRUE
data["powermonitors"] = GLOB.powermonitor_repository.powermonitor_data()
if(powermonitor && !isnull(powermonitor.powernet))
if(powermonitor)
if(select_monitor && (powermonitor.stat & (NOPOWER|BROKEN)))
powermonitor = null
return
data["poweravail"] = DisplayPower(powermonitor.powernet.viewavail)
data["powerdemand"] = DisplayPower(powermonitor.powernet.viewload)
data["history"] = powermonitor.history
data["apcs"] = GLOB.apc_repository.apc_data(powermonitor.powernet)
if(powermonitor.powernet)
data["poweravail"] = DisplayPower(powermonitor.powernet.viewavail)
data["powerdemand"] = DisplayPower(powermonitor.powernet.viewload)
data["history"] = powermonitor.history
data["apcs"] = GLOB.apc_repository.apc_data(powermonitor.powernet)
data["no_powernet"] = FALSE
else
data["no_powernet"] = TRUE
return data