Atmos Filter/Scrubber UI update

tgui/src/interfaces/airalarm/scrubbers.ract

@@ -1,4 +1,5 @@
 <link rel='ractive' href='./back.ract'>
+<link rel='ractive' href='../scrubbing_types.ract' name='filters'>
 
 <ui-display title='Scrubber Controls' button>
   {{#partial button}}
@@ -19,16 +20,7 @@
           action='widenet' params='{"id_tag": "{{id_tag}}", "val": {{+!widenet}}}'>{{widenet ? "Expanded" : "Normal"}}</ui-button>
       </ui-section>
       <ui-section label='Filters'>
-        <ui-button icon='{{filter_co2 ? "check-square-o" : "square-o"}}' style='{{filter_co2 ? "selected" : null}}'
-          action='co2_scrub' params='{"id_tag": "{{id_tag}}", "val": {{+!filter_co2}}}'>CO2</ui-button>
-        <ui-button icon='{{filter_n2o ? "check-square-o" : "square-o"}}' style='{{filter_n2o ? "selected" : null}}'
-          action='n2o_scrub' params='{"id_tag": "{{id_tag}}", "val": {{+!filter_n2o}}}'>N2O</ui-button>
-        <ui-button icon='{{filter_toxins ? "check-square-o" : "square-o"}}' style='{{filter_toxins ? "selected" : null}}'
-          action='tox_scrub' params='{"id_tag": "{{id_tag}}", "val": {{+!filter_toxins}}}'>Plasma</ui-button>
-		<ui-button icon='{{filter_rare ? "check-square-o" : "square-o"}}' style='{{filter_rare ? "selected" : null}}'
-		  action='rare_scrub' params='{"id_tag": "{{id_tag}}", "val": {{+!filter_rare}}}'>Rare Gases</ui-button>
-		<ui-button icon='{{filter_water_vapor ? "check-square-o" : "square-o"}}' style='{{filter_water_vapor ? "selected" : null}}'
-		  action='water_vapor_scrub' params='{"id_tag": "{{id_tag}}", "val": {{+!filter_water_vapor}}}'>Water Vapor</ui-button>
+        <filters/>
       </ui-section>
     </ui-subdisplay>
   {{else}}

tgui/src/interfaces/atmos_filter.ract

@@ -9,31 +9,9 @@
     <span>{{Math.round(adata.pressure)}} kPa</span>
   </ui-section>
   <ui-section label='Filter'>
-    <ui-button state='{{data.filter_type == "none" ? "selected" : null}}'
-      action='filter' params='{"mode": ""}'>Nothing</ui-button>
-    <ui-button state='{{data.filter_type == "plasma" ? "selected" : null}}'
-      action='filter' params='{"mode": "/datum/gas/plasma"}'>Plasma</ui-button>
-    <ui-button state='{{data.filter_type == "o2" ? "selected" : null}}'
-      action='filter' params='{"mode": "/datum/gas/oxygen"}'>O2</ui-button>
-    <ui-button state='{{data.filter_type == "n2" ? "selected" : null}}'
-      action='filter' params='{"mode": "/datum/gas/nitrogen"}'>N2</ui-button>
-    <ui-button state='{{data.filter_type == "co2" ? "selected" : null}}'
-      action='filter' params='{"mode": "/datum/gas/carbon_dioxide"}'>CO2</ui-button>
-    <ui-button state='{{data.filter_type == "n2o" ? "selected" : null}}'
-      action='filter' params='{"mode": "/datum/gas/nitrous_oxide"}'>N2O</ui-button>
-	<ui-button state='{{data.filter_type == "bz" ? "selected" : null}}'
-      action='filter' params='{"mode": "/datum/gas/bz"}'>BZ</ui-button>
-	<ui-button state='{{data.filter_type == "nob" ? "selected" : null}}'
-      action='filter' params='{"mode": "/datum/gas/hypernoblium"}'>Hyper-Noblium</ui-button>
-	<ui-button state='{{data.filter_type == "nitryl" ? "selected" : null}}'
-      action='filter' params='{"mode": "/datum/gas/nitryl"}'>Nitryl</ui-button> 
-	<ui-button state='{{data.filter_type == "tritium" ? "selected" : null}}'
-      action='filter' params='{"mode": "/datum/gas/tritium"}'>Tritium</ui-button>
-	<ui-button state='{{data.filter_type == "stimulum" ? "selected" : null}}'
-      action='filter' params='{"mode": "/datum/gas/stimulum"}'>Stimulum</ui-button>
-	<ui-button state='{{data.filter_type == "pluox" ? "selected" : null}}'
-      action='filter' params='{"mode": "/datum/gas/pluoxium"}'>Pluoxium</ui-button>
-	<ui-button state='{{data.filter_type == "water_vapor" ? "selected" : null}}'
-      action='filter' params='{"mode": "/datum/gas/water_vapor"}'>Water Vapor</ui-button>
+    {{#each data.filter_types}}
+      <ui-button state='{{selected ? "selected" : null}}'
+        action='filter' params='{"mode": {{id}}}'>{{name}}</ui-button>
+    {{/each}}
 	</ui-section>
 </ui-display>

tgui/src/interfaces/portable_scrubber.ract

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <ui-notice>
   <span>The regulator {{data.holding ? "is" : "is not"}} connected to a tank.</span>
 </ui-notice>
@@ -35,3 +36,49 @@
 		</ui-section>
 	{{/if}}
 </ui-display>
+=======
+<link rel='ractive' href='./scrubbing_types.ract' name='filters'>
+
+<ui-notice>
+  <span>The regulator {{data.holding ? "is" : "is not"}} connected to a tank.</span>
+</ui-notice>
+<ui-display title='Status' button>
+  <ui-section label='Pressure'>
+    <span>{{Math.round(adata.pressure)}} kPa</span>
+  </ui-section>
+  <ui-section label='Port'>
+    <span class='{{data.connected ? "good" : "average"}}'>{{data.connected ? "Connected" : "Not Connected"}}</span>
+  </ui-section>
+</ui-display>
+<ui-display title='Filter'>
+  <ui-section label='Power'>
+    <ui-button icon='{{data.on ? "power-off" : "close"}}'
+      style='{{data.on ? "selected" : "null"}}'
+      action='power'>{{data.on ? "On" : "Off"}}</ui-button>
+  </ui-section>
+</ui-display>
+<ui-display title='Holding Tank' button>
+  {{#partial button}}
+    {{#if data.holding}}
+      <ui-button icon='eject' style='{{data.on ? "danger" : null}}' action='eject'>Eject</ui-button>
+    {{/if}}
+  {{/partial}}
+  {{#if data.holding}}
+		<ui-section label='Label'>
+			{{data.holding.name}}
+		</ui-section>
+		<ui-section label='Pressure'>
+			{{Math.round(adata.holding.pressure)}} kPa
+		</ui-section>
+	{{else}}
+		<ui-section>
+			<span class='average'>No Holding Tank</span>
+		</ui-section>
+	{{/if}}
+</ui-display>
+<ui-display title='Filters'>
+  {{#with data}}
+    <filters/>
+  {{/with}}
+</ui-display>
+>>>>>>> 33f2f2f... Atmos Filter/Scrubber UI update (#32746)

tgui/src/interfaces/scrubbing_types.ract

@@ -0,0 +1,4 @@
+{{#each filter_types}}
+  <ui-button icon='{{enabled ? "check-square-o" : "square-o"}}' style='{{enabled ? "selected" : null}}'
+    action='toggle_filter' params='{"id_tag": "{{id_tag}}", "val": {{gas_id}}}'>{{gas_name}}</ui-button>
+{{/each}}