From b27b4b1c346e4d35e40f9d25e49d17e02d80ba0d Mon Sep 17 00:00:00 2001
From: dustylens <54123313+dustylens@users.noreply.github.com>
Date: Tue, 22 Oct 2024 05:03:37 +0000
Subject: [PATCH] Update hunter.yml (#2295)

---
 .../Maps/_NF/Shuttles/Syndicate/hunter.yml    | 273 ++++++++++--------
 1 file changed, 154 insertions(+), 119 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/Syndicate/hunter.yml b/Resources/Maps/_NF/Shuttles/Syndicate/hunter.yml
index 703758c9dcc..30c5b895420 100644
--- a/Resources/Maps/_NF/Shuttles/Syndicate/hunter.yml
+++ b/Resources/Maps/_NF/Shuttles/Syndicate/hunter.yml
@@ -154,36 +154,40 @@ entities:
       data:
         tiles:
           0,0:
-            0: 55
-            1: 64
+            0: 3
+            1: 68
           0,-1:
-            0: 32767
+            0: 13079
             1: 32768
           -1,0:
-            0: 140
-            1: 64
-          -1,-1:
-            0: 52975
-            1: 12560
+            0: 8
+            1: 68
           0,-4:
-            0: 65392
+            0: 45856
             1: 128
+          -1,-4:
+            0: 43136
+            1: 304
           0,-3:
-            0: 65535
+            0: 8189
+          -1,-3:
+            0: 3814
           0,-2:
             0: 65535
+          -1,-2:
+            0: 65262
+          -1,-1:
+            0: 34828
+            1: 12560
           1,-4:
-            1: 560
-            0: 4352
-          1,-3:
-            0: 4369
-            1: 8736
+            1: 816
           1,-2:
-            0: 4369
+            0: 4096
             1: 8194
           1,-1:
-            0: 1
             1: 13106
+          1,-3:
+            1: 8736
           -2,-4:
             1: 2176
           -2,-3:
@@ -192,13 +196,6 @@ entities:
             1: 32776
           -2,-1:
             1: 34952
-          -1,-4:
-            1: 48
-            0: 65472
-          -1,-3:
-            0: 65535
-          -1,-2:
-            0: 65535
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -216,7 +213,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -244,23 +241,13 @@ entities:
       parent: 1
     - type: DeviceList
       devices:
-      - 201
-      - 205
-      - 14
-      - 12
-      - 199
-      - 11
       - 202
-- proto: AirCanister
-  entities:
-  - uid: 3
-    components:
-    - type: Transform
-      anchored: True
-      pos: -2.5,-9.5
-      parent: 1
-    - type: Physics
-      bodyType: Static
+      - 11
+      - 199
+      - 12
+      - 14
+      - 205
+      - 201
 - proto: AirlockExternalGlass
   entities:
   - uid: 4
@@ -278,12 +265,12 @@ entities:
   - uid: 6
     components:
     - type: Transform
-      pos: -0.5,-14.5
+      pos: 1.5,-14.5
       parent: 1
   - uid: 7
     components:
     - type: Transform
-      pos: 1.5,-14.5
+      pos: -0.5,-14.5
       parent: 1
 - proto: AirlockSyndicate
   entities:
@@ -312,11 +299,17 @@ entities:
     - type: Transform
       pos: 0.5,-12.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 2
   - uid: 12
     components:
     - type: Transform
       pos: 0.5,-9.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 2
   - uid: 13
     components:
     - type: Transform
@@ -327,6 +320,9 @@ entities:
     - type: Transform
       pos: 0.5,-0.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 2
 - proto: APCBasic
   entities:
   - uid: 15
@@ -340,31 +336,29 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,-1.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 17
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: 1.5707963267948966 rad
       pos: 4.5,-4.5
       parent: 1
   - uid: 18
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
       pos: -3.5,-4.5
       parent: 1
   - uid: 19
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-14.5
+      pos: 1.5,-14.5
       parent: 1
   - uid: 20
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-14.5
+      pos: -0.5,-14.5
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
@@ -555,43 +549,28 @@ entities:
     - type: Transform
       pos: -0.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 254
   - uid: 22
     components:
     - type: Transform
       pos: 0.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 254
   - uid: 23
     components:
     - type: Transform
       pos: 1.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 254
   - uid: 166
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -1.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 254
   - uid: 355
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 254
 - proto: CableApcExtension
   entities:
   - uid: 24
@@ -819,6 +798,16 @@ entities:
     - type: Transform
       pos: 2.5,0.5
       parent: 1
+  - uid: 364
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 2.5,-10.5
+      parent: 1
 - proto: CableHV
   entities:
   - uid: 87
@@ -1104,11 +1093,6 @@ entities:
     - type: Transform
       pos: -0.5,-10.5
       parent: 1
-  - uid: 140
-    components:
-    - type: Transform
-      pos: -1.5,-10.5
-      parent: 1
   - uid: 141
     components:
     - type: Transform
@@ -1130,6 +1114,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-10.5
       parent: 1
+  - uid: 363
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-9.5
+      parent: 1
 - proto: ChairOfficeDark
   entities:
   - uid: 145
@@ -1194,13 +1184,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-1.5
       parent: 1
-- proto: CratePlasma
-  entities:
-  - uid: 251
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 1
 - proto: DefibrillatorCabinetFilled
   entities:
   - uid: 150
@@ -1267,6 +1250,19 @@ entities:
       parent: 1
     - type: Fixtures
       fixtures: {}
+- proto: GasMixerOnFlipped
+  entities:
+  - uid: 140
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-10.5
+      parent: 1
+    - type: GasMixer
+      inletTwoConcentration: 0.79
+      inletOneConcentration: 0.21
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
   - uid: 351
@@ -1277,22 +1273,25 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-- proto: GasPipeFourway
+- proto: GasPipeBend
   entities:
-  - uid: 172
+  - uid: 3
     components:
     - type: Transform
-      pos: 1.5,-4.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-10.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 183
+      color: '#0055CCFF'
+- proto: GasPipeFourway
+  entities:
+  - uid: 172
     components:
     - type: Transform
-      pos: -0.5,-9.5
+      pos: 1.5,-4.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
 - proto: GasPipeStraight
   entities:
   - uid: 171
@@ -1364,14 +1363,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 184
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-10.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 186
     components:
     - type: Transform
@@ -1452,6 +1443,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 183
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 190
     components:
     - type: Transform
@@ -1460,24 +1459,26 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-- proto: GasPort
-  entities:
-  - uid: 196
+  - uid: 197
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-10.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-- proto: GasPressurePump
+      color: '#0055CCFF'
+- proto: GasPort
   entities:
-  - uid: 197
+  - uid: 184
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: -1.5,-9.5
       parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentPump
@@ -1504,6 +1505,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-12.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 201
@@ -1511,6 +1515,9 @@ entities:
     - type: Transform
       pos: -0.5,-1.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -1537,6 +1544,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,-12.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 2
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 205
@@ -1544,6 +1554,9 @@ entities:
     - type: Transform
       pos: 1.5,-1.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 2
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GeneratorWallmountAPU
@@ -1631,6 +1644,34 @@ entities:
     - type: Transform
       pos: -2.5,-7.5
       parent: 1
+- proto: LockerWallMaterialsFuelPlasmaFilled
+  entities:
+  - uid: 362
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-12.5
+      parent: 1
+- proto: NitrogenCanister
+  entities:
+  - uid: 361
+    components:
+    - type: Transform
+      anchored: True
+      pos: -1.5,-9.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
+  entities:
+  - uid: 251
+    components:
+    - type: Transform
+      anchored: True
+      pos: -2.5,-9.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
 - proto: PaperCaptainsThoughts
   entities:
   - uid: 158
@@ -1652,10 +1693,6 @@ entities:
     - type: Transform
       pos: 3.5,-12.5
       parent: 1
-    - type: FuelGenerator
-      on: False
-    - type: Physics
-      bodyType: Static
 - proto: PoweredlightColoredRed
   entities:
   - uid: 221
@@ -1937,8 +1974,6 @@ entities:
     - type: Transform
       pos: 1.5,-11.5
       parent: 1
-    - type: Physics
-      canCollide: False
 - proto: SyndicateWhistle
   entities:
   - uid: 200
@@ -1992,24 +2027,24 @@ entities:
   - uid: 264
     components:
     - type: Transform
-      pos: -2.5,-0.5
+      pos: 3.5,-0.5
       parent: 1
   - uid: 265
     components:
     - type: Transform
-      pos: 3.5,-0.5
+      pos: -2.5,-0.5
       parent: 1
   - uid: 266
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 4.5,-14.5
+      pos: 3.5,-14.5
       parent: 1
   - uid: 267
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 3.5,-14.5
+      pos: 4.5,-14.5
       parent: 1
   - uid: 268
     components:
@@ -2026,26 +2061,26 @@ entities:
   - uid: 270
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-8.5
       parent: 1
   - uid: 271
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-9.5
       parent: 1
   - uid: 272
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-8.5
       parent: 1
   - uid: 273
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-9.5
       parent: 1
 - proto: ToolboxSyndicateFilled
   entities: