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
code/modules/modular_computers/file_system/programs/powermonitor.dm
+3 -3
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,
code/modules/power/antimatter/control.dm
+1 -1
View File
@@ -306,7 +306,7 @@
dat += "Cores: [linked_cores.len]<BR><BR>"
dat += "-Current Efficiency: [reported_core_efficiency]<BR>"
dat += "-Average Stability: [stored_core_stability] <A href='?src=\ref[src];refreshstability=1'>(update)</A><BR>"
dat += "Last Produced: [stored_power]<BR>"
dat += "Last Produced: [DisplayPower(stored_power)]<BR>"
dat += "Fuel: "
if(!fueljar)
code/modules/power/apc.dm
+4 -4
View File
@@ -665,7 +665,7 @@
"powerCellStatus" = cell ? cell.percent() : null,
"chargeMode" = chargemode,
"chargingStatus" = charging,
"totalLoad" = lastused_total,
"totalLoad" = DisplayPower(lastused_total),
"coverLocked" = coverlocked,
"siliconUser" = user.has_unlimited_silicon_privilege || user.using_power_flow_console(),
"malfStatus" = get_malf_status(user),
@@ -673,7 +673,7 @@
"powerChannels" = list(
list(
"title" = "Equipment",
"powerLoad" = lastused_equip,
"powerLoad" = DisplayPower(lastused_equip),
"status" = equipment,
"topicParams" = list(
"auto" = list("eqp" = 3),
@@ -683,7 +683,7 @@
),
list(
"title" = "Lighting",
"powerLoad" = lastused_light,
"powerLoad" = DisplayPower(lastused_light),
"status" = lighting,
"topicParams" = list(
"auto" = list("lgt" = 3),
@@ -693,7 +693,7 @@
),
list(
"title" = "Environment",
"powerLoad" = lastused_environ,
"powerLoad" = DisplayPower(lastused_environ),
"status" = environ,
"topicParams" = list(
"auto" = list("env" = 3),
code/modules/power/cable.dm
+1 -1
View File
@@ -143,7 +143,7 @@ By design, d1 is the smallest direction and d2 is the highest
else if(istype(W, /obj/item/device/multitool))
if(powernet && (powernet.avail > 0)) // is it powered?
to_chat(user, "<span class='danger'>[powernet.avail]W in power network.</span>")
to_chat(user, "<span class='danger'>[DisplayPower(powernet.avail)] in power network.</span>")
else
to_chat(user, "<span class='danger'>The cable is not powered.</span>")
shock(user, 5, 0.2)
code/modules/power/generator.dm
+6 -12
View File
@@ -55,7 +55,7 @@
stat |= BROKEN
update_icon()
/obj/machinery/power/generator/Destroy()
SSair.atmos_machinery -= src
return ..()
@@ -126,7 +126,7 @@
if(cold_air)
var/datum/gas_mixture/cold_circ_air1 = cold_circ.AIR1
cold_circ_air1.merge(cold_air)
update_icon()
var/circ = "[cold_circ && cold_circ.last_pressure_delta > 0 ? "1" : "0"][hot_circ && hot_circ.last_pressure_delta > 0 ? "1" : "0"]"
@@ -135,7 +135,7 @@
update_icon()
src.updateDialog()
/obj/machinery/power/generator/process()
//Setting this number higher just makes the change in power output slower, it doesnt actualy reduce power output cause **math**
var/power_output = round(lastgen / 10)
@@ -161,15 +161,9 @@
var/datum/gas_mixture/hot_circ_air2 = hot_circ.AIR2
t += "<div class='statusDisplay'>"
var/displaygen = lastgenlev
if(displaygen < 1000000) //less than a MW
displaygen /= 1000
t += "Output: [round(displaygen,0.01)] kW"
else
displaygen /= 1000000
t += "Output: [round(displaygen,0.01)] MW"
t += "Output: [DisplayPower(lastgenlev)]"
t += "<BR>"
t += "<B><font color='blue'>Cold loop</font></B><BR>"
code/modules/power/monitor.dm
+3 -3
View File
@@ -66,8 +66,8 @@
data["areas"] = list()
if(attached)
data["supply"] = attached.powernet.viewavail
data["demand"] = attached.powernet.viewload
data["supply"] = DisplayPower(attached.powernet.viewavail)
data["demand"] = DisplayPower(attached.powernet.viewload)
for(var/obj/machinery/power/terminal/term in attached.powernet.nodes)
var/obj/machinery/power/apc/A = term.master
if(istype(A))
@@ -79,7 +79,7 @@
data["areas"] += list(list(
"name" = A.area.name,
"charge" = cell_charge,
"load" = A.lastused_total,
"load" = DisplayPower(A.lastused_total),
"charging" = A.charging,
"eqp" = A.equipment,
"lgt" = A.lighting,
code/modules/power/port_gen.dm
+1 -1
View File
@@ -230,7 +230,7 @@
var/stack_percent = round(sheet_left * 100, 1)
dat += text("Current stack: [stack_percent]% <br>")
dat += text("Power output: <A href='?src=\ref[src];action=lower_power'>-</A> [power_gen * power_output] <A href='?src=\ref[src];action=higher_power'>+</A><br>")
dat += text("Power current: [(powernet == null ? "Unconnected" : "[avail()]")]<br>")
dat += text("Power current: [(powernet == null ? "Unconnected" : "[DisplayPower(avail())]")]<br>")
dat += text("Heat: [current_heat]<br>")
dat += "<br><A href='?src=\ref[src];action=close'>Close</A>"
user << browse(dat, "window=port_gen")
code/modules/power/smes.dm
+4 -2
View File
@@ -335,14 +335,16 @@
"inputAttempt" = input_attempt,
"inputting" = inputting,
"inputLevel" = input_level,
"inputLevel_text" = DisplayPower(input_level),
"inputLevelMax" = input_level_max,
"inputAvailable" = input_available,
"inputAvailable" = DisplayPower(input_available),
"outputAttempt" = output_attempt,
"outputting" = outputting,
"outputLevel" = output_level,
"outputLevel_text" = DisplayPower(output_level),
"outputLevelMax" = output_level_max,
"outputUsed" = output_used
"outputUsed" = DisplayPower(output_used)
)
return data
code/modules/power/turbine.dm
+2 -2
View File
@@ -272,7 +272,7 @@
var/t = "<TT><B>Gas Turbine Generator</B><HR><PRE>"
t += "Generated power : [round(lastgen)] W<BR><BR>"
t += "Generated power : [DisplayPower(lastgen)]<BR><BR>"
t += "Turbine: [round(compressor.rpm)] RPM<BR>"
@@ -337,7 +337,7 @@
dat += {"Turbine status: [ src.compressor.starter ? "<A href='?src=\ref[src];str=1'>Off</A> <B>On</B>" : "<B>Off</B> <A href='?src=\ref[src];str=1'>On</A>"]
\n<BR>
\nTurbine speed: [src.compressor.rpm]rpm<BR>
\nPower currently being generated: [src.compressor.turbine.lastgen]W<BR>
\nPower currently being generated: [DisplayPower(src.compressor.turbine.lastgen)]<BR>
\nInternal gas temperature: [src.compressor.gas_contained.temperature]K<BR>
\n</PRE><HR><A href='?src=\ref[src];close=1'>Close</A>
\n<BR>