From 98e88ea6eea107f2e5683e4a8655d2ad5a597e8d Mon Sep 17 00:00:00 2001
From: dustylens <truecoffee@gmail.com>
Date: Fri, 27 Sep 2024 17:32:42 -0700
Subject: [PATCH 1/4] Update falcon.yml

---
 .../Maps/_NF/Shuttles/BlackMarket/falcon.yml  | 244 +++++++-----------
 1 file changed, 96 insertions(+), 148 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml
index dee3dc64ce1..40b64cb1213 100644
--- a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml
@@ -39,7 +39,7 @@ entities:
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAcgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAAgAAAAAAAgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAcgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAAgAAAAAAAgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
@@ -266,7 +266,7 @@ entities:
           0,-4:
             0: 65535
           -1,-4:
-            0: 61015
+            0: 60503
           0,-3:
             0: 12287
           -1,-3:
@@ -346,13 +346,6 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
-- proto: AirCanister
-  entities:
-  - uid: 187
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 3
 - proto: AirlockCaptainGlassLocked
   entities:
   - uid: 271
@@ -446,7 +439,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-14.5
       parent: 3
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 139
     components:
@@ -471,32 +464,37 @@ entities:
   - uid: 144
     components:
     - type: Transform
-      pos: 4.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-14.5
       parent: 3
   - uid: 145
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 9.5,-16.5
       parent: 3
   - uid: 146
     components:
     - type: Transform
-      pos: 9.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-16.5
       parent: 3
   - uid: 147
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -4.5,-14.5
       parent: 3
   - uid: 148
     components:
     - type: Transform
-      pos: -4.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-2.5
       parent: 3
-  - uid: 242
+  - uid: 559
     components:
     - type: Transform
-      pos: 3.5,-2.5
+      pos: 4.5,-16.5
       parent: 3
 - proto: AtmosFixBlockerMarker
   entities:
@@ -681,46 +679,26 @@ entities:
     - type: Transform
       pos: 2.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 69
     components:
     - type: Transform
       pos: 3.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 70
     components:
     - type: Transform
       pos: 0.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 76
     components:
     - type: Transform
       pos: 1.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 528
     components:
     - type: Transform
       pos: 4.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
 - proto: BookHowToSurvive
   entities:
   - uid: 531
@@ -1611,6 +1589,11 @@ entities:
     - type: Transform
       pos: -1.5,-9.5
       parent: 3
+  - uid: 373
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 3
 - proto: ChairFolding
   entities:
   - uid: 214
@@ -1851,16 +1834,28 @@ entities:
     - type: Transform
       pos: 5.286945,-7.6460857
       parent: 3
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        paper_label: !type:ContainerSlot {}
   - uid: 236
     components:
     - type: Transform
       pos: 5.5473614,-7.3856688
       parent: 3
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        paper_label: !type:ContainerSlot {}
   - uid: 239
     components:
     - type: Transform
       pos: 5.7348614,-7.6669188
       parent: 3
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        paper_label: !type:ContainerSlot {}
 - proto: DrinkRumBottleFull
   entities:
   - uid: 228
@@ -1948,6 +1943,19 @@ entities:
     - type: Transform
       pos: 5.5,-13.5
       parent: 3
+- proto: GasMixerOnFlipped
+  entities:
+  - uid: 226
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-10.5
+      parent: 3
+    - type: GasMixer
+      inletTwoConcentration: 0.20999998
+      inletOneConcentration: 0.79
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
   - uid: 448
@@ -1960,13 +1968,21 @@ entities:
       color: '#BB0000FF'
 - proto: GasPipeBend
   entities:
-  - uid: 373
+  - uid: 187
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-10.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 242
     components:
     - type: Transform
       pos: -0.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 375
     components:
     - type: Transform
@@ -2008,15 +2024,7 @@ entities:
       pos: -1.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
-  - uid: 377
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-10.5
-      parent: 3
-    - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 378
     components:
     - type: Transform
@@ -2457,6 +2465,13 @@ entities:
       color: '#BB0000FF'
 - proto: GasPort
   entities:
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 372
     components:
     - type: Transform
@@ -2464,7 +2479,7 @@ entities:
       pos: -2.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
 - proto: GasVentPump
   entities:
   - uid: 401
@@ -2478,10 +2493,14 @@ entities:
   - uid: 402
     components:
     - type: Transform
+      anchored: False
       pos: 1.5,-0.5
       parent: 3
     - type: AtmosPipeColor
       color: '#0000BBFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 403
     components:
     - type: Transform
@@ -2578,16 +2597,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,-10.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 77
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-10.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
 - proto: HarmonicaInstrument
   entities:
   - uid: 453
@@ -2595,12 +2610,12 @@ entities:
     - type: Transform
       pos: 6.464443,-9.590082
       parent: 3
-- proto: SyndicateMicrowave
+- proto: LockerWallMaterialsFuelPlasmaFilled2
   entities:
-  - uid: 109
+  - uid: 377
     components:
     - type: Transform
-      pos: 6.5,-6.5
+      pos: -2.5,-8.5
       parent: 3
 - proto: LockerWallMedicalFilled
   entities:
@@ -2698,6 +2713,26 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,2.5
       parent: 3
+- proto: NitrogenCanister
+  entities:
+  - uid: 98
+    components:
+    - type: Transform
+      anchored: True
+      pos: -2.5,-9.5
+      parent: 3
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
+  entities:
+  - uid: 251
+    components:
+    - type: Transform
+      anchored: True
+      pos: 0.5,-9.5
+      parent: 3
+    - type: Physics
+      bodyType: Static
 - proto: Paper
   entities:
   - uid: 449
@@ -2877,11 +2912,6 @@ entities:
     - type: Transform
       pos: 2.5,-12.5
       parent: 3
-  - uid: 251
-    components:
-    - type: Transform
-      pos: 0.5,-9.5
-      parent: 3
   - uid: 557
     components:
     - type: Transform
@@ -2942,13 +2972,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,-4.5
       parent: 3
-- proto: SheetPlasma
-  entities:
-  - uid: 98
-    components:
-    - type: Transform
-      pos: 0.5504579,-9.491902
-      parent: 3
 - proto: ShuttersNormalOpen
   entities:
   - uid: 72
@@ -2956,110 +2979,66 @@ entities:
     - type: Transform
       pos: 0.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 73
     components:
     - type: Transform
       pos: 1.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 136
     components:
     - type: Transform
       pos: 2.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 137
     components:
     - type: Transform
       pos: 3.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 138
     components:
     - type: Transform
       pos: 4.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 243
     components:
     - type: Transform
       pos: -0.5,1.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 244
     components:
     - type: Transform
       pos: -0.5,0.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 245
     components:
     - type: Transform
       pos: -0.5,-2.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 246
     components:
     - type: Transform
       pos: 0.5,2.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 247
     components:
     - type: Transform
       pos: 1.5,2.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 248
     components:
     - type: Transform
       pos: 2.5,1.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 249
     components:
     - type: Transform
       pos: 2.5,0.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 250
     components:
     - type: Transform
       pos: 4.5,-3.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
 - proto: ShuttleGunPirateCannon
   entities:
   - uid: 191
@@ -3068,20 +3047,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,0.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 155
-      - 472
   - uid: 192
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,0.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 155
-      - 472
 - proto: SignalButtonDirectional
   entities:
   - uid: 152
@@ -3250,6 +3221,13 @@ entities:
     - type: Transform
       pos: -0.5,-6.5
       parent: 3
+- proto: SyndicateMicrowave
+  entities:
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 6.5,-6.5
+      parent: 3
 - proto: TableCarpet
   entities:
   - uid: 89
@@ -3340,117 +3318,87 @@ entities:
     - type: Transform
       pos: 6.5,-3.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 37
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-12.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 38
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -1.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 39
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 40
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 7.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 41
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-11.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 42
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 46
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-12.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 58
     components:
     - type: Transform
       pos: -2.5,-5.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 59
     components:
     - type: Transform
       pos: 7.5,-4.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 82
     components:
     - type: Transform
       pos: -1.5,-3.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 99
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-11.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 112
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 8.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 118
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 119
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
 - proto: ToolboxElectrical
   entities:
   - uid: 481

From bdf56ac818cc28584c561ce6e007e35c8d8bab84 Mon Sep 17 00:00:00 2001
From: dustylens <truecoffee@gmail.com>
Date: Fri, 27 Sep 2024 17:37:47 -0700
Subject: [PATCH 2/4] Update schooner.yml

---
 .../_NF/Shuttles/BlackMarket/schooner.yml     | 162 +++++-------------
 1 file changed, 46 insertions(+), 116 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
index eed6dc98d7d..1b25895d07b 100644
--- a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
@@ -566,77 +566,89 @@ entities:
     - type: Transform
       pos: 1.5,-5.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 7
     components:
     - type: Transform
-      pos: 4.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,2.5
       parent: 1
   - uid: 8
     components:
     - type: Transform
-      pos: 4.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,3.5
       parent: 1
   - uid: 9
     components:
     - type: Transform
-      pos: 4.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,4.5
       parent: 1
   - uid: 10
     components:
     - type: Transform
-      pos: -3.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,4.5
       parent: 1
   - uid: 11
     components:
     - type: Transform
-      pos: -3.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,3.5
       parent: 1
   - uid: 12
     components:
     - type: Transform
-      pos: -3.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,2.5
       parent: 1
   - uid: 13
     components:
     - type: Transform
-      pos: 4.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-4.5
       parent: 1
   - uid: 14
     components:
     - type: Transform
-      pos: 4.5,-3.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-3.5
       parent: 1
   - uid: 15
     components:
     - type: Transform
-      pos: 4.5,-4.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-2.5
       parent: 1
   - uid: 16
     components:
     - type: Transform
-      pos: -3.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-2.5
       parent: 1
   - uid: 17
     components:
     - type: Transform
-      pos: -3.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-3.5
       parent: 1
   - uid: 18
     components:
     - type: Transform
-      pos: -3.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-4.5
       parent: 1
   - uid: 19
     components:
     - type: Transform
-      pos: -0.5,-9.5
+      pos: 1.5,-9.5
       parent: 1
   - uid: 20
     components:
     - type: Transform
-      pos: 1.5,-9.5
+      pos: -0.5,-9.5
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
@@ -2240,6 +2252,25 @@ entities:
     - type: Transform
       pos: -2.7120032,-0.473266
       parent: 1
+- proto: LockerWallMaterialsFuelUraniumFilled
+  entities:
+  - uid: 208
+    components:
+    - type: Transform
+      pos: -2.5,9.5
+      parent: 1
+- proto: NFSignDock
+  entities:
+  - uid: 363
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 1
+  - uid: 364
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 1
 - proto: NitrogenCanister
   entities:
   - uid: 207
@@ -2669,13 +2700,6 @@ entities:
       linkedPorts:
         503:
         - Pressed: Trigger
-- proto: SheetUranium
-  entities:
-  - uid: 208
-    components:
-    - type: Transform
-      pos: -0.65123916,8.543868
-      parent: 1
 - proto: ShuttersNormal
   entities:
   - uid: 341
@@ -2683,97 +2707,61 @@ entities:
     - type: Transform
       pos: 4.5,-2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 356
   - uid: 342
     components:
     - type: Transform
       pos: 4.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 356
   - uid: 343
     components:
     - type: Transform
       pos: 4.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 356
   - uid: 344
     components:
     - type: Transform
       pos: -3.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 355
   - uid: 345
     components:
     - type: Transform
       pos: -3.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 355
   - uid: 346
     components:
     - type: Transform
       pos: -3.5,-2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 355
   - uid: 347
     components:
     - type: Transform
       pos: 4.5,2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 353
   - uid: 348
     components:
     - type: Transform
       pos: 4.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 353
   - uid: 349
     components:
     - type: Transform
       pos: 4.5,4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 353
   - uid: 350
     components:
     - type: Transform
       pos: -3.5,2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 354
   - uid: 351
     components:
     - type: Transform
       pos: -3.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 354
   - uid: 352
     components:
     - type: Transform
       pos: -3.5,4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 354
 - proto: ShuttersRadiation
   entities:
   - uid: 206
@@ -2782,35 +2770,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.5,8.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 274
   - uid: 224
     components:
     - type: Transform
       pos: -1.5,9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 274
   - uid: 225
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,7.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 274
   - uid: 228
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,6.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 274
 - proto: ShuttleGunPirateCannon
   entities:
   - uid: 501
@@ -2819,36 +2795,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 506
   - uid: 502
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -5.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 507
   - uid: 503
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 508
   - uid: 504
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 505
 - proto: SignalButtonDirectional
   entities:
   - uid: 274
@@ -2933,40 +2897,6 @@ entities:
     - type: Transform
       pos: -0.5,9.5
       parent: 1
-- proto: SignShield
-  entities:
-  - uid: 359
-    components:
-    - type: Transform
-      pos: 5.5,5.5
-      parent: 1
-  - uid: 360
-    components:
-    - type: Transform
-      pos: -4.5,5.5
-      parent: 1
-  - uid: 361
-    components:
-    - type: Transform
-      pos: -4.5,-5.5
-      parent: 1
-  - uid: 362
-    components:
-    - type: Transform
-      pos: 5.5,-5.5
-      parent: 1
-- proto: NFSignDock
-  entities:
-  - uid: 363
-    components:
-    - type: Transform
-      pos: 2.5,-9.5
-      parent: 1
-  - uid: 364
-    components:
-    - type: Transform
-      pos: -1.5,-9.5
-      parent: 1
 - proto: SMESBasic
   entities:
   - uid: 365

From 95a186e1f4116113f54333e3113a4f4e5bc37568 Mon Sep 17 00:00:00 2001
From: dustylens <truecoffee@gmail.com>
Date: Fri, 27 Sep 2024 17:39:47 -0700
Subject: [PATCH 3/4] Revert "Update schooner.yml"

This reverts commit bdf56ac818cc28584c561ce6e007e35c8d8bab84.
---
 .../_NF/Shuttles/BlackMarket/schooner.yml     | 162 +++++++++++++-----
 1 file changed, 116 insertions(+), 46 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
index 1b25895d07b..eed6dc98d7d 100644
--- a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
@@ -566,89 +566,77 @@ entities:
     - type: Transform
       pos: 1.5,-5.5
       parent: 1
-- proto: AtmosDeviceFanDirectional
+- proto: AtmosDeviceFanTiny
   entities:
   - uid: 7
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,2.5
+      pos: 4.5,4.5
       parent: 1
   - uid: 8
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,3.5
+      pos: 4.5,3.5
       parent: 1
   - uid: 9
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,4.5
+      pos: 4.5,2.5
       parent: 1
   - uid: 10
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,4.5
+      pos: -3.5,2.5
       parent: 1
   - uid: 11
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,3.5
+      pos: -3.5,3.5
       parent: 1
   - uid: 12
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,2.5
+      pos: -3.5,4.5
       parent: 1
   - uid: 13
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-4.5
+      pos: 4.5,-2.5
       parent: 1
   - uid: 14
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-3.5
+      pos: 4.5,-3.5
       parent: 1
   - uid: 15
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-2.5
+      pos: 4.5,-4.5
       parent: 1
   - uid: 16
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-2.5
+      pos: -3.5,-4.5
       parent: 1
   - uid: 17
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-3.5
+      pos: -3.5,-3.5
       parent: 1
   - uid: 18
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-4.5
+      pos: -3.5,-2.5
       parent: 1
   - uid: 19
     components:
     - type: Transform
-      pos: 1.5,-9.5
+      pos: -0.5,-9.5
       parent: 1
   - uid: 20
     components:
     - type: Transform
-      pos: -0.5,-9.5
+      pos: 1.5,-9.5
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
@@ -2252,25 +2240,6 @@ entities:
     - type: Transform
       pos: -2.7120032,-0.473266
       parent: 1
-- proto: LockerWallMaterialsFuelUraniumFilled
-  entities:
-  - uid: 208
-    components:
-    - type: Transform
-      pos: -2.5,9.5
-      parent: 1
-- proto: NFSignDock
-  entities:
-  - uid: 363
-    components:
-    - type: Transform
-      pos: 2.5,-9.5
-      parent: 1
-  - uid: 364
-    components:
-    - type: Transform
-      pos: -1.5,-9.5
-      parent: 1
 - proto: NitrogenCanister
   entities:
   - uid: 207
@@ -2700,6 +2669,13 @@ entities:
       linkedPorts:
         503:
         - Pressed: Trigger
+- proto: SheetUranium
+  entities:
+  - uid: 208
+    components:
+    - type: Transform
+      pos: -0.65123916,8.543868
+      parent: 1
 - proto: ShuttersNormal
   entities:
   - uid: 341
@@ -2707,61 +2683,97 @@ entities:
     - type: Transform
       pos: 4.5,-2.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 356
   - uid: 342
     components:
     - type: Transform
       pos: 4.5,-3.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 356
   - uid: 343
     components:
     - type: Transform
       pos: 4.5,-4.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 356
   - uid: 344
     components:
     - type: Transform
       pos: -3.5,-4.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 355
   - uid: 345
     components:
     - type: Transform
       pos: -3.5,-3.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 355
   - uid: 346
     components:
     - type: Transform
       pos: -3.5,-2.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 355
   - uid: 347
     components:
     - type: Transform
       pos: 4.5,2.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 353
   - uid: 348
     components:
     - type: Transform
       pos: 4.5,3.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 353
   - uid: 349
     components:
     - type: Transform
       pos: 4.5,4.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 353
   - uid: 350
     components:
     - type: Transform
       pos: -3.5,2.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 354
   - uid: 351
     components:
     - type: Transform
       pos: -3.5,3.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 354
   - uid: 352
     components:
     - type: Transform
       pos: -3.5,4.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 354
 - proto: ShuttersRadiation
   entities:
   - uid: 206
@@ -2770,23 +2782,35 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.5,8.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 274
   - uid: 224
     components:
     - type: Transform
       pos: -1.5,9.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 274
   - uid: 225
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,7.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 274
   - uid: 228
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,6.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 274
 - proto: ShuttleGunPirateCannon
   entities:
   - uid: 501
@@ -2795,24 +2819,36 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,3.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 506
   - uid: 502
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -5.5,-3.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 507
   - uid: 503
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,-3.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 508
   - uid: 504
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,3.5
       parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 505
 - proto: SignalButtonDirectional
   entities:
   - uid: 274
@@ -2897,6 +2933,40 @@ entities:
     - type: Transform
       pos: -0.5,9.5
       parent: 1
+- proto: SignShield
+  entities:
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 5.5,5.5
+      parent: 1
+  - uid: 360
+    components:
+    - type: Transform
+      pos: -4.5,5.5
+      parent: 1
+  - uid: 361
+    components:
+    - type: Transform
+      pos: -4.5,-5.5
+      parent: 1
+  - uid: 362
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 1
+- proto: NFSignDock
+  entities:
+  - uid: 363
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 1
+  - uid: 364
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 1
 - proto: SMESBasic
   entities:
   - uid: 365

From e6d2679496b148af61dd1e1c896853ebe46f25ad Mon Sep 17 00:00:00 2001
From: Whatstone <whatston3@gmail.com>
Date: Fri, 11 Oct 2024 18:53:07 -0400
Subject: [PATCH 4/4] Pipe colours, remove unanchored pipe, fix vent

---
 .../Maps/_NF/Shuttles/BlackMarket/falcon.yml  | 156 ++++++++----------
 1 file changed, 72 insertions(+), 84 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml
index 40b64cb1213..ec7d61daf66 100644
--- a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml
@@ -1965,7 +1965,7 @@ entities:
       pos: 2.5,-17.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GasPipeBend
   entities:
   - uid: 187
@@ -1990,14 +1990,14 @@ entities:
       pos: -1.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 419
     components:
     - type: Transform
       pos: 2.5,-4.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 443
     components:
     - type: Transform
@@ -2005,7 +2005,7 @@ entities:
       pos: 0.5,-4.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GasPipeFourway
   entities:
   - uid: 383
@@ -2014,7 +2014,7 @@ entities:
       pos: 1.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
 - proto: GasPipeStraight
   entities:
   - uid: 374
@@ -2032,7 +2032,7 @@ entities:
       pos: -1.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 379
     components:
     - type: Transform
@@ -2040,7 +2040,7 @@ entities:
       pos: -1.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 380
     components:
     - type: Transform
@@ -2048,7 +2048,7 @@ entities:
       pos: -1.5,-14.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 381
     components:
     - type: Transform
@@ -2056,7 +2056,7 @@ entities:
       pos: -1.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 382
     components:
     - type: Transform
@@ -2064,7 +2064,7 @@ entities:
       pos: 0.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 384
     components:
     - type: Transform
@@ -2072,7 +2072,7 @@ entities:
       pos: 2.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 385
     components:
     - type: Transform
@@ -2080,7 +2080,7 @@ entities:
       pos: 3.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 386
     components:
     - type: Transform
@@ -2088,7 +2088,7 @@ entities:
       pos: 4.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 387
     components:
     - type: Transform
@@ -2096,7 +2096,7 @@ entities:
       pos: 5.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 389
     components:
     - type: Transform
@@ -2104,7 +2104,7 @@ entities:
       pos: 1.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 390
     components:
     - type: Transform
@@ -2112,7 +2112,7 @@ entities:
       pos: 1.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 391
     components:
     - type: Transform
@@ -2120,7 +2120,7 @@ entities:
       pos: 1.5,-8.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 392
     components:
     - type: Transform
@@ -2128,7 +2128,7 @@ entities:
       pos: 1.5,-7.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 394
     components:
     - type: Transform
@@ -2136,7 +2136,7 @@ entities:
       pos: 1.5,-5.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 395
     components:
     - type: Transform
@@ -2144,7 +2144,7 @@ entities:
       pos: 1.5,-4.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 396
     components:
     - type: Transform
@@ -2152,7 +2152,7 @@ entities:
       pos: 1.5,-3.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 397
     components:
     - type: Transform
@@ -2160,7 +2160,7 @@ entities:
       pos: 1.5,-2.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 398
     components:
     - type: Transform
@@ -2168,15 +2168,7 @@ entities:
       pos: 1.5,-1.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
-  - uid: 399
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-0.5
-      parent: 3
-    - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 400
     components:
     - type: Transform
@@ -2184,84 +2176,84 @@ entities:
       pos: 2.5,-6.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 405
     components:
     - type: Transform
       pos: 6.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 406
     components:
     - type: Transform
       pos: 6.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 407
     components:
     - type: Transform
       pos: 6.5,-14.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 408
     components:
     - type: Transform
       pos: 6.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 414
     components:
     - type: Transform
       pos: 2.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 416
     components:
     - type: Transform
       pos: 2.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 417
     components:
     - type: Transform
       pos: 2.5,-8.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 420
     components:
     - type: Transform
       pos: 2.5,-5.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 421
     components:
     - type: Transform
       pos: 2.5,-6.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 423
     components:
     - type: Transform
       pos: 2.5,-14.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 425
     components:
     - type: Transform
       pos: 2.5,-16.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 426
     components:
     - type: Transform
@@ -2269,7 +2261,7 @@ entities:
       pos: 1.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 427
     components:
     - type: Transform
@@ -2277,7 +2269,7 @@ entities:
       pos: 0.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 428
     components:
     - type: Transform
@@ -2285,7 +2277,7 @@ entities:
       pos: -0.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 429
     components:
     - type: Transform
@@ -2293,7 +2285,7 @@ entities:
       pos: -1.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 430
     components:
     - type: Transform
@@ -2301,7 +2293,7 @@ entities:
       pos: -2.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 431
     components:
     - type: Transform
@@ -2309,7 +2301,7 @@ entities:
       pos: 3.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 432
     components:
     - type: Transform
@@ -2317,7 +2309,7 @@ entities:
       pos: 4.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 433
     components:
     - type: Transform
@@ -2325,7 +2317,7 @@ entities:
       pos: 5.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 434
     components:
     - type: Transform
@@ -2333,7 +2325,7 @@ entities:
       pos: 6.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 435
     components:
     - type: Transform
@@ -2341,7 +2333,7 @@ entities:
       pos: 3.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 436
     components:
     - type: Transform
@@ -2349,7 +2341,7 @@ entities:
       pos: 4.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 437
     components:
     - type: Transform
@@ -2357,7 +2349,7 @@ entities:
       pos: 5.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 438
     components:
     - type: Transform
@@ -2365,7 +2357,7 @@ entities:
       pos: 6.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 444
     components:
     - type: Transform
@@ -2373,7 +2365,7 @@ entities:
       pos: 0.5,-1.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 445
     components:
     - type: Transform
@@ -2381,7 +2373,7 @@ entities:
       pos: 0.5,-2.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 446
     components:
     - type: Transform
@@ -2389,7 +2381,7 @@ entities:
       pos: 0.5,-3.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 447
     components:
     - type: Transform
@@ -2397,7 +2389,7 @@ entities:
       pos: 1.5,-4.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GasPipeTJunction
   entities:
   - uid: 376
@@ -2407,14 +2399,14 @@ entities:
       pos: -0.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 388
     components:
     - type: Transform
       pos: 6.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 393
     components:
     - type: Transform
@@ -2422,7 +2414,7 @@ entities:
       pos: 1.5,-6.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 411
     components:
     - type: Transform
@@ -2430,7 +2422,7 @@ entities:
       pos: 2.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 413
     components:
     - type: Transform
@@ -2438,7 +2430,7 @@ entities:
       pos: 2.5,-7.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 415
     components:
     - type: Transform
@@ -2446,7 +2438,7 @@ entities:
       pos: 2.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 422
     components:
     - type: Transform
@@ -2454,7 +2446,7 @@ entities:
       pos: 2.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 424
     components:
     - type: Transform
@@ -2462,7 +2454,7 @@ entities:
       pos: 2.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GasPort
   entities:
   - uid: 189
@@ -2489,18 +2481,14 @@ entities:
       pos: 3.5,-6.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 402
     components:
     - type: Transform
-      anchored: False
       pos: 1.5,-0.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
+      color: '#0055CCFF'
   - uid: 403
     components:
     - type: Transform
@@ -2508,7 +2496,7 @@ entities:
       pos: -1.5,-16.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 404
     components:
     - type: Transform
@@ -2516,7 +2504,7 @@ entities:
       pos: 7.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 409
     components:
     - type: Transform
@@ -2524,7 +2512,7 @@ entities:
       pos: 6.5,-16.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 410
     components:
     - type: Transform
@@ -2532,7 +2520,7 @@ entities:
       pos: 1.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
   - uid: 412
@@ -2542,7 +2530,7 @@ entities:
       pos: 3.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 418
     components:
     - type: Transform
@@ -2550,7 +2538,7 @@ entities:
       pos: 3.5,-7.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 439
     components:
     - type: Transform
@@ -2558,14 +2546,14 @@ entities:
       pos: 7.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 440
     components:
     - type: Transform
       pos: 0.5,-0.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 441
     components:
     - type: Transform
@@ -2573,7 +2561,7 @@ entities:
       pos: 7.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 442
     components:
     - type: Transform
@@ -2581,7 +2569,7 @@ entities:
       pos: -3.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GravityGeneratorMini
   entities:
   - uid: 120