From 75a7d8e794f6cb0a14ea4a6b5ba4d6696d83c46f Mon Sep 17 00:00:00 2001
From: TimrodDX <timrod@gmail.com>
Date: Tue, 28 Jun 2022 23:26:15 -0400
Subject: [PATCH] Fixes the external airlocks on Waystation (#9269)

---
 Resources/Maps/waystation.yml | 590 ++++++++++++----------------------
 1 file changed, 199 insertions(+), 391 deletions(-)

diff --git a/Resources/Maps/waystation.yml b/Resources/Maps/waystation.yml
index 608eb9425b..104184e444 100644
--- a/Resources/Maps/waystation.yml
+++ b/Resources/Maps/waystation.yml
@@ -7122,22 +7122,22 @@ entities:
       15,-12: 0
       0,1: 0
       1,0: 0
-      1,1: 1
+      1,1: 0
       2,0: 0
-      2,1: 2
+      2,1: 0
       3,0: 0
       3,1: 0
       4,0: 0
-      4,1: 1
+      4,1: 0
       5,0: 0
-      5,1: 2
+      5,1: 0
       6,0: 0
       6,1: 0
       7,0: 0
       7,1: 0
       8,0: 0
       8,1: 0
-      8,2: 3
+      8,2: 0
       8,3: 0
       8,4: 0
       8,5: 0
@@ -7178,8 +7178,8 @@ entities:
       -4,1: 0
       -3,0: 0
       -3,1: 0
-      -2,1: 1
-      -1,1: 2
+      -2,1: 0
+      -1,1: 0
       -18,-6: 0
       -17,-6: 0
       16,-16: 0
@@ -7427,8 +7427,8 @@ entities:
       9,12: 0
       9,14: 0
       10,6: 0
-      10,7: 4
-      10,8: 3
+      10,7: 0
+      10,8: 0
       10,9: 0
       10,10: 0
       10,11: 0
@@ -8326,7 +8326,7 @@ entities:
       -20,28: 0
       -19,26: 0
       -19,27: 0
-      -19,28: 1
+      -19,28: 0
       -18,26: 0
       -18,27: 0
       -18,28: 0
@@ -8425,10 +8425,10 @@ entities:
       -7,16: 0
       -6,16: 0
       -23,21: 0
-      -23,22: 5
-      -23,23: 4
-      -23,24: 3
-      -23,25: 4
+      -23,22: 0
+      -23,23: 0
+      -23,24: 0
+      -23,25: 0
       -23,26: 0
       -22,21: 0
       -22,22: 0
@@ -11790,89 +11790,89 @@ entities:
       15,-34: 0
       15,-33: 0
       22,-36: 0
-      22,-35: 6
-      22,-34: 7
-      22,-33: 3
-      23,-36: 1
+      22,-35: 0
+      22,-34: 0
+      22,-33: 0
+      23,-36: 0
       23,-35: 0
       23,-34: 0
       23,-33: 0
-      24,-38: 8
-      24,-37: 6
-      24,-36: 9
+      24,-38: 0
+      24,-37: 0
+      24,-36: 0
       24,-35: 0
       24,-34: 0
       24,-33: 0
-      25,-39: 10
-      25,-38: 11
+      25,-39: 0
+      25,-38: 0
       25,-37: 0
       25,-36: 0
       25,-35: 0
       25,-34: 0
       25,-33: 0
-      26,-39: 12
+      26,-39: 0
       26,-38: 0
       26,-37: 0
       26,-36: 0
       26,-35: 0
       26,-34: 0
       26,-33: 0
-      27,-39: 13
+      27,-39: 0
       27,-38: 0
       27,-37: 0
       27,-36: 0
       27,-35: 0
       27,-34: 0
       27,-33: 0
-      28,-39: 14
+      28,-39: 0
       28,-38: 0
       28,-37: 0
       28,-36: 0
       28,-35: 0
       28,-34: 0
       28,-33: 0
-      29,-39: 15
+      29,-39: 0
       29,-38: 0
       29,-37: 0
       29,-36: 0
       29,-35: 0
       29,-34: 0
       29,-33: 0
-      30,-39: 16
+      30,-39: 0
       30,-38: 0
       30,-37: 0
       30,-36: 0
       30,-35: 0
       30,-34: 0
       30,-33: 0
-      31,-39: 17
+      31,-39: 0
       31,-38: 0
       31,-37: 0
       31,-36: 0
       31,-35: 0
       31,-34: 0
       31,-33: 0
-      32,-39: 18
+      32,-39: 0
       32,-38: 0
       32,-37: 0
       32,-36: 0
       32,-35: 0
       32,-34: 0
       32,-33: 0
-      33,-39: 19
-      33,-38: 20
+      33,-39: 0
+      33,-38: 0
       33,-37: 0
       33,-36: 0
       33,-35: 0
       33,-34: 0
       33,-33: 0
-      34,-38: 21
-      34,-37: 22
-      34,-36: 23
+      34,-38: 0
+      34,-37: 0
+      34,-36: 0
       34,-35: 0
       34,-34: 0
       34,-33: 0
-      35,-36: 24
+      35,-36: 0
       35,-35: 0
       35,-34: 0
       35,-33: 0
@@ -11974,7 +11974,7 @@ entities:
       40,-28: 0
       40,-27: 0
       40,-26: 0
-      41,-32: 25
+      41,-32: 0
       41,-31: 0
       41,-30: 0
       41,-29: 0
@@ -12008,8 +12008,8 @@ entities:
       40,-34: 0
       40,-33: 0
       41,-35: 0
-      41,-34: 1
-      41,-33: 7
+      41,-34: 0
+      41,-33: 0
       65,-6: 0
       66,-8: 0
       66,-7: 0
@@ -13033,7 +13033,7 @@ entities:
       84,-3: 0
       84,-2: 0
       84,-1: 0
-      85,-8: 1
+      85,-8: 0
       85,-7: 0
       85,-6: 0
       85,-5: 0
@@ -13041,7 +13041,7 @@ entities:
       85,-3: 0
       85,-2: 0
       85,-1: 0
-      86,-8: 2
+      86,-8: 0
       86,-7: 0
       86,-6: 0
       86,-5: 0
@@ -13049,7 +13049,7 @@ entities:
       86,-3: 0
       86,-2: 0
       86,-1: 0
-      87,-8: 26
+      87,-8: 0
       87,-7: 0
       87,-6: 0
       87,-5: 0
@@ -13057,7 +13057,7 @@ entities:
       87,-3: 0
       87,-2: 0
       87,-1: 0
-      88,-8: 27
+      88,-8: 0
       88,-7: 0
       88,-6: 0
       88,-5: 0
@@ -13065,7 +13065,7 @@ entities:
       88,-3: 0
       88,-2: 0
       88,-1: 0
-      89,-8: 28
+      89,-8: 0
       89,-7: 0
       89,-6: 0
       89,-5: 0
@@ -13350,27 +13350,27 @@ entities:
       73,18: 0
       73,19: 0
       73,23: 0
-      73,24: 29
-      73,25: 29
+      73,24: 1
+      73,25: 1
       73,26: 0
-      73,27: 29
-      73,28: 29
+      73,27: 1
+      73,28: 1
       73,29: 0
-      73,30: 29
-      73,31: 29
+      73,30: 1
+      73,31: 1
       74,17: 0
       74,18: 0
       74,19: 0
       74,20: 0
       74,23: 0
-      74,24: 29
-      74,25: 29
+      74,24: 1
+      74,25: 1
       74,26: 0
-      74,27: 29
-      74,28: 29
+      74,27: 1
+      74,28: 1
       74,29: 0
-      74,30: 29
-      74,31: 29
+      74,30: 1
+      74,31: 1
       75,17: 0
       75,18: 0
       75,19: 0
@@ -13720,24 +13720,24 @@ entities:
       72,40: 0
       72,41: 0
       73,32: 0
-      73,33: 30
-      73,34: 30
+      73,33: 2
+      73,34: 2
       73,35: 0
-      73,36: 31
-      73,37: 31
+      73,36: 3
+      73,37: 3
       73,38: 0
-      73,39: 29
-      73,40: 29
+      73,39: 1
+      73,40: 1
       73,41: 0
       74,32: 0
-      74,33: 30
-      74,34: 30
+      74,33: 2
+      74,34: 2
       74,35: 0
-      74,36: 31
-      74,37: 31
+      74,36: 3
+      74,37: 3
       74,38: 0
-      74,39: 29
-      74,40: 29
+      74,39: 1
+      74,40: 1
       74,41: 0
       75,32: 0
       75,33: 0
@@ -14623,314 +14623,6 @@ entities:
       - 0
       - 0
       - 0
-    - volume: 2500
-      temperature: 220.5375
-      moles:
-      - 16.36866
-      - 61.57734
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 202.38437
-      moles:
-      - 15.004604
-      - 56.445892
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 220.53749
-      moles:
-      - 16.36866
-      - 61.57734
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 202.38438
-      moles:
-      - 15.004604
-      - 56.445892
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 270.4586
-      moles:
-      - 20.11981
-      - 75.68881
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 215.99922
-      moles:
-      - 16.027645
-      - 60.29448
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 274.9969
-      moles:
-      - 20.460823
-      - 76.97167
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 201.2498
-      moles:
-      - 14.919351
-      - 56.12518
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 274.99686
-      moles:
-      - 20.460825
-      - 76.97167
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 214.79375
-      moles:
-      - 15.937064
-      - 59.95372
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 270.17493
-      moles:
-      - 20.098497
-      - 75.608635
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 200.94844
-      moles:
-      - 14.896706
-      - 56.03999
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 197.4871
-      moles:
-      - 14.636616
-      - 55.061558
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 269.23425
-      moles:
-      - 20.027813
-      - 75.34273
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 214.55856
-      moles:
-      - 15.919393
-      - 59.88724
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 200.88965
-      moles:
-      - 14.892287
-      - 56.02337
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 197.47241
-      moles:
-      - 14.635511
-      - 55.057404
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 269.2306
-      moles:
-      - 20.027538
-      - 75.34169
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 287.17014
-      moles:
-      - 21.375546
-      - 80.412766
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 291.65503
-      moles:
-      - 21.712543
-      - 81.68053
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 220.16376
-      moles:
-      - 16.340576
-      - 61.47169
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 274.90344
-      moles:
-      - 20.453804
-      - 76.94527
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 288.58838
-      moles:
-      - 21.48211
-      - 80.81366
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 292.00958
-      moles:
-      - 21.739187
-      - 81.780754
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 288.61172
-      moles:
-      - 21.483864
-      - 80.82026
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 270.4586
-      moles:
-      - 20.119812
-      - 75.68881
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 214.86465
-      moles:
-      - 15.942392
-      - 59.973763
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 200.96616
-      moles:
-      - 14.898037
-      - 56.045
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
     - volume: 2500
       temperature: 293.15
       moles:
@@ -34323,25 +34015,77 @@ entities:
     parent: 82
     type: Transform
 - uid: 2390
-  type: AirlockExternalGlassLocked
+  type: AirlockExternalGlass
   components:
   - pos: 13.5,48.5
     parent: 82
     type: Transform
 - uid: 2391
-  type: AirlockExternalGlassLocked
-  components:
-  - pos: 13.5,50.5
-    parent: 82
-    type: Transform
-- uid: 2392
-  type: AirlockExternalGlassLocked
+  type: AirlockGlassShuttle
   components:
   - pos: 15.5,50.5
     parent: 82
     type: Transform
+  - fixtures:
+    - shape: !type:PolygonShape
+        vertices:
+        - 0.49,-0.49
+        - 0.49,0.49
+        - -0.49,0.49
+        - -0.49,-0.49
+      mask:
+      - Impassable
+      - MidImpassable
+      - HighImpassable
+      - LowImpassable
+      - InteractImpassable
+      layer:
+      - MidImpassable
+      - HighImpassable
+      - BulletImpassable
+      - InteractImpassable
+      - Opaque
+      mass: 100
+    - shape: !type:PhysShapeCircle
+        position: 0,-0.5
+        radius: 0.2
+      hard: False
+      id: docking
+    type: Fixtures
+- uid: 2392
+  type: AirlockGlassShuttle
+  components:
+  - pos: 13.5,50.5
+    parent: 82
+    type: Transform
+  - fixtures:
+    - shape: !type:PolygonShape
+        vertices:
+        - 0.49,-0.49
+        - 0.49,0.49
+        - -0.49,0.49
+        - -0.49,-0.49
+      mask:
+      - Impassable
+      - MidImpassable
+      - HighImpassable
+      - LowImpassable
+      - InteractImpassable
+      layer:
+      - MidImpassable
+      - HighImpassable
+      - BulletImpassable
+      - InteractImpassable
+      - Opaque
+      mass: 100
+    - shape: !type:PhysShapeCircle
+        position: 0,-0.5
+        radius: 0.2
+      hard: False
+      id: docking
+    type: Fixtures
 - uid: 2393
-  type: AirlockExternalGlassLocked
+  type: AirlockExternalGlass
   components:
   - pos: 15.5,48.5
     parent: 82
@@ -37220,9 +36964,9 @@ entities:
     parent: 82
     type: Transform
 - uid: 2715
-  type: AirlockExternalGlassLocked
+  type: AirlockExternal
   components:
-  - pos: -4.5,46.5
+  - pos: -3.5,46.5
     parent: 82
     type: Transform
 - uid: 2716
@@ -37282,17 +37026,43 @@ entities:
     parent: 82
     type: Transform
 - uid: 2724
-  type: AirlockExternalGlassLocked
+  type: AirlockExternal
   components:
-  - pos: -3.5,46.5
+  - pos: -4.5,46.5
     parent: 82
     type: Transform
 - uid: 2725
-  type: AirlockExternalLocked
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
   - pos: -3.5,48.5
     parent: 82
     type: Transform
+  - fixtures:
+    - shape: !type:PolygonShape
+        vertices:
+        - 0.49,-0.49
+        - 0.49,0.49
+        - -0.49,0.49
+        - -0.49,-0.49
+      mask:
+      - Impassable
+      - MidImpassable
+      - HighImpassable
+      - LowImpassable
+      - InteractImpassable
+      layer:
+      - MidImpassable
+      - HighImpassable
+      - BulletImpassable
+      - InteractImpassable
+      - Opaque
+      mass: 100
+    - shape: !type:PhysShapeCircle
+        position: 0,-0.5
+        radius: 0.2
+      hard: False
+      id: docking
+    type: Fixtures
 - uid: 2726
   type: ReinforcedWindow
   components:
@@ -37312,11 +37082,37 @@ entities:
     parent: 82
     type: Transform
 - uid: 2729
-  type: AirlockExternalLocked
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
   - pos: -4.5,48.5
     parent: 82
     type: Transform
+  - fixtures:
+    - shape: !type:PolygonShape
+        vertices:
+        - 0.49,-0.49
+        - 0.49,0.49
+        - -0.49,0.49
+        - -0.49,-0.49
+      mask:
+      - Impassable
+      - MidImpassable
+      - HighImpassable
+      - LowImpassable
+      - InteractImpassable
+      layer:
+      - MidImpassable
+      - HighImpassable
+      - BulletImpassable
+      - InteractImpassable
+      - Opaque
+      mass: 100
+    - shape: !type:PhysShapeCircle
+        position: 0,-0.5
+        radius: 0.2
+      hard: False
+      id: docking
+    type: Fixtures
 - uid: 2730
   type: WallReinforced
   components:
@@ -129046,4 +128842,16 @@ entities:
     type: Transform
   - canCollide: False
     type: Physics
+- uid: 14139
+  type: PosterMapWaystation
+  components:
+  - pos: 13.5,5.5
+    parent: 82
+    type: Transform
+- uid: 14140
+  type: PosterMapWaystation
+  components:
+  - pos: -3.5,-5.5
+    parent: 82
+    type: Transform
 ...