diff --git a/Resources/Maps/corvax_avrite.yml b/Resources/Maps/corvax_avrite.yml
index 5803ac9e88d..403a43b2001 100644
--- a/Resources/Maps/corvax_avrite.yml
+++ b/Resources/Maps/corvax_avrite.yml
@@ -67946,6 +67946,26 @@ entities:
       color: '#02BD58FF'
       flags: Hide
     - type: NavMap
+    - type: Joint
+      joints:
+        docking729256: !type:WeldJoint
+          bodyB: 53899
+          bodyA: 54737
+          id: docking729256
+          localAnchorB: 3.5,-13
+          localAnchorA: -0.49999997,1
+          referenceAngle: 6.2831855
+          damping: 975.37714
+          stiffness: 8754.965
+        docking729255: !type:WeldJoint
+          bodyB: 53899
+          bodyA: 54737
+          id: docking729255
+          localAnchorB: 5.5,-13
+          localAnchorA: 1.5,1
+          referenceAngle: 6.2831855
+          damping: 975.37714
+          stiffness: 8754.965
   - uid: 54737
     components:
     - type: MetaData
@@ -68387,6 +68407,26 @@ entities:
       color: '#02BD58FF'
       flags: Hide
     - type: NavMap
+    - type: Joint
+      joints:
+        docking729256: !type:WeldJoint
+          bodyB: 53899
+          bodyA: 54737
+          id: docking729256
+          localAnchorB: -0.49999997,1
+          localAnchorA: 3.5,-13
+          referenceAngle: -6.2831855
+          damping: 975.37714
+          stiffness: 8754.965
+        docking729255: !type:WeldJoint
+          bodyB: 53899
+          bodyA: 54737
+          id: docking729255
+          localAnchorB: 1.5,1
+          localAnchorA: 5.5,-13
+          referenceAngle: -6.2831855
+          damping: 975.37714
+          stiffness: 8754.965
   - uid: 55142
     components:
     - type: MetaData
@@ -77885,30 +77925,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-3.5
       parent: 53899
-- proto: AirlockExternalShuttleLocked
-  entities:
-  - uid: 11103
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,0.5
-      parent: 53899
-  - uid: 13950
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,0.5
-      parent: 53899
-  - uid: 19101
-    components:
-    - type: Transform
-      pos: 3.5,-12.5
-      parent: 54737
-  - uid: 19367
-    components:
-    - type: Transform
-      pos: 5.5,-12.5
-      parent: 54737
 - proto: AirlockFreezer
   entities:
   - uid: 1701
@@ -80399,6 +80415,64 @@ entities:
       parent: 2
 - proto: AirlockShuttle
   entities:
+  - uid: 54735
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,0.5
+      parent: 53899
+    - type: Docking
+      dockJointId: docking729256
+      dockedWith: 54745
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: False
+        DockStatus: True
+    - type: Door
+      changeAirtight: False
+  - uid: 54736
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,0.5
+      parent: 53899
+    - type: Docking
+      dockJointId: docking729255
+      dockedWith: 54744
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: False
+        DockStatus: True
+    - type: Door
+      changeAirtight: False
+  - uid: 54744
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 54737
+    - type: Docking
+      dockJointId: docking729255
+      dockedWith: 54736
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: False
+        DockStatus: True
+    - type: Door
+      changeAirtight: False
+  - uid: 54745
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 54737
+    - type: Docking
+      dockJointId: docking729256
+      dockedWith: 54735
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: False
+        DockStatus: True
+    - type: Door
+      changeAirtight: False
   - uid: 71011
     components:
     - type: Transform
@@ -85992,18 +86066,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 68.5,50.5
       parent: 2
-  - uid: 19096
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,0.5
-      parent: 53899
-  - uid: 19098
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,0.5
-      parent: 53899
   - uid: 54759
     components:
     - type: Transform
@@ -86066,6 +86128,18 @@ entities:
     - type: Transform
       pos: -18.5,59.5
       parent: 2
+  - uid: 53916
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,0.5
+      parent: 53899
+  - uid: 53917
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,0.5
+      parent: 53899
   - uid: 67037
     components:
     - type: Transform
@@ -196817,7 +196891,7 @@ entities:
       pos: -25.5,-29.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -50229.004
+      secondsUntilStateChange: -49688.637
       state: Closing
   - uid: 23821
     components:
@@ -305532,15 +305606,6 @@ entities:
       color: '#FF0000FF'
     - type: Physics
       canCollide: False
-  - uid: 19374
-    components:
-    - type: Transform
-      parent: 11102
-    - type: LightBulb
-      lightRadius: 1.5
-      color: '#FF0000FF'
-    - type: Physics
-      canCollide: False
   - uid: 25778
     components:
     - type: Transform
@@ -305736,17 +305801,6 @@ entities:
     - type: Transform
       pos: -44.508698,6.8135505
       parent: 2
-- proto: LightTube
-  entities:
-  - uid: 19377
-    components:
-    - type: Transform
-      parent: 19376
-    - type: LightBulb
-      lightRadius: 1.5
-      color: '#FF0000FF'
-    - type: Physics
-      canCollide: False
 - proto: LightTubeBroken
   entities:
   - uid: 15014
@@ -306120,8 +306174,6 @@ entities:
         - Pressed: Toggle
         53922:
         - Pressed: Toggle
-        11102:
-        - Pressed: Toggle
   - uid: 54399
     components:
     - type: Transform
@@ -306460,7 +306512,7 @@ entities:
     - type: DeviceLinkSource
       range: 10000
       linkedPorts:
-        19376:
+        53812:
         - Pressed: Toggle
         53920:
         - Pressed: Toggle
@@ -326041,23 +326093,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 47.5,-40.5
       parent: 2
-  - uid: 19376
-    components:
-    - type: Transform
-      pos: -57.5,-5.5
-      parent: 2
-    - type: PoweredLight
-      on: False
-    - type: ContainerContainer
-      containers:
-        light_bulb: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 19377
-    - type: ApcPowerReceiver
-      powerLoad: 25
-    - type: DamageOnInteract
-      isDamageActive: False
   - uid: 21092
     components:
     - type: Transform
@@ -327480,6 +327515,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -64.5,69.5
       parent: 2
+  - uid: 53812
+    components:
+    - type: Transform
+      pos: -57.5,-5.5
+      parent: 2
+    - type: PoweredLight
+      on: False
   - uid: 54426
     components:
     - type: Transform
@@ -328847,24 +328889,6 @@ entities:
       powerLoad: 60
     - type: DamageOnInteract
       isDamageActive: False
-  - uid: 11102
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-7.5
-      parent: 2
-    - type: ContainerContainer
-      containers:
-        light_bulb: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 19374
-    - type: PoweredLight
-      on: False
-    - type: ApcPowerReceiver
-      powerLoad: 60
-    - type: DamageOnInteract
-      isDamageActive: False
   - uid: 11530
     components:
     - type: Transform
@@ -434395,6 +434419,11 @@ entities:
     - type: Transform
       pos: 52.5,14.5
       parent: 2
+  - uid: 11102
+    components:
+    - type: Transform
+      pos: 18.5,36.5
+      parent: 2
   - uid: 17453
     components:
     - type: Transform