diff --git a/Resources/Maps/_DV/Shuttles/NTES_BC20.yml b/Resources/Maps/_DV/Shuttles/NTES_BC20.yml
index adfa8a137f8..3a25b2e8222 100644
--- a/Resources/Maps/_DV/Shuttles/NTES_BC20.yml
+++ b/Resources/Maps/_DV/Shuttles/NTES_BC20.yml
@@ -25,6 +25,7 @@ entities:
   - uid: 1
     components:
     - type: MetaData
+      name: NTES BC20
     - type: Transform
       pos: 0.5104167,0.43224397
       parent: invalid
@@ -75,10 +76,10 @@ entities:
       gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
     - type: DeviceNetwork
+      deviceNetId: Wireless
       configurators: []
       deviceLists: []
       transmitFrequencyId: ShuttleTimer
-      deviceNetId: Wireless
     - type: DecalGrid
       chunkCollection:
         version: 2
@@ -682,107 +683,107 @@ entities:
     - type: Transform
       pos: 9.5,-17.5
       parent: 1
-- proto: AirlockGlass
+- proto: AirlockExternalGlassShuttleLocked
   entities:
-  - uid: 581
+  - uid: 164
     components:
     - type: Transform
-      pos: -9.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-16.5
       parent: 1
-  - uid: 590
+  - uid: 165
     components:
     - type: Transform
-      pos: 7.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-24.5
       parent: 1
-  - uid: 1046
+  - uid: 306
     components:
     - type: Transform
-      pos: -6.5,-24.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-16.5
       parent: 1
-  - uid: 1048
+  - uid: 314
     components:
     - type: Transform
-      pos: -6.5,-25.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-26.5
       parent: 1
-  - uid: 1049
+  - uid: 716
     components:
     - type: Transform
-      pos: 4.5,-25.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-18.5
       parent: 1
-  - uid: 1050
+  - uid: 1308
     components:
     - type: Transform
-      pos: 4.5,-24.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-18.5
       parent: 1
-  - uid: 1054
+  - uid: 1311
     components:
     - type: Transform
-      pos: -4.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-24.5
       parent: 1
-  - uid: 1055
+  - uid: 1353
     components:
     - type: Transform
-      pos: -4.5,-13.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-26.5
       parent: 1
-  - uid: 1056
+- proto: AirlockGlass
+  entities:
+  - uid: 581
     components:
     - type: Transform
-      pos: 2.5,-12.5
+      pos: -9.5,-16.5
       parent: 1
-  - uid: 1057
+  - uid: 590
     components:
     - type: Transform
-      pos: 2.5,-13.5
+      pos: 7.5,-16.5
       parent: 1
-- proto: AirlockGlassShuttle
-  entities:
-  - uid: 164
+  - uid: 1046
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-18.5
+      pos: -6.5,-24.5
       parent: 1
-  - uid: 165
+  - uid: 1048
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-16.5
+      pos: -6.5,-25.5
       parent: 1
-  - uid: 314
+  - uid: 1049
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-26.5
+      pos: 4.5,-25.5
       parent: 1
-  - uid: 360
+  - uid: 1050
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-24.5
+      pos: 4.5,-24.5
       parent: 1
-  - uid: 760
+  - uid: 1054
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-18.5
+      pos: -4.5,-12.5
       parent: 1
-  - uid: 821
+  - uid: 1055
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-24.5
+      pos: -4.5,-13.5
       parent: 1
-  - uid: 930
+  - uid: 1056
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-26.5
+      pos: 2.5,-12.5
       parent: 1
-  - uid: 1353
+  - uid: 1057
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-16.5
+      pos: 2.5,-13.5
       parent: 1
 - proto: AirlockMedicalGlassLocked
   entities:
@@ -855,50 +856,50 @@ entities:
   - uid: 222
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-24.5
       parent: 1
   - uid: 301
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -14.5,-18.5
+      pos: -14.5,-16.5
       parent: 1
   - uid: 303
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-18.5
       parent: 1
-  - uid: 306
+  - uid: 360
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-24.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-26.5
       parent: 1
-  - uid: 716
+  - uid: 760
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-24.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-18.5
       parent: 1
-  - uid: 1308
+  - uid: 821
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -14.5,-26.5
       parent: 1
-  - uid: 1311
+  - uid: 930
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 12.5,-16.5
       parent: 1
-  - uid: 1639
+  - uid: 1310
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-26.5
+      pos: 12.5,-24.5
       parent: 1
 - proto: AtmosFixNitrogenMarker
   entities:
@@ -5920,6 +5921,12 @@ entities:
     - type: Transform
       pos: -3.5,-34.5
       parent: 1
+  - uid: 884
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-39.5
+      parent: 1
 - proto: GasPipeBend
   entities:
   - uid: 858
@@ -8092,12 +8099,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 884
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-39.5
-      parent: 1
   - uid: 993
     components:
     - type: Transform
@@ -8974,6 +8975,13 @@ entities:
     - type: Transform
       pos: -1.0302026,-5.3806286
       parent: 1
+- proto: HolopadCentCommEvacShuttle
+  entities:
+  - uid: 1639
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 1
 - proto: HospitalCurtainsOpen
   entities:
   - uid: 1301
@@ -9427,13 +9435,6 @@ entities:
       parent: 1
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 1310
-    components:
-    - type: Transform
-      pos: 5.5,-34.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 1312
     components:
     - type: Transform
diff --git a/Resources/Maps/_DV/Shuttles/NTES_Centipede.yml b/Resources/Maps/_DV/Shuttles/NTES_Centipede.yml
index 47b628d03ff..7e6959ba4a7 100644
--- a/Resources/Maps/_DV/Shuttles/NTES_Centipede.yml
+++ b/Resources/Maps/_DV/Shuttles/NTES_Centipede.yml
@@ -85,10 +85,10 @@ entities:
       gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
     - type: DeviceNetwork
+      deviceNetId: Wireless
       configurators: []
       deviceLists: []
       transmitFrequencyId: ShuttleTimer
-      deviceNetId: Wireless
     - type: DecalGrid
       chunkCollection:
         version: 2
@@ -5358,6 +5358,13 @@ entities:
     - type: Transform
       pos: -14.386516,-29.520695
       parent: 1
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 1509
+    components:
+    - type: Transform
+      pos: -8.5,-1.5
+      parent: 1
 - proto: DisposalBend
   entities:
   - uid: 713
@@ -10759,6 +10766,13 @@ entities:
     - type: Transform
       pos: -10.532349,-3.2752516
       parent: 1
+- proto: HolopadCentCommEvacShuttle
+  entities:
+  - uid: 1510
+    components:
+    - type: Transform
+      pos: -10.5,16.5
+      parent: 1
 - proto: HospitalCurtainsOpen
   entities:
   - uid: 1561
diff --git a/Resources/Maps/_DV/Shuttles/NTES_Fishbowl.yml b/Resources/Maps/_DV/Shuttles/NTES_Fishbowl.yml
index faba26c920a..635e0ceb1cf 100644
--- a/Resources/Maps/_DV/Shuttles/NTES_Fishbowl.yml
+++ b/Resources/Maps/_DV/Shuttles/NTES_Fishbowl.yml
@@ -26,7 +26,7 @@ entities:
   - uid: 2
     components:
     - type: MetaData
-      name: grid
+      name: NTES Fishbowl
     - type: Transform
       pos: -0.52500004,-0.5562897
       parent: invalid
@@ -84,7 +84,6 @@ entities:
       configurators: []
       deviceLists: []
       transmitFrequencyId: ShuttleTimer
-      deviceNetId: Wireless
     - type: DecalGrid
       chunkCollection:
         version: 2
@@ -1040,12 +1039,17 @@ entities:
     - type: Transform
       pos: 5.5,-34.5
       parent: 2
-- proto: AirlockExternalGlassShuttleEmergencyLocked
+- proto: AirlockExternalGlassShuttleLocked
   entities:
+  - uid: 901
+    components:
+    - type: Transform
+      pos: 5.5,-37.5
+      parent: 2
   - uid: 953
     components:
     - type: Transform
-      pos: -4.5,-37.5
+      pos: 3.5,-37.5
       parent: 2
   - uid: 954
     components:
@@ -1055,12 +1059,7 @@ entities:
   - uid: 955
     components:
     - type: Transform
-      pos: 3.5,-37.5
-      parent: 2
-  - uid: 956
-    components:
-    - type: Transform
-      pos: 5.5,-37.5
+      pos: -4.5,-37.5
       parent: 2
 - proto: AirlockGlass
   entities:
@@ -1281,22 +1280,22 @@ entities:
       parent: 2
 - proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 901
+  - uid: 957
     components:
     - type: Transform
       pos: -4.5,-37.5
       parent: 2
-  - uid: 957
+  - uid: 958
     components:
     - type: Transform
       pos: -2.5,-37.5
       parent: 2
-  - uid: 958
+  - uid: 959
     components:
     - type: Transform
       pos: 3.5,-37.5
       parent: 2
-  - uid: 959
+  - uid: 960
     components:
     - type: Transform
       pos: 5.5,-37.5
@@ -4172,6 +4171,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.4654634,-10.788818
       parent: 2
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 956
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-8.5
+      parent: 2
 - proto: DrinkCreamCartonXL
   entities:
   - uid: 671
@@ -8348,6 +8355,13 @@ entities:
     - type: Transform
       pos: -10.5,-27.5
       parent: 2
+- proto: HolopadCentCommEvacShuttle
+  entities:
+  - uid: 1717
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 2
 - proto: KitchenMicrowave
   entities:
   - uid: 700
diff --git a/Resources/Maps/_DV/Shuttles/NTES_Seal.yml b/Resources/Maps/_DV/Shuttles/NTES_Seal.yml
index 5764d9c5c6d..567deb5fdcd 100644
--- a/Resources/Maps/_DV/Shuttles/NTES_Seal.yml
+++ b/Resources/Maps/_DV/Shuttles/NTES_Seal.yml
@@ -71,10 +71,10 @@ entities:
       gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
     - type: DeviceNetwork
+      deviceNetId: Wireless
       configurators: []
       deviceLists: []
       transmitFrequencyId: ShuttleTimer
-      deviceNetId: Wireless
     - type: DecalGrid
       chunkCollection:
         version: 2
@@ -3399,6 +3399,20 @@ entities:
     - type: Transform
       pos: -1.4583334,9.255774
       parent: 60
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 1082
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,4.5
+      parent: 60
+  - uid: 1083
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,4.5
+      parent: 60
 - proto: DisposalBend
   entities:
   - uid: 836
@@ -6255,6 +6269,13 @@ entities:
     - type: Transform
       pos: -13.518964,4.759436
       parent: 60
+- proto: HolopadCentCommEvacShuttle
+  entities:
+  - uid: 1084
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 60
 - proto: KitchenKnife
   entities:
   - uid: 282
diff --git a/Resources/Maps/_DV/Shuttles/NTES_UCLB.yml b/Resources/Maps/_DV/Shuttles/NTES_UCLB.yml
index 35f88ce21de..1b36546c831 100644
--- a/Resources/Maps/_DV/Shuttles/NTES_UCLB.yml
+++ b/Resources/Maps/_DV/Shuttles/NTES_UCLB.yml
@@ -75,10 +75,10 @@ entities:
       gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
     - type: DeviceNetwork
-      configurators: [ ]
-      deviceLists: [ ]
-      transmitFrequencyId: ShuttleTimer
       deviceNetId: Wireless
+      configurators: []
+      deviceLists: []
+      transmitFrequencyId: ShuttleTimer
     - type: DecalGrid
       chunkCollection:
         version: 2
@@ -931,23 +931,23 @@ entities:
     - type: Transform
       pos: -7.5,-0.5
       parent: 1
-- proto: AirlockExternalGlassShuttleEmergencyLocked
+- proto: AirlockExternalGlassShuttleLocked
   entities:
   - uid: 527
     components:
     - type: MetaData
-      name: Uncle Charlie's Luxury Boat Docks
+      name: Uncle Charlie's Luxury Boat Embarkment
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -12.5,1.5
+      pos: -12.5,-0.5
       parent: 1
   - uid: 528
     components:
     - type: MetaData
-      name: Uncle Charlie's Luxury Boat Docks
+      name: Uncle Charlie's Luxury Boat Embarkment
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -12.5,-0.5
+      pos: -12.5,1.5
       parent: 1
 - proto: AirlockFreezerLocked
   entities:
@@ -1248,29 +1248,29 @@ entities:
       parent: 1
 - proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 332
+  - uid: 323
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-15.5
       parent: 1
-  - uid: 519
+  - uid: 324
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-0.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,-12.5
       parent: 1
-- proto: AtmosDeviceFanTiny
-  entities:
-  - uid: 323
+  - uid: 332
     components:
     - type: Transform
-      pos: -4.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: -12.5,1.5
       parent: 1
-  - uid: 324
+  - uid: 519
     components:
     - type: Transform
-      pos: -2.5,-15.5
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-0.5
       parent: 1
 - proto: AtmosFixFreezerMarker
   entities:
@@ -4013,6 +4013,13 @@ entities:
     - type: Transform
       pos: 2.247139,3.256285
       parent: 1
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 1180
+    components:
+    - type: Transform
+      pos: 12.5,-14.5
+      parent: 1
 - proto: DisposalBend
   entities:
   - uid: 393
@@ -6503,8 +6510,6 @@ entities:
     - type: Transform
       pos: 3.5,-22.5
       parent: 1
-    - type: GravityGenerator
-      charge: 100
     - type: PointLight
       radius: 175.75
 - proto: Grille
@@ -6853,6 +6858,13 @@ entities:
     - type: Transform
       pos: -5.5,2.5
       parent: 1
+- proto: HolopadCentCommEvacShuttle
+  entities:
+  - uid: 1459
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 1
 - proto: KitchenDeepFryer
   entities:
   - uid: 1339