Conflict fix

tgui/src/interfaces/atmos_relief.ract

@@ -0,0 +1,12 @@
+<ui-display>
+	<ui-section label='Open Pressure'>
+		<ui-button icon='pencil' action='open_pressure' params='{"open_pressure": "input"}'>Set</ui-button>
+		<ui-button icon='plus' state='{{data.open_pressure == data.max_pressure ? "disabled" : null}}' action='open_pressure' params='{"open_pressure": "max"}'>Max</ui-button>
+		<span>{{Math.round(adata.open_pressure)}} kPa</span>
+	</ui-section>
+	<ui-section label='Close Pressure'>
+		<ui-button icon='pencil' action='close_pressure' params='{"close_pressure": "input"}'>Set</ui-button>
+		<ui-button icon='plus' state='{{data.close_pressure == data.open_pressure ? "disabled" : null}}' action='close_pressure' params='{"close_pressure": "max"}'>Max</ui-button>
+		<span>{{Math.round(adata.close_pressure)}} kPa</span>
+	</ui-section>
+</ui-display>

tgui/src/interfaces/nanite_comm_remote.ract

@@ -0,0 +1,41 @@
+<ui-display title='Nanite Control'>
+{{#if data.locked}}
+  <ui-notice>The interface is locked.</ui-notice>
+{{else}}
+  <ui-button icon='lock' action='lock'>Lock Interface</ui-button>
+  <ui-button icon='save' action='comm_save'>Save Current Setting</ui-button>
+  <ui-section label='Comm Code'>
+    <span>{{data.comm_code}}</span>
+  	<ui-button icon='pencil' action='set_comm_code'>Set</ui-button>
+  </ui-section>
+  <ui-section label='Message'>
+    {{data.comm_message}}
+    <br>
+  	<ui-button icon='pencil' action='set_message'>Set</ui-button>
+  </ui-section>
+  {{#if data.mode == "Relay"}}
+    <ui-section label='Relay Code'>
+      <span>{{data.relay_code}}</span>
+    <ui-button icon='pencil' action='set_relay_code'>Set</ui-button>
+    </ui-section>
+  {{/if}}
+  <ui-section label='Signal Mode'>
+    <span>{{data.mode}}</span>
+    <br>
+  	<ui-button action='select_mode' params='{"mode": "Off"}'>Off</ui-button>
+    <ui-button action='select_mode' params='{"mode": "Local"}'>Local</ui-button>
+    <ui-button action='select_mode' params='{"mode": "Targeted"}'>Targeted</ui-button>
+    <ui-button action='select_mode' params='{"mode": "Area"}'>Area</ui-button>
+    <ui-button action='select_mode' params='{"mode": "Relay"}'>Relay</ui-button>
+  </ui-section>
+{{/if}}
+</ui-display>
+<ui-display title='Saved Settings'>
+	{{#each data.saved_settings}}
+		<ui-button icon='load' action='comm_load' params='{"save_id": "{{id}}"}'>{{name}}</ui-button>
+		{{#if !data.locked}}
+			<ui-button icon='remove' action='remove_save' params='{"save_id": "{{id}}"}'>Remove</ui-button>
+		{{/if}}
+		<br>
+	{{/each}}
+</ui-display>