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

Update the rest of the Atmos stuff

Browse Source
This commit is contained in:
Bjorn Neergaard
2015-11-27 23:17:15 -05:00
parent 2feedfa009
commit 404642b25b
9 changed files with 76 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+3 -7
View File
@@ -100,14 +100,14 @@ Passive gate is similar to the regular pump except:
/obj/machinery/atmospherics/components/binary/passive_gate/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
ui = new(user, src, ui_key, "atmos_gas_pump.tmpl", name, 400, 120)
ui = new(user, src, ui_key, "atmos_pump.tmpl", name, 400, 100)
ui.open()
/obj/machinery/atmospherics/components/binary/passive_gate/get_ui_data()
var/data = list()
data["on"] = on
data["set_pressure"] = round(target_pressure*100)
data["max_pressure"] = MAX_OUTPUT_PRESSURE
data["set_pressure"] = round(target_pressure)
data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
return data
/obj/machinery/atmospherics/components/binary/passive_gate/atmosinit()
@@ -152,10 +152,6 @@ Passive gate is similar to the regular pump except:
/obj/machinery/atmospherics/components/binary/passive_gate/Topic(href, href_list)
if(..()) return
if(!src.allowed(usr))
usr << "<span class='danger'>Access denied.</span>"
return
if(href_list["power"])
on = !on
investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
code/ATMOSPHERICS/components/binary_devices/pump.dm
+3 -4
View File
@@ -108,14 +108,14 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
ui = new(user, src, ui_key, "atmos_gas_pump.tmpl", name, 400, 120)
ui = new(user, src, ui_key, "atmos_pump.tmpl", name, 400, 100)
ui.open()
/obj/machinery/atmospherics/components/binary/pump/get_ui_data()
var/data = list()
data["on"] = on
data["set_pressure"] = round(target_pressure*100)
data["max_pressure"] = MAX_OUTPUT_PRESSURE
data["set_pressure"] = round(target_pressure)
data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
return data
/obj/machinery/atmospherics/components/binary/pump/atmosinit()
@@ -158,7 +158,6 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/pump/Topic(href,href_list)
if(..()) return
if(href_list["power"])
on = !on
investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+3 -7
View File
@@ -104,14 +104,14 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
ui = new(user, src, ui_key, "atmos_gas_pump.tmpl", name, 400, 120)
ui = new(user, src, ui_key, "atmos_pump.tmpl", name, 400, 100)
ui.open()
/obj/machinery/atmospherics/components/binary/volume_pump/get_ui_data()
var/data = list()
data["on"] = on
data["transfer_rate"] = round(transfer_rate*100)
data["max_rate"] = MAX_TRANSFER_RATE
data["transfer_rate"] = round(transfer_rate)
data["max_rate"] = round(MAX_TRANSFER_RATE)
return data
/obj/machinery/atmospherics/components/binary/volume_pump/atmosinit()
@@ -154,10 +154,6 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/volume_pump/Topic(href,href_list)
if(..()) return
if(!src.allowed(usr))
usr << "<span class='danger'>Access denied.</span>"
return
if(href_list["power"])
on = !on
investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
code/ATMOSPHERICS/components/trinary_devices/filter.dm
+3 -7
View File
@@ -170,23 +170,19 @@ Filter types:
/obj/machinery/atmospherics/components/trinary/filter/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
ui = new(user, src, ui_key, "atmos_gas_pump.tmpl", name, 400, 320)
ui = new(user, src, ui_key, "atmos_filter.tmpl", name, 400, 120)
ui.open()
/obj/machinery/atmospherics/components/trinary/filter/get_ui_data()
var/data = list()
data["on"] = on
data["set_pressure"] = round(target_pressure*100)
data["max_pressure"] = MAX_OUTPUT_PRESSURE
data["set_pressure"] = round(target_pressure)
data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
data["filter_type"] = filter_type
return data
/obj/machinery/atmospherics/components/trinary/filter/Topic(href, href_list)
if(..()) return
if(!src.allowed(usr))
usr << "<span class='danger'>Access denied.</span>"
return
if(href_list["filterset"])
src.filter_type = text2num(href_list["filterset"])
var/filtering_name = "nothing"
code/ATMOSPHERICS/components/trinary_devices/mixer.dm
+3 -3
View File
@@ -133,14 +133,14 @@
/obj/machinery/atmospherics/components/trinary/mixer/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
if (!ui)
ui = new(user, src, ui_key, "atmos_gas_pump.tmpl", name, 400, 320)
ui = new(user, src, ui_key, "atmos_mixer.tmpl", name, 400, 140)
ui.open()
/obj/machinery/atmospherics/components/trinary/mixer/get_ui_data()
var/data = list()
data["on"] = on
data["set_pressure"] = round(target_pressure*100)
data["max_pressure"] = MAX_OUTPUT_PRESSURE
data["set_pressure"] = round(target_pressure)
data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
data["node1_concentration"] = round(node1_concentration*100)
data["node2_concentration"] = round(node2_concentration*100)
return data
nano/templates/atmos_filter.tmpl
+13 -33
View File
@@ -3,49 +3,29 @@
Power:
</div>
<div class="itemContent">
{{:helper.link(data.on? 'On' : 'Off', null, {'power' : 1})}}
{{:helper.link(data.on? 'On' : 'Off', data.on? 'power' : 'close', {'power' : 1})}}
</div>
</div>
<div class="item">
<div class="itemLabel">
Output pressure:
Output Pressure:
</div>
<div class="itemContent">
<div style="clear: both; padding-top: 4px;">
{{:helper.link('MAX', null, {'set_press' : 'max'}, null)}}
{{:helper.link('SET', null, {'set_press' : 'set'}, null)}}
<div style="float: left; width: 80px; text-align: center;">&nbsp;{{:(data.pressure_set/100)}} kPa&nbsp;</div>
</div>
{{:helper.link('Set', 'pencil', {'set_press' : 'set'})}}
{{:helper.link('Max', 'plus', {'set_press' : 'max'}, data.set_pressure == data.max_pressure ? 'disabled' : null)}}
{{:data.set_pressure}} kPa
</div>
</div>
<h4>Filter Type</h4>
<div class="item">
<div style="clear: both; padding-top: 4px;">
<div class="itemLabel">
Filter:
</div>
<div class="itemContent">
{{:helper.link('Plasma', null, {'filterset' : 0}, (data.filter_type == 0)? 'selected' : null)}}
</div>
</div>
<div class="item">
<div style="clear: both; padding-top: 4px;">
{{:helper.link('Oxygen', null, {'filterset' : 1}, (data.filter_type == 1)? 'selected' : null)}}
</div>
</div>
<div class="item">
<div style="clear: both; padding-top: 4px;">
{{:helper.link('Nitrogen', null, {'filterset' : 2}, (data.filter_type == 2)? 'selected' : null)}}
</div>
</div>
<div class="item">
<div style="clear: both; padding-top: 4px;">
{{:helper.link('Carbon Dioxide', null, {'filterset' : 3}, (data.filter_type == 3)? 'selected' : null)}}
</div>
</div>
<div class="item">
<div style="clear: both; padding-top: 4px;">
{{:helper.link('Nitrous Oxide', null, {'filterset' : 4}, (data.filter_type == 4)? 'selected' : null)}}
</div>
</div>
<div class="item">
<div style="clear: both; padding-top: 4px;">
{{:helper.link('O2', null, {'filterset' : 1}, (data.filter_type == 1)? 'selected' : null)}}
{{:helper.link('N2', null, {'filterset' : 2}, (data.filter_type == 2)? 'selected' : null)}}
{{:helper.link('CO2', null, {'filterset' : 3}, (data.filter_type == 3)? 'selected' : null)}}
{{:helper.link('N2O', null, {'filterset' : 4}, (data.filter_type == 4)? 'selected' : null)}}
{{:helper.link('Nothing', null, {'filterset' : -1}, (data.filter_type == -1)? 'selected' : null)}}
</div>
</div>
nano/templates/atmos_gas_pump.tmpl
-36
View File
@@ -1,36 +0,0 @@
<div class="item">
<div class="itemLabel">
Power:
</div>
<div class="itemContent">
{{:helper.link(data.on? 'On' : 'Off', null, {'power' : 1})}}
</div>
</div>
{{if data.max_rate}}
<div class="item">
<div class="itemLabel">
Transfer rate:
</div>
<div class="itemContent">
<div style="clear: both; padding-top: 4px;">
{{:helper.link('MAX', null, {'set_transfer_rate' : 'max'}, null)}}
{{:helper.link('SET', null, {'set_transfer_rate' : 'set'}, null)}}
<div style="float: left; width: 80px; text-align: center;">&nbsp;{{:(data.transfer_rate/100)}} L/s&nbsp;</div>
</div>
</div>
</div>
{{else}}
<div class="item">
<div class="itemLabel">
Output pressure:
</div>
<div class="itemContent">
<div style="clear: both; padding-top: 4px;">
{{:helper.link('MAX', null, {'set_press' : 'max'}, null)}}
{{:helper.link('SET', null, {'set_press' : 'set'}, null)}}
<div style="float: left; width: 80px; text-align: center;">&nbsp;{{:(data.set_pressure/100)}} kPa&nbsp;</div>
</div>
</div>
</div>
{{/if}}
nano/templates/atmos_mixer.tmpl
+17 -26
View File
@@ -3,49 +3,40 @@
Power:
</div>
<div class="itemContent">
{{:helper.link(data.on? 'On' : 'Off', null, {'power' : 1})}}
{{:helper.link(data.on? 'On' : 'Off', data.on? 'power' : 'close', {'power' : 1})}}
</div>
</div>
<div class="item">
<div class="itemLabel">
Output pressure:
Output Pressure:
</div>
<div class="itemContent">
<div style="clear: both; padding-top: 4px;">
{{:helper.link('MAX', null, {'set_press' : 'max'}, null)}}
{{:helper.link('SET', null, {'set_press' : 'set'}, null)}}
<div style="float: left; width: 80px; text-align: center;">&nbsp;{{:(data.pressure_set/100)}} kPa&nbsp;</div>
</div>
{{:helper.link('Set', 'pencil', {'set_press' : 'set'})}}
{{:helper.link('Max', 'plus', {'set_press' : 'max'}, data.set_pressure == data.max_pressure ? 'disabled' : null)}}
{{:data.set_pressure}} kPa
</div>
</div>
<div class="item">
<div class="itemLabel">
Node 1 Concentration:
Node 1:
</div>
<div class="itemContent">
<div style="clear: both; padding-top: 4px;">
{{:helper.link('-', null, {'node1_c' : '-0.1'}, null)}}
{{:helper.link('-', null, {'node1_c' : '-0.01'}, null)}}
<div style="float: left; width: 80px; text-align: center;">&nbsp;{{:data.node1_concentration}} %&nbsp;</div>
{{:helper.link('+', null, {'node1_c' : '0.01'}, null)}}
{{:helper.link('+', null, {'node1_c' : '0.1'}, null)}}
</div>
{{:helper.link('', 'seek-start', {'node1_c' : '-0.1'}, null)}}
{{:helper.link('', 'triangle-1-w', {'node1_c' : '-0.01'}, null)}}
{{:helper.link('', 'triangle-1-e', {'node1_c' : '0.01'}, null)}}
{{:helper.link('', 'seek-end', {'node1_c' : '0.1'}, null)}}
{{:data.node1_concentration}}%
</div>
</div>
<div class="item">
<div class="itemLabel">
Node 2 Concentration:
Node 2:
</div>
<div class="itemContent">
<div style="clear: both; padding-top: 4px;">
{{:helper.link('-', null, {'node2_c' : '-0.1'}, null)}}
{{:helper.link('-', null, {'node2_c' : '-0.01'}, null)}}
<div style="float: left; width: 80px; text-align: center;">&nbsp;{{:data.node2_concentration}} %&nbsp;</div>
{{:helper.link('+', null, {'node2_c' : '0.01'}, null)}}
{{:helper.link('+', null, {'node2_c' : '0.1'}, null)}}
</div>
{{:helper.link('', 'seek-start', {'node2_c' : '-0.1'}, null)}}
{{:helper.link('', 'triangle-1-w', {'node2_c' : '-0.01'}, null)}}
{{:helper.link('', 'triangle-1-e', {'node2_c' : '0.01'}, null)}}
{{:helper.link('', 'seek-end', {'node2_c' : '0.1'}, null)}}
{{:data.node2_concentration}}%
</div>
</div>
nano/templates/atmos_pump.tmpl
+31
View File
@@ -0,0 +1,31 @@
<div class="item">
<div class="itemLabel">
Power:
</div>
<div class="itemContent">
{{:helper.link(data.on? 'On' : 'Off', data.on? 'power' : 'close', {'power' : 1})}}
</div>
</div>
{{if data.max_rate}}
<div class="item">
<div class="itemLabel">
Transfer Rate:
</div>
<div class="itemContent">
{{:helper.link('Set', 'pencil', {'set_transfer_rate' : 'set'})}}
{{:helper.link('Max', 'plus', {'set_transfer_rate' : 'max'}, data.transfer_rate == data.max_rate ? 'disabled' : null)}}
{{:data.transfer_rate}} L/s
</div>
</div>
{{else}}
<div class="item">
<div class="itemLabel">
Output Pressure:
</div>
<div class="itemContent">
{{:helper.link('Set', 'pencil', {'set_press' : 'set'})}}
{{:helper.link('Max', 'plus', {'set_press' : 'max'}, data.set_pressure == data.max_pressure ? 'disabled' : null)}}
{{:data.set_pressure}} kPa
</div>
</div>
{{/if}}