From 9816667d48347e8ae591c2e735e9ef83a35b5dc0 Mon Sep 17 00:00:00 2001
From: PeccNeck <74548962+PeccNeck@users.noreply.github.com>
Date: Tue, 10 Sep 2024 08:50:25 -0400
Subject: [PATCH 1/4] fix old piping + directional fans

---
 Resources/Maps/_NF/Shuttles/vagabond.yml | 269 +++++------------------
 1 file changed, 59 insertions(+), 210 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/vagabond.yml b/Resources/Maps/_NF/Shuttles/vagabond.yml
index 5ebfda826cd..b4c66b04919 100644
--- a/Resources/Maps/_NF/Shuttles/vagabond.yml
+++ b/Resources/Maps/_NF/Shuttles/vagabond.yml
@@ -687,8 +687,6 @@ entities:
       - 460
       - 616
       - 431
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 569
     components:
     - type: MetaData
@@ -699,8 +697,6 @@ entities:
       parent: 1
     - type: DeviceList
       devices:
-      - 619
-      - 625
       - 233
       - 92
       - 600
@@ -714,8 +710,8 @@ entities:
       - 771
       - 772
       - 773
-    - type: AtmosDevice
-      joinedGrid: 1
+      - 665
+      - 666
   - uid: 570
     components:
     - type: MetaData
@@ -732,8 +728,6 @@ entities:
       - 611
       - 612
       - 613
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 590
     components:
     - type: MetaData
@@ -753,8 +747,6 @@ entities:
       - 463
       - 241
       - 770
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 775
     components:
     - type: MetaData
@@ -774,8 +766,6 @@ entities:
       - 771
       - 772
       - 773
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: Airlock
   entities:
   - uid: 606
@@ -925,8 +915,6 @@ entities:
       parent: 1
     - type: Apc
       hasAccess: True
-      lastExternalState: Good
-      lastChargeState: Full
   - uid: 164
     components:
     - type: MetaData
@@ -949,80 +937,72 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,6.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 180
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-7.5
-      parent: 1
-  - uid: 188
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-12.5
-      parent: 1
   - uid: 189
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-1.5
       parent: 1
   - uid: 190
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-0.5
       parent: 1
   - uid: 191
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,0.5
       parent: 1
   - uid: 192
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,1.5
       parent: 1
-  - uid: 752
+  - uid: 259
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -10.5,-7.5
       parent: 1
-  - uid: 753
+  - uid: 260
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -10.5,-8.5
       parent: 1
-  - uid: 754
+  - uid: 503
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -10.5,-9.5
       parent: 1
-  - uid: 755
+  - uid: 544
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -10.5,-10.5
       parent: 1
-  - uid: 756
+  - uid: 596
     components:
     - type: Transform
       pos: -7.5,-14.5
       parent: 1
-  - uid: 757
+  - uid: 619
     components:
     - type: Transform
       pos: -6.5,-14.5
       parent: 1
-  - uid: 758
+  - uid: 625
     components:
     - type: Transform
       pos: -5.5,-14.5
       parent: 1
-  - uid: 759
+  - uid: 660
     components:
     - type: Transform
       pos: -4.5,-14.5
@@ -1329,36 +1309,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 266
   - uid: 177
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 266
   - uid: 178
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,-0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 266
   - uid: 179
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,-1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 266
   - uid: 762
     components:
     - type: Transform
@@ -1367,8 +1335,6 @@ entities:
       parent: 1
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 628
   - uid: 765
     components:
     - type: Transform
@@ -1377,8 +1343,6 @@ entities:
       parent: 1
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 628
 - proto: BoxLightMixed
   entities:
   - uid: 730
@@ -2512,45 +2476,30 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,-12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 194
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-11.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 195
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-10.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 196
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 197
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,-6.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 595
   - uid: 198
     components:
     - type: Transform
@@ -2563,162 +2512,108 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-6.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 595
   - uid: 200
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,-6.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 595
   - uid: 201
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 595
   - uid: 202
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 595
   - uid: 203
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 595
   - uid: 204
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 595
   - uid: 205
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-5.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 206
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 207
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 208
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 209
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 210
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -8.5,-7.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 211
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -7.5,-7.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 212
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -6.5,-7.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 564
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -9.5,-7.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 593
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,-7.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 763
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-14.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
   - uid: 764
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-13.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 221
 - proto: DefibrillatorCabinetFilled
   entities:
   - uid: 546
@@ -3015,8 +2910,6 @@ entities:
     - type: GasMixer
       inletTwoConcentration: 0.22000003
       inletOneConcentration: 0.78
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasPipeBend
@@ -3186,13 +3079,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 503
-    components:
-    - type: Transform
-      pos: -6.5,6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 504
     components:
     - type: Transform
@@ -3479,14 +3365,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 544
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 545
     components:
     - type: Transform
@@ -3698,6 +3576,22 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 661
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 662
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPort
   entities:
   - uid: 475
@@ -3706,8 +3600,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,11.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 476
@@ -3716,8 +3608,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentPump
@@ -3728,8 +3618,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,-2.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 223
@@ -3738,8 +3626,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,17.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 233
@@ -3748,8 +3634,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 442
@@ -3758,8 +3642,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 460
@@ -3768,28 +3650,26 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 462
     components:
     - type: Transform
+      anchored: False
       rot: 3.141592653589793 rad
       pos: -6.5,16.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 463
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -4.5,15.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 490
@@ -3798,8 +3678,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,-5.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 491
@@ -3811,18 +3689,17 @@ entities:
     - type: DeviceNetwork
       configurators:
       - invalid
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 619
+  - uid: 665
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,6.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 569
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -3836,8 +3713,6 @@ entities:
     - type: DeviceNetwork
       configurators:
       - invalid
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 431
@@ -3851,8 +3726,6 @@ entities:
       - invalid
       deviceLists:
       - 568
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 492
@@ -3864,8 +3737,6 @@ entities:
     - type: DeviceNetwork
       configurators:
       - invalid
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 557
@@ -3876,34 +3747,28 @@ entities:
     - type: DeviceNetwork
       configurators:
       - invalid
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 625
+  - uid: 641
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -7.5,6.5
+      pos: -7.5,-5.5
       parent: 1
     - type: DeviceNetwork
       configurators:
       - invalid
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 641
+  - uid: 666
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-5.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,6.5
       parent: 1
     - type: DeviceNetwork
-      configurators:
-      - invalid
-    - type: AtmosDevice
-      joinedGrid: 1
+      deviceLists:
+      - 569
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasVolumePump
@@ -3913,8 +3778,6 @@ entities:
     - type: Transform
       pos: 1.5,7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini
@@ -4194,8 +4057,6 @@ entities:
       parent: 1
     - type: Physics
       bodyType: Static
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: OreProcessor
   entities:
   - uid: 624
@@ -4213,8 +4074,6 @@ entities:
       parent: 1
     - type: Physics
       bodyType: Static
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: PaintingNightHawks
   entities:
   - uid: 696
@@ -4242,7 +4101,9 @@ entities:
     - type: Paper
       stampState: paper_stamp-ok
       stampedBy:
-      - stampedColor: '#00BE00FF'
+      - reapply: False
+        stampType: RubberStamp
+        stampedColor: '#00BE00FF'
         stampedName: stamp-component-stamped-name-approved
       content: >-
         [color=#cb0000]  ▐║   ║
@@ -4695,33 +4556,21 @@ entities:
     - type: Transform
       pos: -3.5,-7.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 712
   - uid: 218
     components:
     - type: Transform
       pos: -3.5,-8.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 712
   - uid: 219
     components:
     - type: Transform
       pos: -3.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 712
   - uid: 220
     components:
     - type: Transform
       pos: -3.5,-0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 712
 - proto: SignalButton
   entities:
   - uid: 266

From 19485cd4780039a70eeb21c6bc6e0e875db3003b Mon Sep 17 00:00:00 2001
From: PeccNeck <74548962+PeccNeck@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:36:40 -0400
Subject: [PATCH 2/4] replaces exterior waste air vent with a passive vent

---
 Resources/Maps/_NF/Shuttles/vagabond.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/vagabond.yml b/Resources/Maps/_NF/Shuttles/vagabond.yml
index b4c66b04919..428a28dea9d 100644
--- a/Resources/Maps/_NF/Shuttles/vagabond.yml
+++ b/Resources/Maps/_NF/Shuttles/vagabond.yml
@@ -2912,6 +2912,16 @@ entities:
       inletOneConcentration: 0.78
     - type: AtmosPipeColor
       color: '#0055CCFF'
+- proto: GasPassiveVent
+  entities:
+  - uid: 180
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeBend
   entities:
   - uid: 464
@@ -3636,14 +3646,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 442
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 460
     components:
     - type: Transform

From 5787cf3244e13577e63c64c7f9d9640d4060f5f0 Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Fri, 20 Sep 2024 19:03:19 +0300
Subject: [PATCH 3/4] Update vagabond.yml

---
 Resources/Maps/_NF/Shuttles/vagabond.yml | 512 ++++++++++++-----------
 1 file changed, 268 insertions(+), 244 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/vagabond.yml b/Resources/Maps/_NF/Shuttles/vagabond.yml
index 428a28dea9d..727475a9773 100644
--- a/Resources/Maps/_NF/Shuttles/vagabond.yml
+++ b/Resources/Maps/_NF/Shuttles/vagabond.yml
@@ -541,100 +541,102 @@ entities:
       version: 2
       data:
         tiles:
-          -4,0:
-            0: 34952
+          -3,0:
+            0: 63743
           -4,1:
-            0: 8
             1: 128
-          -3,0:
-            0: 65535
           -3,1:
-            0: 36047
-            1: 48
+            2: 112
+            0: 136
+            1: 1024
+          -3,-1:
+            0: 63736
           -3,3:
-            0: 61160
-          -3,2:
-            0: 35020
+            1: 32
+            0: 50176
           -2,0:
             0: 65535
           -2,1:
-            0: 65535
+            0: 16383
           -2,2:
             0: 65535
           -2,3:
+            0: 64434
+          -2,-1:
             0: 65535
-          -1,0:
-            0: 57343
-          -1,1:
-            0: 65489
-            1: 8
+          -2,4:
+            0: 65523
           -1,2:
-            0: 57343
+            0: 2287
           -1,3:
-            0: 30585
-          -4,-1:
-            0: 34952
-          -3,-1:
-            0: 65535
-          -3,-2:
-            0: 52462
-            1: 8704
-          -2,-2:
-            0: 65535
-          -2,-1:
-            0: 65535
+            0: 13056
+            1: 64
+          -1,0:
+            0: 2286
+          -1,1:
+            0: 59392
+            2: 8
+          -1,-1:
+            0: 61166
+          0,0:
+            0: 1911
+            1: 32768
           0,1:
-            0: 65520
-            1: 3
+            2: 3
+            0: 30464
+            1: 128
           0,2:
-            0: 65535
-          -3,4:
-            0: 61166
-          -3,5:
-            0: 14
-          -2,4:
-            0: 65535
-          -2,5:
-            0: 15
-          -1,4:
+            0: 1911
+          0,-1:
             0: 30583
-          -1,5:
-            0: 7
-          0,0:
-            0: 65535
           0,3:
-            0: 7
-            1: 8
+            1: 13
+            2: 2
           1,0:
-            0: 273
-          -3,-4:
-            0: 34944
+            2: 273
+          1,-1:
+            2: 4368
+          -4,-1:
+            1: 8
           -3,-3:
-            0: 61166
+            1: 2
+            0: 61152
+          -3,-2:
+            0: 34828
+            2: 25088
+          -3,-4:
+            1: 128
           -2,-4:
-            0: 65520
+            0: 65392
           -2,-3:
             0: 65535
+          -2,-2:
+            0: 65535
           -1,-4:
-            0: 4368
+            1: 16
           -1,-3:
-            0: 65501
+            0: 59392
+            1: 4
+            2: 8
           -1,-2:
-            0: 65535
-          -1,-1:
-            0: 65535
+            0: 61166
           0,-3:
-            0: 65527
+            2: 7
+            0: 30464
             1: 8
           0,-2:
-            0: 65535
-          0,-1:
-            0: 65535
+            0: 30583
+          -3,4:
+            0: 17600
+          -3,5:
+            1: 2
+          -1,4:
+            0: 8736
+          -1,5:
+            1: 4
           1,-3:
-            0: 4352
             1: 16
-          1,-1:
-            0: 4368
+            2: 4352
           1,-2:
             1: 1
         uniqueMixes:
@@ -668,6 +670,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -742,7 +759,7 @@ entities:
       - 768
       - 767
       - 557
-      - 462
+      - invalid
       - 769
       - 463
       - 241
@@ -860,40 +877,40 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,-12.5
       parent: 1
-- proto: AirlockShuttle
+- proto: AirlockGlassShuttle
   entities:
-  - uid: 185
+  - uid: 19
     components:
     - type: Transform
-      pos: -5.5,-14.5
+      pos: -7.5,-14.5
       parent: 1
-  - uid: 186
+  - uid: 30
     components:
     - type: Transform
       pos: -6.5,-14.5
       parent: 1
-  - uid: 187
+  - uid: 157
     components:
     - type: Transform
-      pos: -7.5,-14.5
+      pos: -5.5,-14.5
       parent: 1
-  - uid: 213
+  - uid: 183
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -10.5,-10.5
+      pos: -10.5,-8.5
       parent: 1
-  - uid: 214
+  - uid: 184
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -10.5,-9.5
       parent: 1
-  - uid: 487
+  - uid: 185
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -10.5,-8.5
+      pos: -10.5,-10.5
       parent: 1
 - proto: APCBasic
   entities:
@@ -1343,13 +1360,6 @@ entities:
       parent: 1
     - type: DeviceLinkSink
       invokeCounter: 1
-- proto: BoxLightMixed
-  entities:
-  - uid: 730
-    components:
-    - type: Transform
-      pos: 0.40422624,6.6067433
-      parent: 1
 - proto: Bucket
   entities:
   - uid: 706
@@ -1951,6 +1961,11 @@ entities:
     - type: Transform
       pos: 1.5,6.5
       parent: 1
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 1.5,10.5
+      parent: 1
 - proto: CableMV
   entities:
   - uid: 71
@@ -2422,14 +2437,6 @@ entities:
     - type: Transform
       pos: -10.413393,0.7620512
       parent: 1
-- proto: ClosetWallEmergencyFilledRandom
-  entities:
-  - uid: 693
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,10.5
-      parent: 1
 - proto: ClosetWallFireFilledRandom
   entities:
   - uid: 692
@@ -2438,6 +2445,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,6.5
       parent: 1
+- proto: ClosetWallO2N2FilledRandom
+  entities:
+  - uid: 187
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,10.5
+      parent: 1
 - proto: ComputerFrame
   entities:
   - uid: 576
@@ -2614,6 +2629,20 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,-13.5
       parent: 1
+- proto: CurtainsBlueOpen
+  entities:
+  - uid: 448
+    components:
+    - type: Transform
+      pos: -4.5,13.5
+      parent: 1
+- proto: CurtainsOrangeOpen
+  entities:
+  - uid: 442
+    components:
+    - type: Transform
+      pos: -11.5,3.5
+      parent: 1
 - proto: DefibrillatorCabinetFilled
   entities:
   - uid: 546
@@ -2698,10 +2727,10 @@ entities:
       parent: 1
 - proto: DrinkMugOne
   entities:
-  - uid: 591
+  - uid: 478
     components:
     - type: Transform
-      pos: -7.253589,19.503275
+      pos: -2.504581,15.588018
       parent: 1
 - proto: EmergencyLight
   entities:
@@ -2711,6 +2740,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,9.5
       parent: 1
+  - uid: 718
+    components:
+    - type: Transform
+      pos: -3.5,15.5
+      parent: 1
   - uid: 777
     components:
     - type: Transform
@@ -2897,21 +2931,17 @@ entities:
     - type: Transform
       pos: -10.5,1.5
       parent: 1
-- proto: GasMixerFlipped
+- proto: GasMixerOnFlipped
   entities:
-  - uid: 478
+  - uid: 188
     components:
-    - type: MetaData
-      name: Distro Mixer
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -5.5,11.5
       parent: 1
     - type: GasMixer
-      inletTwoConcentration: 0.22000003
-      inletOneConcentration: 0.78
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
+      inletTwoConcentration: 0.20999998
+      inletOneConcentration: 0.79
 - proto: GasPassiveVent
   entities:
   - uid: 180
@@ -2924,13 +2954,6 @@ entities:
       color: '#990000FF'
 - proto: GasPipeBend
   entities:
-  - uid: 464
-    components:
-    - type: Transform
-      pos: -6.5,17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 482
     components:
     - type: Transform
@@ -2939,6 +2962,18 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 702
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,4.5
+      parent: 1
+  - uid: 715
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-1.5
+      parent: 1
 - proto: GasPipeStraight
   entities:
   - uid: 243
@@ -3319,14 +3354,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 537
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 538
     components:
     - type: Transform
@@ -3367,14 +3394,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 543
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 545
     components:
     - type: Transform
@@ -3497,6 +3516,42 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 667
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-1.5
+      parent: 1
+  - uid: 668
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-1.5
+      parent: 1
+  - uid: 670
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-1.5
+      parent: 1
+  - uid: 693
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,4.5
+      parent: 1
+  - uid: 699
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,4.5
+      parent: 1
+  - uid: 701
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,4.5
+      parent: 1
   - uid: 722
     components:
     - type: Transform
@@ -3507,6 +3562,11 @@ entities:
       color: '#990000FF'
 - proto: GasPipeTJunction
   entities:
+  - uid: 213
+    components:
+    - type: Transform
+      pos: -6.5,17.5
+      parent: 1
   - uid: 427
     components:
     - type: Transform
@@ -3602,6 +3662,18 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 716
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-1.5
+      parent: 1
+  - uid: 717
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,4.5
+      parent: 1
 - proto: GasPort
   entities:
   - uid: 475
@@ -3630,6 +3702,12 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 216
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,17.5
+      parent: 1
   - uid: 223
     components:
     - type: Transform
@@ -3654,18 +3732,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 462
-    components:
-    - type: Transform
-      anchored: False
-      rot: 3.141592653589793 rad
-      pos: -6.5,16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 463
     components:
     - type: Transform
@@ -3706,6 +3772,18 @@ entities:
       color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
+  - uid: 214
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,3.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-2.5
+      parent: 1
   - uid: 241
     components:
     - type: Transform
@@ -3784,10 +3862,10 @@ entities:
       color: '#990000FF'
 - proto: GravityGeneratorMini
   entities:
-  - uid: 448
+  - uid: 603
     components:
     - type: Transform
-      pos: 1.5,10.5
+      pos: 2.5,10.5
       parent: 1
 - proto: Grille
   entities:
@@ -3922,23 +4000,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -9.5,19.5
       parent: 1
-  - uid: 249
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,3.5
-      parent: 1
   - uid: 250
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -11.5,-2.5
       parent: 1
-  - uid: 651
-    components:
-    - type: Transform
-      pos: -4.5,13.5
-      parent: 1
 - proto: LockerCaptainFilled
   entities:
   - uid: 72
@@ -3953,13 +4020,6 @@ entities:
     - type: Transform
       pos: -2.5,9.5
       parent: 1
-- proto: LockerEngineerFilled
-  entities:
-  - uid: 766
-    components:
-    - type: Transform
-      pos: -8.5,-4.5
-      parent: 1
 - proto: LockerFreezerBase
   entities:
   - uid: 258
@@ -4016,11 +4076,23 @@ entities:
     - type: Transform
       pos: -0.5,2.5
       parent: 1
+  - uid: 624
+    components:
+    - type: Transform
+      pos: -8.5,-4.5
+      parent: 1
   - uid: 681
     components:
     - type: Transform
       pos: 0.5,2.5
       parent: 1
+- proto: LockerWallMaterialsFuelPlasmaFilled2
+  entities:
+  - uid: 617
+    components:
+    - type: Transform
+      pos: -0.5,11.5
+      parent: 1
 - proto: LockerWallMedical
   entities:
   - uid: 682
@@ -4061,10 +4133,10 @@ entities:
       bodyType: Static
 - proto: OreProcessor
   entities:
-  - uid: 624
+  - uid: 729
     components:
     - type: Transform
-      pos: -2.5,-1.5
+      pos: -2.5,-3.5
       parent: 1
 - proto: OxygenCanister
   entities:
@@ -4093,85 +4165,47 @@ entities:
     - type: Transform
       pos: -2.5,16.5
       parent: 1
-- proto: Paper
-  entities:
-  - uid: 745
-    components:
-    - type: Transform
-      pos: -7.6545224,19.56597
-      parent: 1
-    - type: Paper
-      stampState: paper_stamp-ok
-      stampedBy:
-      - reapply: False
-        stampType: RubberStamp
-        stampedColor: '#00BE00FF'
-        stampedName: stamp-component-stamped-name-approved
-      content: >-
-        [color=#cb0000]  ▐║   ║
-
-          ▐╠══╣
-
-          ▐║   ║[head=2]EPHÆSTUS SHIPYARDS[/head] [/color]
-
-          ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿ ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿ ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  ̿  Welcome captain, to your very own Vagabond-Class long-distance freighter. We here at Hephaestus are proud to offer this line of vessels to enterprising private captains through our Ship Refurbishment Program. Combining a complete refressh of electronics, propulsion, and other technical systems with the reliable frame and architecture that our company is renowned for, you have at your fingertips one of the finest vessels money can buy.
-
-
-        [bold]Pre-Flight[/bold]
-
-        To help facilitate ease of transition into your new vessel, we recommend completing this pre-flight checklist to ensure smooth operation for many years to come:
-
-          • Ensure proper distribution gasses have been installed and engaged.
-
-          • Turn on the waste-line gas output to ensure crew safety.
-
-          • Complimentary fuel has been provided. However, for longer journeys, additional fuel or power sources may be required.
-
-
-        The Vagabond is well-beloved by pilots for its flowing floorplan, generous capacity, and adaptability to many industrial and scientific use cases. We look forward to the creativity and entrepreneurial spirit you will bring to your new home amongst the stars.
-- proto: PaperBin10
+- proto: PaperBin5
   entities:
-  - uid: 603
+  - uid: 464
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,15.5
+      pos: -7.5,19.5
       parent: 1
 - proto: PlasticFlapsAirtightClear
   entities:
-  - uid: 183
+  - uid: 714
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -8.5,-7.5
+      pos: -10.5,-7.5
       parent: 1
-  - uid: 184
+  - uid: 790
     components:
     - type: Transform
-      pos: -4.5,-12.5
+      pos: -4.5,-14.5
       parent: 1
-  - uid: 215
+- proto: PlasticFlapsClear
+  entities:
+  - uid: 487
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-6.5
+      pos: -8.5,-7.5
       parent: 1
-  - uid: 216
+  - uid: 502
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,1.5
+      pos: -4.5,-12.5
       parent: 1
-  - uid: 714
+  - uid: 537
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-7.5
+      pos: -3.5,-6.5
       parent: 1
-  - uid: 790
+  - uid: 543
     components:
     - type: Transform
-      pos: -4.5,-14.5
+      pos: -3.5,1.5
       parent: 1
 - proto: Plunger
   entities:
@@ -4189,7 +4223,7 @@ entities:
       parent: 1
 - proto: PortableGeneratorPacmanShuttle
   entities:
-  - uid: 30
+  - uid: 249
     components:
     - type: Transform
       pos: 0.5,10.5
@@ -4198,10 +4232,10 @@ entities:
       on: False
     - type: Physics
       bodyType: Static
-  - uid: 157
+  - uid: 571
     components:
     - type: Transform
-      pos: -0.5,10.5
+      pos: 1.5,10.5
       parent: 1
     - type: FuelGenerator
       on: False
@@ -4389,12 +4423,6 @@ entities:
       parent: 1
 - proto: Rack
   entities:
-  - uid: 571
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,10.5
-      parent: 1
   - uid: 601
     components:
     - type: Transform
@@ -4407,6 +4435,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,6.5
       parent: 1
+  - uid: 728
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
   - uid: 744
     components:
     - type: Transform
@@ -4544,12 +4577,12 @@ entities:
     - type: Transform
       pos: -3.5,4.5
       parent: 1
-- proto: SheetPlasma
+- proto: SalvageTechfabNF
   entities:
-  - uid: 19
+  - uid: 651
     components:
     - type: Transform
-      pos: 2.4900203,10.542679
+      pos: 2.5,-9.5
       parent: 1
 - proto: ShuttersWindow
   entities:
@@ -4679,13 +4712,6 @@ entities:
     - type: Transform
       pos: -3.5,14.5
       parent: 1
-- proto: SuitStorageEngi
-  entities:
-  - uid: 617
-    components:
-    - type: Transform
-      pos: -8.5,-5.5
-      parent: 1
 - proto: SuitStorageQuartermaster
   entities:
   - uid: 741
@@ -4700,6 +4726,11 @@ entities:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
+  - uid: 462
+    components:
+    - type: Transform
+      pos: -8.5,-5.5
+      parent: 1
   - uid: 592
     components:
     - type: Transform
@@ -4707,6 +4738,11 @@ entities:
       parent: 1
 - proto: TableCounterMetal
   entities:
+  - uid: 186
+    components:
+    - type: Transform
+      pos: -5.5,5.5
+      parent: 1
   - uid: 254
     components:
     - type: Transform
@@ -4731,11 +4767,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,0.5
       parent: 1
-  - uid: 502
-    components:
-    - type: Transform
-      pos: -4.5,6.5
-      parent: 1
   - uid: 623
     components:
     - type: Transform
@@ -4977,13 +5008,6 @@ entities:
     - type: Transform
       pos: -0.5,-9.5
       parent: 1
-- proto: VendingMachineSalvage
-  entities:
-  - uid: 796
-    components:
-    - type: Transform
-      pos: 2.5,-9.5
-      parent: 1
 - proto: WallReinforced
   entities:
   - uid: 3

From 7c1d94786a7e79131a747f8f9a266abf251d8d54 Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Fri, 20 Sep 2024 19:42:11 +0300
Subject: [PATCH 4/4] Update vagabond.yml

---
 Resources/Maps/_NF/Shuttles/vagabond.yml | 373 +++++++++++++++++++----
 1 file changed, 307 insertions(+), 66 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/vagabond.yml b/Resources/Maps/_NF/Shuttles/vagabond.yml
index 727475a9773..3e09df12adb 100644
--- a/Resources/Maps/_NF/Shuttles/vagabond.yml
+++ b/Resources/Maps/_NF/Shuttles/vagabond.yml
@@ -566,13 +566,13 @@ entities:
             0: 65535
           -2,4:
             0: 65523
+          -1,0:
+            0: 2302
           -1,2:
             0: 2287
           -1,3:
             0: 13056
             1: 64
-          -1,0:
-            0: 2286
           -1,1:
             0: 59392
             2: 8
@@ -614,12 +614,12 @@ entities:
             0: 65535
           -1,-4:
             1: 16
+          -1,-2:
+            0: 61182
           -1,-3:
             0: 59392
             1: 4
             2: 8
-          -1,-2:
-            0: 61166
           0,-3:
             2: 7
             0: 30464
@@ -755,11 +755,8 @@ entities:
       parent: 1
     - type: DeviceList
       devices:
-      - 223
       - 768
       - 767
-      - 557
-      - invalid
       - 769
       - 463
       - 241
@@ -774,8 +771,6 @@ entities:
       parent: 1
     - type: DeviceList
       devices:
-      - 490
-      - 641
       - 612
       - 613
       - 618
@@ -2942,6 +2937,8 @@ entities:
     - type: GasMixer
       inletTwoConcentration: 0.20999998
       inletOneConcentration: 0.79
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
   - uid: 180
@@ -2968,14 +2965,26 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -11.5,4.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 715
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -11.5,-1.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeStraight
   entities:
+  - uid: 213
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 243
     components:
     - type: Transform
@@ -3006,19 +3015,11 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 465
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 466
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,17.5
+      rot: 3.141592653589793 rad
+      pos: -6.5,17.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -3198,7 +3199,7 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -8.5,-2.5
+      pos: -7.5,18.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -3458,6 +3459,13 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 557
+    components:
+    - type: Transform
+      pos: -7.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 558
     components:
     - type: Transform
@@ -3516,42 +3524,53 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 641
+    components:
+    - type: Transform
+      pos: -7.5,16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 667
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,-1.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 668
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -9.5,-1.5
       parent: 1
-  - uid: 670
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-1.5
-      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 693
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -8.5,4.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 699
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -9.5,4.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 701
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,4.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 722
     components:
     - type: Transform
@@ -3560,13 +3579,153 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 749
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 750
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 755
+    components:
+    - type: Transform
+      pos: -7.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 757
+    components:
+    - type: Transform
+      pos: -7.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 758
+    components:
+    - type: Transform
+      pos: -7.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 759
+    components:
+    - type: Transform
+      pos: -7.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 766
+    components:
+    - type: Transform
+      pos: -7.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 774
+    components:
+    - type: Transform
+      pos: -7.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 796
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 799
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 801
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 804
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 805
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 818
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 819
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 820
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 821
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 822
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
-  - uid: 213
+  - uid: 223
     components:
     - type: Transform
-      pos: -6.5,17.5
+      pos: -8.5,-2.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 427
     components:
     - type: Transform
@@ -3574,6 +3733,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 465
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 471
     components:
     - type: Transform
@@ -3668,12 +3835,46 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -7.5,-1.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 717
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -7.5,4.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 736
+    components:
+    - type: Transform
+      pos: -6.5,18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 745
+    components:
+    - type: Transform
+      pos: -7.5,17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 776
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 802
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPort
   entities:
   - uid: 475
@@ -3702,20 +3903,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 216
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,17.5
-      parent: 1
-  - uid: 223
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 233
     components:
     - type: Transform
@@ -3740,14 +3927,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 490
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 491
     components:
     - type: Transform
@@ -3770,6 +3949,46 @@ entities:
       - 569
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 730
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 738
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 753
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 754
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 756
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
   - uid: 214
@@ -3778,12 +3997,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: -11.5,3.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 215
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -11.5,-2.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 216
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 241
     components:
     - type: Transform
@@ -3808,6 +4039,14 @@ entities:
       - 568
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 490
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 492
     components:
     - type: Transform
@@ -3819,36 +4058,38 @@ entities:
       - invalid
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 557
+  - uid: 666
     components:
     - type: Transform
-      pos: -7.5,16.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,6.5
       parent: 1
     - type: DeviceNetwork
-      configurators:
-      - invalid
+      deviceLists:
+      - 569
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 641
+  - uid: 670
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-5.5
+      pos: -8.5,-0.5
       parent: 1
-    - type: DeviceNetwork
-      configurators:
-      - invalid
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 666
+  - uid: 751
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 752
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -7.5,-13.5
       parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 569
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasVolumePump