diff --git a/Resources/Maps/centcomm.yml b/Resources/Maps/centcomm.yml
index 436cb1f0485..254a84f1954 100644
--- a/Resources/Maps/centcomm.yml
+++ b/Resources/Maps/centcomm.yml
@@ -3153,6 +3153,21 @@ entities:
     - type: Transform
       pos: 16.5,-6.5
       parent: 2
+  - uid: 131
+    components:
+    - type: Transform
+      pos: 4.5,-8.5
+      parent: 2
+  - uid: 132
+    components:
+    - type: Transform
+      pos: 14.5,-3.5
+      parent: 2
+  - uid: 133
+    components:
+    - type: Transform
+      pos: 12.5,-3.5
+      parent: 2
 - proto: AirlockCCSecurityLocked
   entities:
   - uid: 39
@@ -3741,32 +3756,6 @@ entities:
     - type: Transform
       pos: -15.5,-32.5
       parent: 2
-- proto: AirlockMedicalGlassLocked
-  entities:
-  - uid: 131
-    components:
-    - type: Transform
-      pos: 12.5,-3.5
-      parent: 2
-    - type: AccessReader
-      access:
-      - - CentralCommand
-  - uid: 132
-    components:
-    - type: Transform
-      pos: 14.5,-3.5
-      parent: 2
-    - type: AccessReader
-      access:
-      - - CentralCommand
-  - uid: 133
-    components:
-    - type: Transform
-      pos: 4.5,-8.5
-      parent: 2
-    - type: AccessReader
-      access:
-      - - CentralCommand
 - proto: APCBasic
   entities:
   - uid: 134
@@ -21327,26 +21316,6 @@ entities:
     - type: AccessReader
       access:
       - - CentralCommand
-- proto: ComputerCargoShuttle
-  entities:
-  - uid: 3428
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,12.5
-      parent: 2
-    - type: AccessReader
-      access:
-      - - CentralCommand
-  - uid: 3429
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -12.5,14.5
-      parent: 2
-    - type: AccessReader
-      access:
-      - - CentralCommand
 - proto: ComputerCloningConsole
   entities:
   - uid: 3430
@@ -21545,6 +21514,24 @@ entities:
       parent: 2
 - proto: ComputerShipyard
   entities:
+  - uid: 3428
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,12.5
+      parent: 2
+    - type: AccessReader
+      access:
+      - - CentralCommand
+  - uid: 3429
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,14.5
+      parent: 2
+    - type: AccessReader
+      access:
+      - - CentralCommand
   - uid: 3454
     components:
     - type: Transform
@@ -28133,7 +28120,7 @@ entities:
     - type: AccessReader
       access:
       - - CCSecurity
-- proto: GunSafeSubMachineGunDrozd
+- proto: GunSafeSubMachineGunVector
   entities:
   - uid: 4390
     components: