diff --git a/Resources/Maps/delta.yml b/Resources/Maps/delta.yml
index c19fad5055..6f864f20a8 100644
--- a/Resources/Maps/delta.yml
+++ b/Resources/Maps/delta.yml
@@ -46307,13 +46307,13 @@ entities:
     parent: 60
     type: Transform
 - uid: 1638
-  type: ClothingShoesBootsMag
+  type: AirlockMaintEngiLocked
   components:
-  - pos: -15.275852,-12.555819
+  - name: Construction Site
+    type: MetaData
+  - pos: 12.5,73.5
     parent: 60
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 1639
   type: ClothingShoesBootsMag
   components:
@@ -137596,33 +137596,7 @@ entities:
     parent: 60
     type: Transform
 - uid: 14516
-  type: AirlockShuttle
-  components:
-  - pos: 5.5,-69.5
-    parent: 60
-    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
-      layer:
-      - Impassable
-      - HighImpassable
-      - Opaque
-      mass: 100
-    - shape: !type:PhysShapeCircle
-        position: 0,-0.5
-        radius: 0.2
-      hard: False
-      id: docking
-    type: Fixtures
-- uid: 14517
-  type: AirlockShuttle
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
   - pos: 5.5,-71.5
     parent: 60
@@ -137636,9 +137610,15 @@ entities:
         - -0.49,-0.49
       mask:
       - Impassable
-      layer:
-      - Impassable
+      - MidImpassable
       - HighImpassable
+      - LowImpassable
+      - InteractImpassable
+      layer:
+      - MidImpassable
+      - HighImpassable
+      - BulletImpassable
+      - InteractImpassable
       - Opaque
       mass: 100
     - shape: !type:PhysShapeCircle
@@ -137647,8 +137627,8 @@ entities:
       hard: False
       id: docking
     type: Fixtures
-- uid: 14518
-  type: AirlockShuttle
+- uid: 14517
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
   - pos: 5.5,-77.5
     parent: 60
@@ -137662,9 +137642,15 @@ entities:
         - -0.49,-0.49
       mask:
       - Impassable
-      layer:
-      - Impassable
+      - MidImpassable
       - HighImpassable
+      - LowImpassable
+      - InteractImpassable
+      layer:
+      - MidImpassable
+      - HighImpassable
+      - BulletImpassable
+      - InteractImpassable
       - Opaque
       mass: 100
     - shape: !type:PhysShapeCircle
@@ -137673,22 +137659,28 @@ entities:
       hard: False
       id: docking
     type: Fixtures
+- uid: 14518
+  type: AirlockExternal
+  components:
+  - pos: 3.5,-71.5
+    parent: 60
+    type: Transform
 - uid: 14519
-  type: AirlockExternalLocked
+  type: AirlockExternal
   components:
   - pos: 3.5,-69.5
     parent: 60
     type: Transform
 - uid: 14520
-  type: AirlockExternalLocked
+  type: AirlockExternal
   components:
-  - pos: 3.5,-71.5
+  - pos: 3.5,-77.5
     parent: 60
     type: Transform
 - uid: 14521
-  type: AirlockExternalLocked
+  type: AirlockExternal
   components:
-  - pos: 3.5,-77.5
+  - pos: 3.5,-79.5
     parent: 60
     type: Transform
 - uid: 14522
@@ -137764,13 +137756,7 @@ entities:
     parent: 60
     type: Transform
 - uid: 14534
-  type: AirlockExternalLocked
-  components:
-  - pos: 3.5,-79.5
-    parent: 60
-    type: Transform
-- uid: 14535
-  type: AirlockShuttle
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
   - pos: 5.5,-79.5
     parent: 60
@@ -137784,9 +137770,47 @@ entities:
         - -0.49,-0.49
       mask:
       - Impassable
-      layer:
-      - 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: 14535
+  type: AirlockExternalGlassShuttleEmergencyLocked
+  components:
+  - pos: 5.5,-69.5
+    parent: 60
+    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
@@ -148256,18 +148280,33 @@ entities:
   - pos: 22.5,32.5
     parent: 60
     type: Transform
+  - containers:
+      entity_storage: !type:Container
+        ents:
+        - 33882
+    type: ContainerContainer
 - uid: 16117
   type: LockerSalvageSpecialistFilled
   components:
   - pos: 23.5,32.5
     parent: 60
     type: Transform
+  - containers:
+      entity_storage: !type:Container
+        ents:
+        - 33883
+    type: ContainerContainer
 - uid: 16118
   type: LockerSalvageSpecialistFilled
   components:
   - pos: 24.5,32.5
     parent: 60
     type: Transform
+  - containers:
+      entity_storage: !type:Container
+        ents:
+        - 33884
+    type: ContainerContainer
 - uid: 16119
   type: Table
   components:
@@ -150856,9 +150895,7 @@ entities:
         ents: []
     type: ContainerContainer
   - outputs:
-      OrderSender:
-      - port: OrderReceiver
-        uid: 16646
+      OrderSender: []
     type: SignalTransmitter
 - uid: 16488
   type: ChairOfficeDark
@@ -152002,27 +152039,19 @@ entities:
         ents: []
     type: ContainerContainer
   - outputs:
-      OrderSender:
-      - port: OrderReceiver
-        uid: 16646
+      OrderSender: []
     type: SignalTransmitter
 - uid: 16646
-  type: CargoTelepad
+  type: ComputerCargoShuttle
   components:
-  - pos: 18.5,40.5
+  - rot: -1.5707963267948966 rad
+    pos: 29.5,37.5
     parent: 60
     type: Transform
-  - canCollide: False
-    type: Physics
-  - inputs:
-      OrderReceiver:
-      - port: OrderSender
-        uid: 16645
-      - port: OrderSender
-        uid: 17120
-      - port: OrderSender
-        uid: 16487
-    type: SignalReceiver
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 16647
   type: TableReinforced
   components:
@@ -154294,7 +154323,7 @@ entities:
         uid: 30426
     type: SignalReceiver
 - uid: 16949
-  type: ComputerCargoOrders
+  type: ComputerCargoShuttle
   components:
   - rot: -1.5707963267948966 rad
     pos: 25.5,48.5
@@ -154304,9 +154333,6 @@ entities:
       board: !type:Container
         ents: []
     type: ContainerContainer
-  - outputs:
-      OrderSender: []
-    type: SignalTransmitter
 - uid: 16950
   type: SignalButton
   components:
@@ -155436,18 +155462,13 @@ entities:
   type: ComputerCargoOrders
   components:
   - rot: -1.5707963267948966 rad
-    pos: 29.5,37.5
+    pos: 29.5,35.5
     parent: 60
     type: Transform
   - containers:
       board: !type:Container
         ents: []
     type: ContainerContainer
-  - outputs:
-      OrderSender:
-      - port: OrderReceiver
-        uid: 16646
-    type: SignalTransmitter
 - uid: 17121
   type: TableReinforced
   components:
@@ -158395,13 +158416,13 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 17469
-  type: AirlockMaintLocked
+  type: JetpackBlackFilled
   components:
-  - name: Construction Site
-    type: MetaData
-  - pos: 12.5,73.5
+  - pos: -15.562287,-14.51297
     parent: 60
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 17470
   type: Grille
   components:
@@ -244228,9 +244249,9 @@ entities:
   - color: '#FF0303FF'
     type: AtmosPipeColor
 - uid: 28671
-  type: SpaceCash1000000
+  type: JetpackBlackFilled
   components:
-  - pos: 26.514534,20.805977
+  - pos: -15.781037,-14.309845
     parent: 60
     type: Transform
   - canCollide: False
@@ -284764,4 +284785,126 @@ entities:
       ballistic-ammo: !type:Container
         ents: []
     type: ContainerContainer
+- uid: 33873
+  type: JetpackBlackFilled
+  components:
+  - pos: -15.374787,-14.684845
+    parent: 60
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 33874
+  type: JetpackSecurityFilled
+  components:
+  - pos: 62.5,13.5
+    parent: 60
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 33875
+  type: JetpackSecurityFilled
+  components:
+  - pos: 63.5,13.5
+    parent: 60
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 33876
+  type: JetpackSecurityFilled
+  components:
+  - pos: 64.5,13.5
+    parent: 60
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 33877
+  type: VendingMachineTankDispenserEVA
+  components:
+  - name: tank dispenser
+    type: MetaData
+  - pos: 62.5,11.5
+    parent: 60
+    type: Transform
+- uid: 33878
+  type: JetpackBlackFilled
+  components:
+  - pos: -45.644173,-15.312348
+    parent: 60
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 33879
+  type: JetpackBlackFilled
+  components:
+  - pos: -45.394173,-15.562348
+    parent: 60
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 33880
+  type: JetpackBlackFilled
+  components:
+  - pos: -52.50269,36.617466
+    parent: 60
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 33881
+  type: ComputerShuttleCargo
+  components:
+  - pos: 19.5,39.5
+    parent: 60
+    type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 33882
+  type: JetpackMiniFilled
+  components:
+  - parent: 16116
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 33883
+  type: JetpackMiniFilled
+  components:
+  - parent: 16117
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 33884
+  type: JetpackMiniFilled
+  components:
+  - parent: 16118
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 33885
+  type: JetpackVoidFilled
+  components:
+  - pos: -32.506897,-76.54749
+    parent: 60
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 33886
+  type: JetpackBlueFilled
+  components:
+  - pos: -64.52269,4.6398
+    parent: 60
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 33887
+  type: Claymore
+  components:
+  - desc: This sword, one of the rare maintenance weapons, came from the body of George the Honkless, the pale white clown who betrayed his own.
+    name: Large Sword of Maintlight
+    type: MetaData
+  - pos: -75.50273,4.491991
+    parent: 60
+    type: Transform
+  - canCollide: False
+    type: Physics
 ...