diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index dada5293e87..ce132c9a0d6 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -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 << "Access denied." - return - if(href_list["power"]) on = !on investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos") diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 802a129e069..934de8d1951 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -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") diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 299f27e0b65..64b2a778355 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -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 << "Access denied." - return - if(href_list["power"]) on = !on investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos") diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index e3c21462bcd..56af3c342d4 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -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 << "Access denied." - return - if(href_list["filterset"]) src.filter_type = text2num(href_list["filterset"]) var/filtering_name = "nothing" diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 7c468679bc5..c88a575b06e 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -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 diff --git a/nano/templates/atmos_filter.tmpl b/nano/templates/atmos_filter.tmpl index 681b06ad94a..30d2df544bf 100644 --- a/nano/templates/atmos_filter.tmpl +++ b/nano/templates/atmos_filter.tmpl @@ -3,49 +3,29 @@ Power:
- {{:helper.link(data.on? 'On' : 'Off', null, {'power' : 1})}} + {{:helper.link(data.on? 'On' : 'Off', data.on? 'power' : 'close', {'power' : 1})}}
- Output pressure: + Output Pressure:
-
- {{:helper.link('MAX', null, {'set_press' : 'max'}, null)}} - {{:helper.link('SET', null, {'set_press' : 'set'}, null)}} -
 {{:(data.pressure_set/100)}} kPa 
-
+ {{: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
-

Filter Type

-
+
+ Filter: +
+
{{:helper.link('Plasma', null, {'filterset' : 0}, (data.filter_type == 0)? 'selected' : null)}} -
-
-
-
- {{:helper.link('Oxygen', null, {'filterset' : 1}, (data.filter_type == 1)? 'selected' : null)}} -
-
-
-
- {{:helper.link('Nitrogen', null, {'filterset' : 2}, (data.filter_type == 2)? 'selected' : null)}} -
-
-
-
- {{:helper.link('Carbon Dioxide', null, {'filterset' : 3}, (data.filter_type == 3)? 'selected' : null)}} -
-
-
-
- {{:helper.link('Nitrous Oxide', null, {'filterset' : 4}, (data.filter_type == 4)? 'selected' : null)}} -
-
-
-
+ {{: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)}}
\ No newline at end of file diff --git a/nano/templates/atmos_gas_pump.tmpl b/nano/templates/atmos_gas_pump.tmpl deleted file mode 100644 index 64e8b6ef306..00000000000 --- a/nano/templates/atmos_gas_pump.tmpl +++ /dev/null @@ -1,36 +0,0 @@ -
-
- Power: -
-
- {{:helper.link(data.on? 'On' : 'Off', null, {'power' : 1})}} -
-
- -{{if data.max_rate}} -
-
- Transfer rate: -
-
-
- {{:helper.link('MAX', null, {'set_transfer_rate' : 'max'}, null)}} - {{:helper.link('SET', null, {'set_transfer_rate' : 'set'}, null)}} -
 {{:(data.transfer_rate/100)}} L/s 
-
-
-
-{{else}} -
-
- Output pressure: -
-
-
- {{:helper.link('MAX', null, {'set_press' : 'max'}, null)}} - {{:helper.link('SET', null, {'set_press' : 'set'}, null)}} -
 {{:(data.set_pressure/100)}} kPa 
-
-
-
-{{/if}} \ No newline at end of file diff --git a/nano/templates/atmos_mixer.tmpl b/nano/templates/atmos_mixer.tmpl index ceab04d4eca..0c24f2fe7de 100644 --- a/nano/templates/atmos_mixer.tmpl +++ b/nano/templates/atmos_mixer.tmpl @@ -3,49 +3,40 @@ Power:
- {{:helper.link(data.on? 'On' : 'Off', null, {'power' : 1})}} + {{:helper.link(data.on? 'On' : 'Off', data.on? 'power' : 'close', {'power' : 1})}}
-
- Output pressure: + Output Pressure:
-
- {{:helper.link('MAX', null, {'set_press' : 'max'}, null)}} - {{:helper.link('SET', null, {'set_press' : 'set'}, null)}} -
 {{:(data.pressure_set/100)}} kPa 
-
+ {{: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
-
- Node 1 Concentration: + Node 1:
-
- {{:helper.link('-', null, {'node1_c' : '-0.1'}, null)}} - {{:helper.link('-', null, {'node1_c' : '-0.01'}, null)}} -
 {{:data.node1_concentration}} % 
- {{:helper.link('+', null, {'node1_c' : '0.01'}, null)}} - {{:helper.link('+', null, {'node1_c' : '0.1'}, null)}} -
+ {{: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}}%
-
- Node 2 Concentration: + Node 2:
-
- {{:helper.link('-', null, {'node2_c' : '-0.1'}, null)}} - {{:helper.link('-', null, {'node2_c' : '-0.01'}, null)}} -
 {{:data.node2_concentration}} % 
- {{:helper.link('+', null, {'node2_c' : '0.01'}, null)}} - {{:helper.link('+', null, {'node2_c' : '0.1'}, null)}} -
+ {{: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}}%
\ No newline at end of file diff --git a/nano/templates/atmos_pump.tmpl b/nano/templates/atmos_pump.tmpl new file mode 100644 index 00000000000..25d28530149 --- /dev/null +++ b/nano/templates/atmos_pump.tmpl @@ -0,0 +1,31 @@ +
+
+ Power: +
+
+ {{:helper.link(data.on? 'On' : 'Off', data.on? 'power' : 'close', {'power' : 1})}} +
+
+{{if data.max_rate}} +
+
+ Transfer Rate: +
+
+ {{: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 +
+
+{{else}} +
+
+ Output Pressure: +
+
+ {{: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 +
+
+{{/if}} \ No newline at end of file