cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-10 23:54:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] _HELPERS/unsorted.dm has been sorted [MDB IGNORE] (#8627)

Browse Source 
* _HELPERS/unsorted.dm has been sorted

* Feexing conflicts

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2021-10-06 23:07:01 +02:00
committed by GitHub
parent 5a3b5a4dff
commit cc93b11d23
142 changed files with 1717 additions and 1677 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/powermonitor.dm
+3 -3
View File
@@ -80,8 +80,8 @@
data["interval"] = record_interval / 10
data["attached"] = connected_powernet ? TRUE : FALSE
if(connected_powernet)
data["supply"] = DisplayPower(connected_powernet.viewavail)
data["demand"] = DisplayPower(connected_powernet.viewload)
data["supply"] = display_power(connected_powernet.viewavail)
data["demand"] = display_power(connected_powernet.viewload)
data["history"] = history
data["areas"] = list()
@@ -92,7 +92,7 @@
data["areas"] += list(list(
"name" = A.area.name,
"charge" = A.cell ? A.cell.percent() : 0,
"load" = DisplayPower(A.lastused_total),
"load" = display_power(A.lastused_total),
"charging" = A.charging,
"eqp" = A.equipment,
"lgt" = A.lighting,
code/modules/modular_computers/file_system/programs/radar.dm
+1 -1
View File
@@ -98,7 +98,7 @@
if(get_dist_euclidian(here_turf, target_turf) > 24)
userot = TRUE
rot = round(Get_Angle(here_turf, target_turf))
rot = round(get_angle(here_turf, target_turf))
else
if(target_turf.z > here_turf.z)
pointer="caret-up"