From 1e86fbe8d6411127e9914abcfb9ea8495c756a8c Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Sun, 26 Jun 2022 00:22:27 -0600
Subject: [PATCH] Saltern Evac Compat Update (#9169)

---
 Resources/Maps/saltern.yml | 159 ++++++++++++++++++++-----------------
 1 file changed, 85 insertions(+), 74 deletions(-)

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index d1bebb4daa..39c02d5e55 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -13331,16 +13331,16 @@ entities:
       -23,-21: 0
       -23,-20: 0
       -23,-19: 0
-      -45,0: 0
+      -45,0: 5
       -45,1: 0
-      -45,2: 0
+      -45,2: 5
       -45,3: 0
       -45,4: 0
       -45,6: 0
       -45,7: 0
-      -45,8: 0
+      -45,8: 5
       -45,9: 0
-      -45,10: 0
+      -45,10: 5
       -45,11: 0
       -45,12: 0
       -45,13: 0
@@ -13578,6 +13578,17 @@ entities:
       - 0
       - 0
       - 0
+    - volume: 2500
+      temperature: 220.53749
+      moles:
+      - 16.36866
+      - 61.57734
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
     type: GridAtmosphere
   - angularDamping: 100
     linearDamping: 50
@@ -16468,11 +16479,38 @@ entities:
   - radius: 2.5
     type: PointLight
 - uid: 889
-  type: AirlockExternalGlassLocked
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
-  - pos: -40.5,0.5
+  - rot: -1.5707963267948966 rad
+    pos: -44.5,2.5
     parent: 852
     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: 890
   type: CableMV
   components:
@@ -17334,38 +17372,11 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1012
-  type: AirlockExternalGlassShuttleLocked
+  type: AirlockExternalGlass
   components:
-  - rot: -1.5707963267948966 rad
-    pos: -44.5,8.5
+  - pos: -40.5,2.5
     parent: 852
     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: 1013
   type: ReinforcedWindow
   components:
@@ -21066,10 +21077,10 @@ entities:
     parent: 852
     type: Transform
 - uid: 1458
-  type: AirlockExternalGlassShuttleLocked
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
   - rot: -1.5707963267948966 rad
-    pos: -44.5,0.5
+    pos: -44.5,8.5
     parent: 852
     type: Transform
   - fixtures:
@@ -21099,38 +21110,11 @@ entities:
       id: docking
     type: Fixtures
 - uid: 1459
-  type: AirlockExternalGlassShuttleLocked
+  type: AirlockExternalGlass
   components:
-  - rot: -1.5707963267948966 rad
-    pos: -44.5,10.5
+  - pos: -40.5,0.5
     parent: 852
     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: 1460
   type: Grille
   components:
@@ -39387,9 +39371,9 @@ entities:
     parent: 852
     type: Transform
 - uid: 4009
-  type: AirlockExternalGlassLocked
+  type: AirlockExternalGlass
   components:
-  - pos: -40.5,10.5
+  - pos: -40.5,8.5
     parent: 852
     type: Transform
 - uid: 4010
@@ -77651,9 +77635,9 @@ entities:
     id: Medbay Lobby
     type: SurveillanceCamera
 - uid: 9162
-  type: AirlockExternalGlassLocked
+  type: AirlockExternalGlass
   components:
-  - pos: -40.5,8.5
+  - pos: -40.5,10.5
     parent: 852
     type: Transform
 - uid: 9163
@@ -79292,10 +79276,10 @@ entities:
     parent: 852
     type: Transform
 - uid: 9391
-  type: AirlockExternalGlassShuttleLocked
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
   - rot: -1.5707963267948966 rad
-    pos: -44.5,2.5
+    pos: -44.5,10.5
     parent: 852
     type: Transform
   - fixtures:
@@ -79325,11 +79309,38 @@ entities:
       id: docking
     type: Fixtures
 - uid: 9392
-  type: AirlockExternalGlassLocked
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
-  - pos: -40.5,2.5
+  - rot: -1.5707963267948966 rad
+    pos: -44.5,0.5
     parent: 852
     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: 9393
   type: WindowReinforcedDirectional
   components: