diff --git a/Resources/Maps/corvax_astra.yml b/Resources/Maps/corvax_astra.yml
index 0b95636ba3f..1d3a24baf9f 100644
--- a/Resources/Maps/corvax_astra.yml
+++ b/Resources/Maps/corvax_astra.yml
@@ -91488,6 +91488,13 @@ entities:
     - type: Transform
       pos: -86.5,-7.5
       parent: 2
+- proto: CaptainDrobe
+  entities:
+  - uid: 43353
+    components:
+    - type: Transform
+      pos: 16.5,11.5
+      parent: 2
 - proto: CaptainIDCard
   entities:
   - uid: 12537
@@ -133317,13 +133324,6 @@ entities:
           occludes: True
           ents:
           - 18699
-- proto: DresserCaptainFilled
-  entities:
-  - uid: 43353
-    components:
-    - type: Transform
-      pos: 16.5,11.5
-      parent: 2
 - proto: DresserChiefEngineerFilled
   entities:
   - uid: 18701
@@ -214754,7 +214754,7 @@ entities:
       pos: 3.5,-52.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -170854.81
+      secondsUntilStateChange: -171206.73
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -214765,7 +214765,7 @@ entities:
       pos: 2.5,-52.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -170855.55
+      secondsUntilStateChange: -171207.47
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -290734,29 +290734,35 @@ entities:
     - type: Transform
       pos: 5.7313232,-10.509827
       parent: 40828
-- proto: WeaponTurretHostile
+- proto: WeaponTurretControl
   entities:
-  - uid: 28818
+  - uid: 30795
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 19.5,19.5
+      pos: 101.5,-90.5
       parent: 2
-  - uid: 39557
+  - uid: 31716
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 101.5,-90.5
+      pos: 96.5,-86.5
       parent: 2
-  - uid: 39560
+  - uid: 39565
     components:
     - type: Transform
-      pos: 14.5,-27.5
+      pos: 102.5,-78.5
       parent: 2
-  - uid: 39561
+- proto: WeaponTurretHostile
+  entities:
+  - uid: 28818
     components:
     - type: Transform
-      pos: 96.5,-86.5
+      rot: -1.5707963267948966 rad
+      pos: 19.5,19.5
+      parent: 2
+  - uid: 39560
+    components:
+    - type: Transform
+      pos: 14.5,-27.5
       parent: 2
   - uid: 41605
     components:
@@ -290838,27 +290844,6 @@ entities:
       parent: 40828
 - proto: WeaponTurretNanoTrasen
   entities:
-  - uid: 30795
-    components:
-    - type: Transform
-      pos: 96.5,-74.5
-      parent: 2
-  - uid: 31716
-    components:
-    - type: Transform
-      pos: 102.5,-78.5
-      parent: 2
-  - uid: 39564
-    components:
-    - type: Transform
-      pos: 100.5,-74.5
-      parent: 2
-  - uid: 39565
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 94.5,-78.5
-      parent: 2
   - uid: 39566
     components:
     - type: Transform
@@ -290890,6 +290875,21 @@ entities:
       parent: 40828
 - proto: WeaponTurretSyndicateBroken
   entities:
+  - uid: 39557
+    components:
+    - type: Transform
+      pos: 94.5,-78.5
+      parent: 2
+  - uid: 39561
+    components:
+    - type: Transform
+      pos: 100.5,-74.5
+      parent: 2
+  - uid: 39564
+    components:
+    - type: Transform
+      pos: 96.5,-74.5
+      parent: 2
   - uid: 39567
     components:
     - type: Transform
@@ -292111,51 +292111,6 @@ entities:
     - type: Transform
       pos: 49.5,-16.5
       parent: 2
-  - uid: 39739
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 100.5,-75.5
-      parent: 2
-  - uid: 39740
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 100.5,-74.5
-      parent: 2
-  - uid: 39741
-    components:
-    - type: Transform
-      pos: 96.5,-86.5
-      parent: 2
-  - uid: 39742
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 101.5,-90.5
-      parent: 2
-  - uid: 39743
-    components:
-    - type: Transform
-      pos: 94.5,-78.5
-      parent: 2
-  - uid: 39744
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 101.5,-78.5
-      parent: 2
-  - uid: 39745
-    components:
-    - type: Transform
-      pos: 102.5,-78.5
-      parent: 2
-  - uid: 39746
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 95.5,-78.5
-      parent: 2
   - uid: 39747
     components:
     - type: Transform
@@ -292173,36 +292128,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 90.5,-81.5
       parent: 2
-  - uid: 39750
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 96.5,-86.5
-      parent: 2
-  - uid: 39751
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 96.5,-86.5
-      parent: 2
-  - uid: 39752
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 101.5,-90.5
-      parent: 2
-  - uid: 39753
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 96.5,-74.5
-      parent: 2
-  - uid: 39754
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 96.5,-75.5
-      parent: 2
   - uid: 39755
     components:
     - type: Transform
diff --git a/Resources/Maps/corvax_avrite.yml b/Resources/Maps/corvax_avrite.yml
index 213457c01a0..be0e11dc255 100644
--- a/Resources/Maps/corvax_avrite.yml
+++ b/Resources/Maps/corvax_avrite.yml
@@ -42713,36 +42713,6 @@ entities:
             40402: -108.70087,14.898306
             40403: -108.5967,15.148306
             40404: -108.46476,15.176084
-        - node:
-            zIndex: -1
-            color: '#FFFFFF0F'
-            id: smallbrush
-          decals:
-            69656: 27.592266,36.859283
-            69657: 27.654766,36.7447
-            69658: 27.852682,36.97387
-            69659: 28.008932,37.015533
-            69660: 28.08185,36.91137
-            69661: 28.0506,37.00512
-            69662: 28.561016,37.09887
-            69663: 29.029766,36.953033
-            69664: 28.8006,36.94262
-            69665: 29.373516,37.08845
-            69666: 29.4256,37.09887
-            69667: 29.1756,37.22387
-            69668: 29.040182,37.16137
-            69669: 29.133932,37.28637
-            69670: 29.373516,37.296783
-            69671: 29.70685,37.28637
-            69672: 29.89435,37.28637
-            69673: 30.133934,37.296783
-            69674: 30.248516,37.328033
-            69676: 27.540182,36.59887
-            69677: 27.842266,36.59887
-            69678: 28.311016,36.671783
-            69679: 28.133932,36.796783
-            69680: 28.123516,36.8697
-            69684: 24.508932,36.765533
         - node:
             zIndex: -1
             color: '#FFFFFF0F'
@@ -42796,6 +42766,31 @@ entities:
             68059: 4.3150287,76.497795
             68060: 3.2941954,77.03947
             68061: 3.0928066,77.16447
+            69656: 27.592266,36.859283
+            69657: 27.654766,36.7447
+            69658: 27.852682,36.97387
+            69659: 28.008932,37.015533
+            69660: 28.08185,36.91137
+            69661: 28.0506,37.00512
+            69662: 28.561016,37.09887
+            69663: 29.029766,36.953033
+            69664: 28.8006,36.94262
+            69665: 29.373516,37.08845
+            69666: 29.4256,37.09887
+            69667: 29.1756,37.22387
+            69668: 29.040182,37.16137
+            69669: 29.133932,37.28637
+            69670: 29.373516,37.296783
+            69671: 29.70685,37.28637
+            69672: 29.89435,37.28637
+            69673: 30.133934,37.296783
+            69674: 30.248516,37.328033
+            69676: 27.540182,36.59887
+            69677: 27.842266,36.59887
+            69678: 28.311016,36.671783
+            69679: 28.133932,36.796783
+            69680: 28.123516,36.8697
+            69684: 24.508932,36.765533
         - node:
             color: '#FFFFFF0F'
             id: smallbrush
@@ -42889,10 +42884,6 @@ entities:
             43087: -9.869963,-33.790455
             43088: -9.52274,-33.8599
             43089: -10.02274,-34.130733
-        - node:
-            color: '#FFFFFF0F'
-            id: smallbrush
-          decals:
             69686: 24.842266,36.75512
             69687: 24.932545,36.637062
             69688: 25.071432,36.58845
@@ -46227,11 +46218,6 @@ entities:
             39960: -99.59536,2.0583434
             39961: -99.47731,2.0513992
             39962: -99.59536,1.8708434
-        - node:
-            zIndex: -1
-            color: '#FFFFFF34'
-            id: smallbrush
-          decals:
             69538: 30.258934,37.00512
             69539: 30.092266,36.81762
             69540: 29.915184,36.72387
@@ -60704,16 +60690,6 @@ entities:
             id: splatter
           decals:
             60720: -14.989126,-3.7459636
-        - node:
-            zIndex: -1
-            color: '#FFFFFF34'
-            id: splatter
-          decals:
-            69603: 23.842266,36.84887
-            69604: 29.76935,36.8072
-            69605: 29.248516,36.6822
-            69606: 28.83185,36.578033
-            69609: 27.4256,36.9947
         - node:
             zIndex: -1
             color: '#FFFFFF34'
@@ -60803,6 +60779,11 @@ entities:
             66467: -7.006586,84.93782
             66468: -6.631586,85.15657
             66469: -5.959711,85.28157
+            69603: 23.842266,36.84887
+            69604: 29.76935,36.8072
+            69605: 29.248516,36.6822
+            69606: 28.83185,36.578033
+            69609: 27.4256,36.9947
         - node:
             color: '#FFFFFF34'
             id: splatter
@@ -165448,6 +165429,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.4513855,3.4390411
       parent: 71010
+- proto: CaptainDrobe
+  entities:
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 2
 - proto: CaptainIDCard
   entities:
   - uid: 18652
@@ -196910,7 +196898,7 @@ entities:
       pos: -25.5,-29.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -49632.164
+      secondsUntilStateChange: -49782.535
       state: Closing
   - uid: 23821
     components:
@@ -215463,13 +215451,6 @@ entities:
           - 9749
           - 52796
           - 52874
-- proto: DresserCaptainFilled
-  entities:
-  - uid: 97
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 2
 - proto: DresserChiefEngineerFilled
   entities:
   - uid: 14154
@@ -333739,98 +333720,6 @@ entities:
     - type: Transform
       pos: 98.5,-53.5
       parent: 2
-  - uid: 56463
-    components:
-    - type: Transform
-      pos: 111.5,-57.5
-      parent: 2
-  - uid: 56464
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 111.5,-55.5
-      parent: 2
-  - uid: 56465
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 125.5,-55.5
-      parent: 2
-  - uid: 56466
-    components:
-    - type: Transform
-      pos: 125.5,-57.5
-      parent: 2
-  - uid: 56467
-    components:
-    - type: Transform
-      pos: 127.5,-58.5
-      parent: 2
-  - uid: 56468
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 128.5,-59.5
-      parent: 2
-  - uid: 56469
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 134.5,-58.5
-      parent: 2
-  - uid: 56470
-    components:
-    - type: Transform
-      pos: 135.5,-57.5
-      parent: 2
-  - uid: 56471
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 135.5,-55.5
-      parent: 2
-  - uid: 56472
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 134.5,-54.5
-      parent: 2
-  - uid: 56473
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 128.5,-53.5
-      parent: 2
-  - uid: 56474
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 127.5,-54.5
-      parent: 2
-  - uid: 56496
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 124.5,-51.5
-      parent: 2
-  - uid: 56497
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 112.5,-51.5
-      parent: 2
-  - uid: 56498
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 112.5,-61.5
-      parent: 2
-  - uid: 56499
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 124.5,-61.5
-      parent: 2
   - uid: 58242
     components:
     - type: Transform
@@ -335464,23 +335353,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -63.5,-6.5
       parent: 2
-  - uid: 30601
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 128.5,-58.5
-      parent: 2
-  - uid: 30604
-    components:
-    - type: Transform
-      pos: 128.5,-54.5
-      parent: 2
-  - uid: 30605
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 134.5,-55.5
-      parent: 2
   - uid: 31110
     components:
     - type: Transform
@@ -335550,18 +335422,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 23.5,10.5
       parent: 2
-  - uid: 55597
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 134.5,-59.5
-      parent: 2
-  - uid: 55598
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 134.5,-57.5
-      parent: 2
   - uid: 56337
     components:
     - type: Transform
@@ -335585,35 +335445,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,3.5
       parent: 56001
-  - uid: 56475
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 134.5,-53.5
-      parent: 2
-  - uid: 56476
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 124.5,-57.5
-      parent: 2
-  - uid: 56477
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 112.5,-57.5
-      parent: 2
-  - uid: 56478
-    components:
-    - type: Transform
-      pos: 112.5,-55.5
-      parent: 2
-  - uid: 56479
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 124.5,-55.5
-      parent: 2
   - uid: 56480
     components:
     - type: Transform
@@ -335660,52 +335491,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 99.5,-57.5
       parent: 2
-  - uid: 56488
-    components:
-    - type: Transform
-      pos: 112.5,-62.5
-      parent: 2
-  - uid: 56489
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 124.5,-62.5
-      parent: 2
-  - uid: 56490
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 124.5,-60.5
-      parent: 2
-  - uid: 56491
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 112.5,-60.5
-      parent: 2
-  - uid: 56492
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 112.5,-50.5
-      parent: 2
-  - uid: 56493
-    components:
-    - type: Transform
-      pos: 112.5,-52.5
-      parent: 2
-  - uid: 56494
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 124.5,-52.5
-      parent: 2
-  - uid: 56495
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 124.5,-50.5
-      parent: 2
   - uid: 58243
     components:
     - type: Transform
@@ -348682,22 +348467,6 @@ entities:
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        44554:
-        - Pressed: Toggle
-        45282:
-        - Pressed: Toggle
-        44508:
-        - Pressed: Toggle
-        44493:
-        - Pressed: Toggle
-        44484:
-        - Pressed: Toggle
-        44471:
-        - Pressed: Toggle
-        44435:
-        - Pressed: Toggle
-        44460:
-        - Pressed: Toggle
         18293:
         - Pressed: Close
   - uid: 24683
@@ -348710,22 +348479,6 @@ entities:
     - type: DeviceLinkSource
       range: 40
       linkedPorts:
-        13579:
-        - Pressed: Toggle
-        44044:
-        - Pressed: Toggle
-        30743:
-        - Pressed: Toggle
-        13736:
-        - Pressed: Toggle
-        41434:
-        - Pressed: Toggle
-        30629:
-        - Pressed: Toggle
-        31436:
-        - Pressed: Toggle
-        31411:
-        - Pressed: Toggle
         36323:
         - Pressed: Toggle
         31435:
@@ -433988,6 +433741,23 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: WeaponTurretControl
+  entities:
+  - uid: 11102
+    components:
+    - type: Transform
+      pos: 135.5,-58.5
+      parent: 2
+  - uid: 11103
+    components:
+    - type: Transform
+      pos: 127.5,-59.5
+      parent: 2
+  - uid: 19367
+    components:
+    - type: Transform
+      pos: 127.5,-53.5
+      parent: 2
 - proto: WeaponTurretHostile
   entities:
   - uid: 9481
@@ -434007,17 +433777,6 @@ entities:
     - type: Transform
       pos: 98.5,-54.5
       parent: 2
-  - uid: 43277
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 127.5,-59.5
-      parent: 2
-  - uid: 43776
-    components:
-    - type: Transform
-      pos: 127.5,-53.5
-      parent: 2
   - uid: 54668
     components:
     - type: Transform
@@ -434110,64 +433869,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,15.5
       parent: 53899
-  - uid: 55578
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 135.5,-54.5
-      parent: 2
-  - uid: 55580
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 135.5,-58.5
-      parent: 2
-  - uid: 55582
-    components:
-    - type: Transform
-      pos: 111.5,-54.5
-      parent: 2
-  - uid: 55583
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 111.5,-61.5
-      parent: 2
-  - uid: 55584
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 125.5,-61.5
-      parent: 2
-  - uid: 55585
-    components:
-    - type: Transform
-      pos: 125.5,-54.5
-      parent: 2
-  - uid: 55586
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 125.5,-58.5
-      parent: 2
-  - uid: 55587
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 111.5,-58.5
-      parent: 2
-  - uid: 55588
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 111.5,-51.5
-      parent: 2
-  - uid: 55589
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 125.5,-51.5
-      parent: 2
 - proto: WeaponTurretNanoTrasen
   entities:
   - uid: 23319
@@ -434182,12 +433883,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 102.5,-61.5
       parent: 2
-  - uid: 24607
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 129.5,-56.5
-      parent: 2
   - uid: 24608
     components:
     - type: Transform
@@ -434246,6 +433941,21 @@ entities:
     - type: Transform
       pos: 34.5,-39.5
       parent: 2
+  - uid: 13579
+    components:
+    - type: Transform
+      pos: 125.5,-54.5
+      parent: 2
+  - uid: 13736
+    components:
+    - type: Transform
+      pos: 111.5,-54.5
+      parent: 2
+  - uid: 13950
+    components:
+    - type: Transform
+      pos: 125.5,-51.5
+      parent: 2
   - uid: 15006
     components:
     - type: Transform
@@ -434256,6 +433966,41 @@ entities:
     - type: Transform
       pos: 11.5,-75.5
       parent: 2
+  - uid: 19096
+    components:
+    - type: Transform
+      pos: 135.5,-54.5
+      parent: 2
+  - uid: 19098
+    components:
+    - type: Transform
+      pos: 125.5,-58.5
+      parent: 2
+  - uid: 19101
+    components:
+    - type: Transform
+      pos: 111.5,-58.5
+      parent: 2
+  - uid: 19374
+    components:
+    - type: Transform
+      pos: 125.5,-61.5
+      parent: 2
+  - uid: 19376
+    components:
+    - type: Transform
+      pos: 129.5,-56.5
+      parent: 2
+  - uid: 19377
+    components:
+    - type: Transform
+      pos: 111.5,-61.5
+      parent: 2
+  - uid: 19378
+    components:
+    - type: Transform
+      pos: 111.5,-51.5
+      parent: 2
   - uid: 25934
     components:
     - type: Transform
@@ -435018,17 +434763,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -49.5,-33.5
       parent: 2
-  - uid: 13579
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 125.5,-55.5
-      parent: 2
-  - uid: 13736
-    components:
-    - type: Transform
-      pos: 111.5,-57.5
-      parent: 2
   - uid: 20221
     components:
     - type: Transform
@@ -435055,36 +434789,12 @@ entities:
     - type: Transform
       pos: -56.5,-32.5
       parent: 2
-  - uid: 30629
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 124.5,-61.5
-      parent: 2
-  - uid: 30743
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 111.5,-55.5
-      parent: 2
-  - uid: 31411
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 112.5,-51.5
-      parent: 2
   - uid: 31435
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 98.5,-59.5
       parent: 2
-  - uid: 31436
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 124.5,-51.5
-      parent: 2
   - uid: 31439
     components:
     - type: Transform
@@ -435113,63 +434823,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,9.5
       parent: 2
-  - uid: 41434
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 112.5,-61.5
-      parent: 2
-  - uid: 44044
-    components:
-    - type: Transform
-      pos: 125.5,-57.5
-      parent: 2
-  - uid: 44435
-    components:
-    - type: Transform
-      pos: 127.5,-58.5
-      parent: 2
-  - uid: 44460
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 128.5,-59.5
-      parent: 2
-  - uid: 44471
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 127.5,-54.5
-      parent: 2
-  - uid: 44484
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 128.5,-53.5
-      parent: 2
-  - uid: 44493
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 134.5,-54.5
-      parent: 2
-  - uid: 44508
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 135.5,-55.5
-      parent: 2
-  - uid: 44554
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 134.5,-58.5
-      parent: 2
-  - uid: 45282
-    components:
-    - type: Transform
-      pos: 135.5,-57.5
-      parent: 2
 - proto: WindoorSecureAtmosphericsLocked
   entities:
   - uid: 11106
diff --git a/Resources/Maps/corvax_awesome.yml b/Resources/Maps/corvax_awesome.yml
index b7b0889834d..f84e6c41ae7 100644
--- a/Resources/Maps/corvax_awesome.yml
+++ b/Resources/Maps/corvax_awesome.yml
@@ -38207,6 +38207,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: CaptainDrobe
+  entities:
+  - uid: 7262
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 2
 - proto: CaptainIDCard
   entities:
   - uid: 5001
@@ -55123,13 +55130,6 @@ entities:
     - type: Transform
       pos: 1.571956,-18.370005
       parent: 2
-- proto: DresserCaptainFilled
-  entities:
-  - uid: 7262
-    components:
-    - type: Transform
-      pos: -1.5,-9.5
-      parent: 2
 - proto: DresserChiefEngineerFilled
   entities:
   - uid: 7263
@@ -90217,30 +90217,6 @@ entities:
       parent: 17469
 - proto: PlasmaWindoorSecureCentralCommandLocked
   entities:
-  - uid: 11657
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -33.5,-35.5
-      parent: 2
-  - uid: 11658
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -35.5,-37.5
-      parent: 2
-  - uid: 11659
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -35.5,-37.5
-      parent: 2
-  - uid: 11660
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -37.5,-35.5
-      parent: 2
   - uid: 11661
     components:
     - type: Transform
@@ -101748,16 +101724,8 @@ entities:
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        11659:
-        - Pressed: Toggle
-        11658:
-        - Pressed: Toggle
         11661:
         - Pressed: Toggle
-        11660:
-        - Pressed: Toggle
-        11657:
-        - Pressed: Toggle
         11663:
         - Pressed: Toggle
         11662:
@@ -102785,7 +102753,6 @@ entities:
     - type: EntityStorage
       air:
         volume: 200
-        immutable: False
         temperature: 293.14673
         moles:
         - 1.7459903
@@ -102800,11 +102767,13 @@ entities:
         - 0
         - 0
         - 0
+      closeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/closetclose.ogg
+      openSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/closetopen.ogg
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
-          showEnts: False
-          occludes: True
           ents:
           - 7798
           - 7796
@@ -102833,8 +102802,6 @@ entities:
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
-          showEnts: False
-          occludes: True
           ents:
           - 17883
           - 17882
@@ -125828,6 +125795,23 @@ entities:
     - type: Transform
       pos: 27.479004,17.441895
       parent: 16898
+- proto: WeaponTurretControl
+  entities:
+  - uid: 11657
+    components:
+    - type: Transform
+      pos: -35.5,-37.5
+      parent: 2
+  - uid: 11658
+    components:
+    - type: Transform
+      pos: -37.5,-35.5
+      parent: 2
+  - uid: 11659
+    components:
+    - type: Transform
+      pos: -33.5,-35.5
+      parent: 2
 - proto: WeaponTurretHostile
   entities:
   - uid: 17448
@@ -125892,16 +125876,6 @@ entities:
     - type: Transform
       pos: -35.5,-42.5
       parent: 2
-  - uid: 16534
-    components:
-    - type: Transform
-      pos: -37.5,-35.5
-      parent: 2
-  - uid: 16535
-    components:
-    - type: Transform
-      pos: -35.5,-37.5
-      parent: 2
 - proto: WeaponTurretSyndicateBroken
   entities:
   - uid: 16536
diff --git a/Resources/Maps/corvax_delta.yml b/Resources/Maps/corvax_delta.yml
index db8d4d4f1e2..2257620a92d 100644
--- a/Resources/Maps/corvax_delta.yml
+++ b/Resources/Maps/corvax_delta.yml
@@ -104681,6 +104681,13 @@ entities:
     - type: Transform
       pos: -7.5,-39.5
       parent: 2
+- proto: CaptainDrobe
+  entities:
+  - uid: 17362
+    components:
+    - type: Transform
+      pos: 13.5,0.5
+      parent: 2
 - proto: CaptainIDCard
   entities:
   - uid: 12493
@@ -136778,13 +136785,6 @@ entities:
     - type: Transform
       pos: 89.5,-4.5
       parent: 2
-- proto: DresserCaptainFilled
-  entities:
-  - uid: 17362
-    components:
-    - type: Transform
-      pos: 13.5,0.5
-      parent: 2
 - proto: DresserChiefEngineerFilled
   entities:
   - uid: 17363
@@ -280270,25 +280270,30 @@ entities:
     - type: Transform
       pos: 65.5,7.5
       parent: 2
-- proto: WeaponTurretHostile
+- proto: WeaponTurretControl
   entities:
-  - uid: 37744
+  - uid: 33710
     components:
     - type: Transform
-      pos: 9.5,-79.5
+      pos: -122.5,50.5
       parent: 2
-- proto: WeaponTurretNanoTrasen
-  entities:
-  - uid: 33710
+  - uid: 37748
     components:
     - type: Transform
-      pos: -122.5,50.5
+      pos: -114.5,50.5
       parent: 2
   - uid: 37749
     components:
     - type: Transform
       pos: -118.5,46.5
       parent: 2
+- proto: WeaponTurretHostile
+  entities:
+  - uid: 37744
+    components:
+    - type: Transform
+      pos: 9.5,-79.5
+      parent: 2
 - proto: WeaponTurretSyndicateBroken
   entities:
   - uid: 37745
@@ -280306,11 +280311,6 @@ entities:
     - type: Transform
       pos: -43.5,-38.5
       parent: 2
-  - uid: 37748
-    components:
-    - type: Transform
-      pos: -114.5,50.5
-      parent: 2
   - uid: 37750
     components:
     - type: Transform
diff --git a/Resources/Maps/corvax_maus.yml b/Resources/Maps/corvax_maus.yml
index 1035e0e3b09..e4f4e7f216e 100644
--- a/Resources/Maps/corvax_maus.yml
+++ b/Resources/Maps/corvax_maus.yml
@@ -45412,6 +45412,13 @@ entities:
     - type: Transform
       pos: -11.822876,2.8293457
       parent: 17265
+- proto: CaptainDrobe
+  entities:
+  - uid: 18319
+    components:
+    - type: Transform
+      pos: -36.5,-11.5
+      parent: 2
 - proto: CaptainIDCard
   entities:
   - uid: 4766
@@ -61313,13 +61320,6 @@ entities:
           - 20771
           - 20772
           - 20773
-- proto: DresserCaptainFilled
-  entities:
-  - uid: 18319
-    components:
-    - type: Transform
-      pos: -36.5,-11.5
-      parent: 2
 - proto: DresserChiefEngineerFilled
   entities:
   - uid: 15467
@@ -109247,18 +109247,6 @@ entities:
     - type: DeviceLinkSource
       range: 200
       linkedPorts:
-        18793:
-        - Pressed: Toggle
-        - Pressed: AutoClose
-        18792:
-        - Pressed: Toggle
-        - Pressed: AutoClose
-        18791:
-        - Pressed: AutoClose
-        - Pressed: Toggle
-        552:
-        - Pressed: Toggle
-        - Pressed: AutoClose
         18787:
         - Pressed: Toggle
         18788:
@@ -109271,18 +109259,6 @@ entities:
         - Pressed: Toggle
         18786:
         - Pressed: Toggle
-        553:
-        - Pressed: Toggle
-        - Pressed: AutoClose
-        6862:
-        - Pressed: Toggle
-        - Pressed: AutoClose
-        9570:
-        - Pressed: Toggle
-        - Pressed: AutoClose
-        14510:
-        - Pressed: Toggle
-        - Pressed: AutoClose
         18781:
         - Pressed: Toggle
         18783:
@@ -137288,6 +137264,18 @@ entities:
     - type: Transform
       pos: -12.461247,-3.2999437
       parent: 2
+- proto: WeaponTurretControl
+  entities:
+  - uid: 552
+    components:
+    - type: Transform
+      pos: -108.5,-55.5
+      parent: 2
+  - uid: 553
+    components:
+    - type: Transform
+      pos: -112.5,-59.5
+      parent: 2
 - proto: WeaponTurretHostile
   entities:
   - uid: 16859
@@ -137382,18 +137370,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,15.5
       parent: 16090
-- proto: WeaponTurretNanoTrasen
-  entities:
-  - uid: 3142
-    components:
-    - type: Transform
-      pos: -108.5,-55.5
-      parent: 2
-  - uid: 11038
-    components:
-    - type: Transform
-      pos: -112.5,-59.5
-      parent: 2
 - proto: WeaponTurretSyndicateBroken
   entities:
   - uid: 17840
@@ -137767,43 +137743,11 @@ entities:
       parent: 2
 - proto: WindoorSecureCommandLocked
   entities:
-  - uid: 552
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -108.5,-54.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 2
-  - uid: 553
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -113.5,-59.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 2
   - uid: 1059
     components:
     - type: Transform
       pos: -86.5,-65.5
       parent: 2
-  - uid: 6862
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -112.5,-59.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 2
-  - uid: 9570
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -112.5,-59.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 2
   - uid: 12110
     components:
     - type: Transform
@@ -137816,41 +137760,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -109.5,-57.5
       parent: 2
-  - uid: 14510
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -112.5,-60.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 2
   - uid: 15482
     components:
     - type: Transform
       pos: -70.5,-29.5
       parent: 2
-  - uid: 18791
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -108.5,-55.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 2
-  - uid: 18792
-    components:
-    - type: Transform
-      pos: -108.5,-55.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 2
-  - uid: 18793
-    components:
-    - type: Transform
-      pos: -107.5,-55.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 2
   - uid: 18867
     components:
     - type: Transform
diff --git a/Resources/Maps/corvax_outpost.yml b/Resources/Maps/corvax_outpost.yml
index 8916d032059..cd769ff7199 100644
--- a/Resources/Maps/corvax_outpost.yml
+++ b/Resources/Maps/corvax_outpost.yml
@@ -46545,6 +46545,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: CaptainDrobe
+  entities:
+  - uid: 14491
+    components:
+    - type: Transform
+      pos: 17.5,29.5
+      parent: 2
 - proto: CaptainIDCard
   entities:
   - uid: 7352
@@ -61139,13 +61146,6 @@ entities:
           occludes: True
           ents:
           - 3229
-- proto: DresserCaptainFilled
-  entities:
-  - uid: 14491
-    components:
-    - type: Transform
-      pos: 17.5,29.5
-      parent: 2
 - proto: DresserChiefEngineerFilled
   entities:
   - uid: 547
@@ -134875,19 +134875,22 @@ entities:
     - type: Transform
       pos: -78.43827,10.498604
       parent: 2
-- proto: WeaponTurretNanoTrasen
+- proto: WeaponTurretControl
   entities:
   - uid: 19412
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 12.5,63.5
       parent: 2
+  - uid: 19425
+    components:
+    - type: Transform
+      pos: 12.5,68.5
+      parent: 2
   - uid: 19426
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 16.5,68.5
+      pos: 16.5,63.5
       parent: 2
 - proto: WeaponTurretSyndicateBroken
   entities:
@@ -134899,12 +134902,7 @@ entities:
   - uid: 19410
     components:
     - type: Transform
-      pos: 12.5,68.5
-      parent: 2
-  - uid: 19425
-    components:
-    - type: Transform
-      pos: 16.5,63.5
+      pos: 16.5,68.5
       parent: 2
 - proto: WeaponWaterPistol
   entities:
diff --git a/Resources/Maps/corvax_paper.yml b/Resources/Maps/corvax_paper.yml
index d765f6002f7..a85268cc2d3 100644
--- a/Resources/Maps/corvax_paper.yml
+++ b/Resources/Maps/corvax_paper.yml
@@ -10110,27 +10110,27 @@ entities:
             5: 32896
           5,20:
             0: 13107
-            7: 128
+            6: 128
             5: 32768
           6,17:
             0: 61440
           6,18:
             4: 240
-            6: 61440
+            7: 61440
           6,19:
             5: 61680
           7,17:
             0: 30304
           7,18:
             4: 16
-            6: 4096
+            7: 4096
             0: 17476
           7,19:
             5: 4112
             0: 17476
           7,20:
             0: 17476
-            7: 16
+            6: 16
             5: 4096
           8,16:
             1: 65303
@@ -10145,7 +10145,7 @@ entities:
           5,22:
             0: 3983
           6,20:
-            7: 240
+            6: 240
             5: 61440
           6,22:
             0: 3855
@@ -11287,10 +11287,10 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
           - 0
           - 0
           - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -11302,10 +11302,10 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
+          - 6666.982
           - 0
           - 0
           - 0
-          - 6666.982
           - 0
           - 0
           - 0
@@ -68478,6 +68478,13 @@ entities:
     - type: Transform
       pos: -9.467804,69.384705
       parent: 16527
+- proto: CaptainDrobe
+  entities:
+  - uid: 7427
+    components:
+    - type: Transform
+      pos: 25.5,20.5
+      parent: 2
 - proto: CaptainIDCard
   entities:
   - uid: 5319
@@ -86414,13 +86421,6 @@ entities:
     - type: Transform
       pos: -17.5,56.5
       parent: 16527
-- proto: DresserCaptainFilled
-  entities:
-  - uid: 7427
-    components:
-    - type: Transform
-      pos: 25.5,20.5
-      parent: 2
 - proto: DresserChiefEngineerFilled
   entities:
   - uid: 7428
@@ -86800,7 +86800,7 @@ entities:
     - type: Label
       currentLabel: кофейный ликёр
     - type: PressurizedSolution
-      sprayFizzinessThresholdRoll: 0.8363524
+      sprayFizzinessThresholdRoll: 0.7920442
     - type: NameModifier
       baseName: бутылка кофейного ликёра
     - type: ContainerContainer
@@ -87087,7 +87087,7 @@ entities:
     - type: Label
       currentLabel: ром
     - type: PressurizedSolution
-      sprayFizzinessThresholdRoll: 0.58992493
+      sprayFizzinessThresholdRoll: 0.6745995
     - type: NameModifier
       baseName: кубинский пряный ром капитана Пита
     - type: ContainerContainer
@@ -87131,7 +87131,7 @@ entities:
     - type: Label
       currentLabel: текила
     - type: PressurizedSolution
-      sprayFizzinessThresholdRoll: 0.38918102
+      sprayFizzinessThresholdRoll: 0.6456411
     - type: NameModifier
       baseName: бутылка текилы Каккаво гарантированного качества
     - type: ContainerContainer
@@ -87172,7 +87172,7 @@ entities:
     - type: Label
       currentLabel: вермут
     - type: PressurizedSolution
-      sprayFizzinessThresholdRoll: 0.58969724
+      sprayFizzinessThresholdRoll: 0.9303752
     - type: NameModifier
       baseName: бутылка вермута Золотой глаз
     - type: ContainerContainer
@@ -87195,7 +87195,7 @@ entities:
     - type: Label
       currentLabel: водка
     - type: PressurizedSolution
-      sprayFizzinessThresholdRoll: 0.63949525
+      sprayFizzinessThresholdRoll: 0.36928946
     - type: NameModifier
       baseName: бутылка водки
     - type: ContainerContainer
@@ -87268,7 +87268,7 @@ entities:
     - type: Label
       currentLabel: вино
     - type: PressurizedSolution
-      sprayFizzinessThresholdRoll: 0.76833266
+      sprayFizzinessThresholdRoll: 0.91191274
     - type: NameModifier
       baseName: особое двухбородое бородатое вино
     - type: ContainerContainer
@@ -143807,30 +143807,6 @@ entities:
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        3177:
-        - Pressed: Toggle
-        - Pressed: AutoClose
-        13880:
-        - Pressed: Toggle
-        - Pressed: AutoClose
-        3176:
-        - Pressed: Toggle
-        - Pressed: AutoClose
-        13352:
-        - Pressed: Toggle
-        - Pressed: AutoClose
-        3182:
-        - Pressed: Toggle
-        - Pressed: AutoClose
-        3184:
-        - Pressed: Toggle
-        - Pressed: AutoClose
-        3206:
-        - Pressed: Toggle
-        - Pressed: AutoClose
-        3859:
-        - Pressed: Toggle
-        - Pressed: AutoClose
         21771:
         - Pressed: Toggle
         21772:
@@ -143843,12 +143819,6 @@ entities:
         - Pressed: Toggle
         21795:
         - Pressed: Toggle
-        5812:
-        - Pressed: Toggle
-        - Pressed: AutoClose
-        21849:
-        - Pressed: Toggle
-        - Pressed: AutoClose
   - uid: 24330
     components:
     - type: Transform
@@ -177062,6 +177032,23 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: WeaponTurretControl
+  entities:
+  - uid: 3176
+    components:
+    - type: Transform
+      pos: 17.5,-37.5
+      parent: 2
+  - uid: 3187
+    components:
+    - type: Transform
+      pos: 24.5,-43.5
+      parent: 2
+  - uid: 3859
+    components:
+    - type: Transform
+      pos: 27.5,-39.5
+      parent: 2
 - proto: WeaponTurretHostile
   entities:
   - uid: 23035
@@ -177165,60 +177152,43 @@ entities:
     - type: Transform
       pos: 33.5,24.5
       parent: 16527
-- proto: WeaponTurretNanoTrasen
+- proto: WeaponTurretSyndicateBroken
   entities:
-  - uid: 3186
+  - uid: 3177
     components:
     - type: Transform
-      pos: 24.5,-33.5
+      pos: 18.5,-42.5
       parent: 2
-  - uid: 3187
+  - uid: 3182
     components:
     - type: Transform
       pos: 17.5,-39.5
       parent: 2
-  - uid: 3205
-    components:
-    - type: Transform
-      pos: 27.5,-39.5
-      parent: 2
-  - uid: 4280
+  - uid: 3184
     components:
     - type: Transform
-      pos: 24.5,-43.5
+      pos: 20.5,-33.5
       parent: 2
-  - uid: 4321
+  - uid: 3186
     components:
     - type: Transform
       pos: 20.5,-43.5
       parent: 2
-  - uid: 13098
-    components:
-    - type: Transform
-      pos: 17.5,-37.5
-      parent: 2
-  - uid: 13100
-    components:
-    - type: Transform
-      pos: 20.5,-33.5
-      parent: 2
-  - uid: 13112
+  - uid: 3205
     components:
     - type: Transform
-      pos: 18.5,-42.5
+      pos: 26.5,-42.5
       parent: 2
-  - uid: 14023
+  - uid: 3206
     components:
     - type: Transform
       pos: 27.5,-37.5
       parent: 2
-  - uid: 18616
+  - uid: 4280
     components:
     - type: Transform
-      pos: 26.5,-42.5
+      pos: 24.5,-33.5
       parent: 2
-- proto: WeaponTurretSyndicateBroken
-  entities:
   - uid: 20467
     components:
     - type: Transform
@@ -177665,62 +177635,12 @@ entities:
       parent: 2
 - proto: WindoorSecureCommandLocked
   entities:
-  - uid: 3176
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-42.5
-      parent: 2
-  - uid: 3177
-    components:
-    - type: Transform
-      pos: 26.5,-41.5
-      parent: 2
-  - uid: 3182
-    components:
-    - type: Transform
-      pos: 27.5,-37.5
-      parent: 2
-  - uid: 3184
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 27.5,-37.5
-      parent: 2
-  - uid: 3206
-    components:
-    - type: Transform
-      pos: 17.5,-37.5
-      parent: 2
-  - uid: 3859
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-37.5
-      parent: 2
-  - uid: 5812
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-33.5
-      parent: 2
   - uid: 9955
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 24.5,-38.5
       parent: 2
-  - uid: 13352
-    components:
-    - type: Transform
-      pos: 18.5,-41.5
-      parent: 2
-  - uid: 13880
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 19.5,-42.5
-      parent: 2
   - uid: 13928
     components:
     - type: Transform
@@ -177733,12 +177653,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 52.5,47.5
       parent: 2
-  - uid: 21849
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-34.5
-      parent: 2
 - proto: WindoorSecureEngineeringLocked
   entities:
   - uid: 16033
diff --git a/Resources/Maps/corvax_pilgrim.yml b/Resources/Maps/corvax_pilgrim.yml
index f9448ad0374..fe6364e8c5f 100644
--- a/Resources/Maps/corvax_pilgrim.yml
+++ b/Resources/Maps/corvax_pilgrim.yml
@@ -37661,7 +37661,7 @@ entities:
       pos: -11.5,1.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -27020.76
+      secondsUntilStateChange: -27073.088
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -82964,6 +82964,13 @@ entities:
     - type: Transform
       pos: -6.6093736,81.65403
       parent: 2
+- proto: CaptainDrobe
+  entities:
+  - uid: 10489
+    components:
+    - type: Transform
+      pos: 30.5,-12.5
+      parent: 2
 - proto: CaptainIDCard
   entities:
   - uid: 6183
@@ -110451,13 +110458,6 @@ entities:
     - type: Transform
       pos: 11.5,-35.5
       parent: 2
-- proto: DresserCaptainFilled
-  entities:
-  - uid: 10489
-    components:
-    - type: Transform
-      pos: 30.5,-12.5
-      parent: 2
 - proto: DresserChiefEngineerFilled
   entities:
   - uid: 16874
@@ -164025,7 +164025,7 @@ entities:
       pos: -18.5,-29.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -155206.23
+      secondsUntilStateChange: -155258.56
       state: Closing
   - uid: 9988
     components:
@@ -204140,13 +204140,6 @@ entities:
     - type: Transform
       pos: -71.5,4.5
       parent: 2
-  - uid: 20312
-    components:
-    - type: MetaData
-      desc: Золотая табличка с информацией о ЦИИ "MIA".
-    - type: Transform
-      pos: -5.5,79.5
-      parent: 2
 - proto: SignPrison
   entities:
   - uid: 34435
@@ -213537,11 +213530,6 @@ entities:
     - type: Transform
       pos: -21.5,-13.5
       parent: 2
-  - uid: 20311
-    components:
-    - type: Transform
-      pos: -5.5,79.5
-      parent: 2
   - uid: 22419
     components:
     - type: Transform
@@ -292051,18 +292039,23 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -46.42448,14.554831
       parent: 2
-- proto: WeaponTurretNanoTrasen
+- proto: WeaponTurretControl
   entities:
-  - uid: 30232
+  - uid: 20311
     components:
     - type: Transform
-      pos: -3.5,83.5
+      pos: -5.5,79.5
       parent: 2
-  - uid: 30233
+  - uid: 20312
     components:
     - type: Transform
       pos: -7.5,83.5
       parent: 2
+  - uid: 30232
+    components:
+    - type: Transform
+      pos: -3.5,83.5
+      parent: 2
 - proto: WeaponTurretSyndicateBroken
   entities:
   - uid: 8994
@@ -292578,7 +292571,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -84027.6
+      secondsUntilStateChange: -84079.93
       state: Opening
     - type: Airlock
       autoClose: False
diff --git a/Resources/Maps/corvax_tushkan.yml b/Resources/Maps/corvax_tushkan.yml
index 4be84420cfa..10cc6fbd26a 100644
--- a/Resources/Maps/corvax_tushkan.yml
+++ b/Resources/Maps/corvax_tushkan.yml
@@ -25849,6 +25849,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.285246,39.975414
       parent: 2
+- proto: CaptainDrobe
+  entities:
+  - uid: 2434
+    components:
+    - type: Transform
+      pos: -9.5,33.5
+      parent: 2
 - proto: CaptainIDCard
   entities:
   - uid: 2424
@@ -34809,13 +34816,6 @@ entities:
           - 6099
           - 6100
           - 6101
-- proto: DresserCaptainFilled
-  entities:
-  - uid: 2434
-    components:
-    - type: Transform
-      pos: -9.5,33.5
-      parent: 2
 - proto: DresserChiefEngineerFilled
   entities:
   - uid: 5448
@@ -83762,17 +83762,17 @@ entities:
     - type: Transform
       pos: -37.702473,20.646717
       parent: 2
-- proto: WeaponTurretNanoTrasen
+- proto: WeaponTurretControl
   entities:
   - uid: 10665
     components:
     - type: Transform
-      pos: -15.5,-39.5
+      pos: -15.5,-41.5
       parent: 2
   - uid: 10666
     components:
     - type: Transform
-      pos: -15.5,-41.5
+      pos: -15.5,-39.5
       parent: 2
 - proto: WelderIndustrialAdvanced
   entities: