Merge pull request #321 from new-frontiers-14/master

up
Corvax-Frontier · Jun 18, 2024 · 4c17cb4 · 4c17cb4
2 parents 8e9cc3b + dbd0284
commit 4c17cb4
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 11 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -5127,3 +5127,11 @@ Entries:
       message: Updated Frontier Outpost.
   id: 5045
   time: '2024-06-16T23:24:16.0000000+00:00'
+- author: Actualcatmoment
+  changes:
+    - type: Fix
+      message: >-
+        connected air vent and scrubber to the rear air alarm in the
+        searchlight.
+  id: 5046
+  time: '2024-06-18T01:10:11.0000000+00:00'
diff --git a/Resources/Maps/_NF/Shuttles/searchlight.yml b/Resources/Maps/_NF/Shuttles/searchlight.yml
@@ -257,39 +257,39 @@ entities:
             0: 275
           0,-1:
             0: 13079
-            2: 2048
+            1: 2048
           -1,0:
             0: 8
           0,1:
-            1: 16
+            2: 16
           1,0:
-            2: 13107
+            1: 13107
           1,-1:
-            2: 14080
+            1: 14080
             0: 3
           1,1:
-            2: 4371
+            1: 4371
           -1,-3:
             0: 60552
-            2: 2
+            1: 2
           -1,-2:
             0: 52974
           -1,-1:
-            2: 1
+            1: 1
             0: 34828
           -1,-4:
             0: 32768
           0,-3:
             0: 29475
-            2: 8
+            1: 8
             3: 34816
           0,-2:
             0: 32755
           0,-4:
             0: 8192
           1,-3:
             3: 4096
-            2: 16384
+            1: 16384
           1,-2:
             0: 13104
         uniqueMixes:
@@ -309,7 +309,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -324,7 +324,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          immutable: True
+          temperature: 293.15
           moles:
           - 0
           - 0
@@ -376,6 +376,10 @@ entities:
       - 279
       - 272
       - 271
+      - 325
+      - 236
+      - 180
+      - 219
     - type: AccessReader
       enabled: False
     - type: Emagged
@@ -1484,6 +1488,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-0.5
       parent: 1
+    - type: DeviceNetwork
+      configurators:
+      - invalid
     - type: AtmosPipeColor
       color: '#0000CCFF'
   - uid: 325
@@ -1492,6 +1499,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-8.5
       parent: 1
+    - type: DeviceNetwork
+      configurators:
+      - invalid
+      deviceLists:
+      - 270
     - type: AtmosPipeColor
       color: '#0000CCFF'
 - proto: GasVentScrubber
@@ -1502,6 +1514,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,-3.5
       parent: 1
+    - type: DeviceNetwork
+      configurators:
+      - invalid
+      deviceLists:
+      - 270
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 219
@@ -1510,6 +1527,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,-4.5
       parent: 1
+    - type: DeviceNetwork
+      configurators:
+      - invalid
+      deviceLists:
+      - 270
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 236
@@ -1518,13 +1540,21 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,-8.5
       parent: 1
+    - type: DeviceNetwork
+      configurators:
+      - invalid
+      deviceLists:
+      - 270
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 243
     components:
     - type: Transform
       pos: 1.5,-0.5
       parent: 1
+    - type: DeviceNetwork
+      configurators:
+      - invalid
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 261