diff --git a/Resources/Maps/CorvaxFrontier/POI/charlie.yml b/Resources/Maps/CorvaxFrontier/POI/charlie.yml
index 5872d1071ca..b254d9701bf 100644
--- a/Resources/Maps/CorvaxFrontier/POI/charlie.yml
+++ b/Resources/Maps/CorvaxFrontier/POI/charlie.yml
@@ -91,7 +91,7 @@ entities:
     - type: Broadphase
     - type: Physics
       bodyStatus: InAir
-      angularDamping: 0.05
+      angularDamping: 999999
       linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
@@ -2052,8 +2052,6 @@ entities:
     - type: GasTileOverlay
     - type: RadiationGridResistance
     - type: ProtectedGrid
-    - type: BecomesStation
-      id: charlie
 - proto: AirlockExternalShuttleSyndicateLocked
   entities:
   - uid: 383
@@ -3392,137 +3390,295 @@ entities:
     - type: Transform
       pos: -9.5,17.5
       parent: 2
-- proto: BlastDoorExterior1Open
+- proto: BlastDoor
   entities:
-  - uid: 761
+  - uid: 301
     components:
     - type: Transform
-      pos: 11.5,-24.5
+      pos: -5.5,-24.5
       parent: 2
-  - uid: 763
+  - uid: 318
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-18.5
+      pos: 1.5,-18.5
       parent: 2
-  - uid: 765
+  - uid: 381
     components:
     - type: Transform
-      pos: -5.5,-24.5
+      pos: 11.5,-24.5
       parent: 2
-  - uid: 841
+  - uid: 401
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-18.5
+      pos: 4.5,-18.5
       parent: 2
-- proto: BlastDoorOpen
-  entities:
-  - uid: 2851
+  - uid: 423
     components:
     - type: Transform
-      pos: -5.5,-29.5
+      rot: 3.141592653589793 rad
+      pos: 8.5,-28.5
       parent: 2
-  - uid: 2852
+    - type: DeviceLinkSink
+      links:
+      - 896
+  - uid: 424
     components:
     - type: Transform
-      pos: -4.5,-29.5
+      rot: 3.141592653589793 rad
+      pos: 5.5,-28.5
       parent: 2
-  - uid: 2853
+    - type: DeviceLinkSink
+      links:
+      - 896
+  - uid: 425
     components:
     - type: Transform
-      pos: 10.5,-29.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,-28.5
       parent: 2
-  - uid: 2854
+    - type: DeviceLinkSink
+      links:
+      - 896
+  - uid: 426
     components:
     - type: Transform
-      pos: 11.5,-29.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-28.5
       parent: 2
-- proto: BlastDoorWindows
-  entities:
-  - uid: 301
+    - type: DeviceLinkSink
+      links:
+      - 896
+  - uid: 427
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-28.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-28.5
       parent: 2
-  - uid: 318
+    - type: DeviceLinkSink
+      links:
+      - 896
+  - uid: 428
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-28.5
+      rot: 3.141592653589793 rad
+      pos: 4.5,-28.5
       parent: 2
-  - uid: 574
+    - type: DeviceLinkSink
+      links:
+      - 896
+  - uid: 429
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-28.5
+      rot: 3.141592653589793 rad
+      pos: 9.5,-28.5
       parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 896
   - uid: 633
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-28.5
+      rot: 3.141592653589793 rad
+      pos: 7.5,-28.5
       parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 896
   - uid: 634
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-28.5
+      rot: 3.141592653589793 rad
+      pos: 6.5,-28.5
       parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 896
   - uid: 717
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-28.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,-28.5
       parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 896
   - uid: 718
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-28.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,-28.5
       parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 896
   - uid: 721
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-28.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-28.5
       parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 896
   - uid: 722
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: -1.5,-28.5
       parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 896
   - uid: 724
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-28.5
+      rot: 3.141592653589793 rad
+      pos: -3.5,-28.5
       parent: 2
-  - uid: 725
+    - type: DeviceLinkSink
+      links:
+      - 896
+  - uid: 841
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-28.5
+      pos: 10.5,17.5
       parent: 2
-  - uid: 742
+  - uid: 1417
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-28.5
+      pos: -0.5,-21.5
       parent: 2
-  - uid: 743
+  - uid: 2661
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-28.5
+      pos: 4.5,-14.5
       parent: 2
-  - uid: 1417
+  - uid: 2662
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-28.5
+      pos: 1.5,-14.5
+      parent: 2
+  - uid: 2666
+    components:
+    - type: Transform
+      pos: 7.5,-23.5
+      parent: 2
+  - uid: 2667
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 2
+  - uid: 2668
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 2
+  - uid: 2669
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 2670
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 2
+  - uid: 2671
+    components:
+    - type: Transform
+      pos: 24.5,-9.5
+      parent: 2
+  - uid: 2672
+    components:
+    - type: Transform
+      pos: 24.5,4.5
+      parent: 2
+  - uid: 2673
+    components:
+    - type: Transform
+      pos: -13.5,-3.5
+      parent: 2
+  - uid: 2674
+    components:
+    - type: Transform
+      pos: -4.5,17.5
+      parent: 2
+  - uid: 2675
+    components:
+    - type: Transform
+      pos: -17.5,5.5
+      parent: 2
+  - uid: 2676
+    components:
+    - type: Transform
+      pos: -17.5,-9.5
+      parent: 2
+  - uid: 2677
+    components:
+    - type: Transform
+      pos: -19.5,-8.5
+      parent: 2
+  - uid: 2678
+    components:
+    - type: Transform
+      pos: -19.5,-5.5
+      parent: 2
+  - uid: 2679
+    components:
+    - type: Transform
+      pos: -19.5,-2.5
+      parent: 2
+  - uid: 2680
+    components:
+    - type: Transform
+      pos: -19.5,0.5
+      parent: 2
+  - uid: 2681
+    components:
+    - type: Transform
+      pos: -19.5,3.5
+      parent: 2
+  - uid: 2682
+    components:
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 2
+  - uid: 2683
+    components:
+    - type: Transform
+      pos: 9.5,-2.5
+      parent: 2
+  - uid: 2684
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 2
+  - uid: 2685
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 2
+- proto: BlastDoorOpen
+  entities:
+  - uid: 2851
+    components:
+    - type: Transform
+      pos: -5.5,-29.5
+      parent: 2
+  - uid: 2852
+    components:
+    - type: Transform
+      pos: -4.5,-29.5
+      parent: 2
+  - uid: 2853
+    components:
+    - type: Transform
+      pos: 10.5,-29.5
+      parent: 2
+  - uid: 2854
+    components:
+    - type: Transform
+      pos: 11.5,-29.5
       parent: 2
 - proto: BoozeDispenser
   entities:
@@ -12505,6 +12661,78 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -6.5,-2.5
       parent: 2
+- proto: PlastitaniumWindowIndestructible
+  entities:
+  - uid: 416
+    components:
+    - type: Transform
+      pos: 7.5,-28.5
+      parent: 2
+  - uid: 417
+    components:
+    - type: Transform
+      pos: 9.5,-28.5
+      parent: 2
+  - uid: 418
+    components:
+    - type: Transform
+      pos: 1.5,-28.5
+      parent: 2
+  - uid: 419
+    components:
+    - type: Transform
+      pos: -2.5,-28.5
+      parent: 2
+  - uid: 420
+    components:
+    - type: Transform
+      pos: -0.5,-28.5
+      parent: 2
+  - uid: 421
+    components:
+    - type: Transform
+      pos: 5.5,-28.5
+      parent: 2
+  - uid: 422
+    components:
+    - type: Transform
+      pos: 3.5,-28.5
+      parent: 2
+  - uid: 574
+    components:
+    - type: Transform
+      pos: -3.5,-28.5
+      parent: 2
+  - uid: 725
+    components:
+    - type: Transform
+      pos: 8.5,-28.5
+      parent: 2
+  - uid: 742
+    components:
+    - type: Transform
+      pos: 6.5,-28.5
+      parent: 2
+  - uid: 743
+    components:
+    - type: Transform
+      pos: 4.5,-28.5
+      parent: 2
+  - uid: 761
+    components:
+    - type: Transform
+      pos: 2.5,-28.5
+      parent: 2
+  - uid: 763
+    components:
+    - type: Transform
+      pos: 0.5,-28.5
+      parent: 2
+  - uid: 765
+    components:
+    - type: Transform
+      pos: -1.5,-28.5
+      parent: 2
 - proto: PosterContrabandBeachStarYamamoto
   entities:
   - uid: 175
@@ -12521,7 +12749,7 @@ entities:
       pos: 5.5,7.5
       parent: 2
     - type: DeadDrop
-      nextDrop: 2894.7158304
+      nextDrop: 2556.1495652
 - proto: PosterContrabandEnlistGorlexDD
   entities:
   - uid: 2395
@@ -12531,7 +12759,7 @@ entities:
       pos: -11.5,-13.5
       parent: 2
     - type: DeadDrop
-      nextDrop: 1662.7158304
+      nextDrop: 3456.1495652
 - proto: PosterContrabandKosmicheskayaStantsiyaDD
   entities:
   - uid: 2316
@@ -12541,7 +12769,7 @@ entities:
       pos: -16.5,5.5
       parent: 2
     - type: DeadDrop
-      nextDrop: 4522.7158304
+      nextDrop: 1131.1495652
 - proto: PosterContrabandMoth
   entities:
   - uid: 2995
@@ -12571,7 +12799,7 @@ entities:
       pos: -11.5,16.5
       parent: 2
     - type: DeadDrop
-      nextDrop: 1172.7158304
+      nextDrop: 3060.1495652
 - proto: PoweredlightBlue
   entities:
   - uid: 1424
@@ -13265,12 +13493,6 @@ entities:
     - type: Transform
       pos: 5.5,-15.5
       parent: 2
-  - uid: 381
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,-28.5
-      parent: 2
   - uid: 382
     components:
     - type: Transform
@@ -13295,84 +13517,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,23.5
       parent: 2
-  - uid: 416
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-28.5
-      parent: 2
-  - uid: 417
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-28.5
-      parent: 2
-  - uid: 418
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-28.5
-      parent: 2
-  - uid: 419
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-28.5
-      parent: 2
-  - uid: 420
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-28.5
-      parent: 2
-  - uid: 421
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-28.5
-      parent: 2
-  - uid: 422
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-28.5
-      parent: 2
-  - uid: 423
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-28.5
-      parent: 2
-  - uid: 424
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-28.5
-      parent: 2
-  - uid: 425
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-28.5
-      parent: 2
-  - uid: 426
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-28.5
-      parent: 2
-  - uid: 427
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-28.5
-      parent: 2
-  - uid: 428
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-28.5
-      parent: 2
 - proto: RubberStampSyndicate
   entities:
   - uid: 1338
@@ -13398,6 +13542,36 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,-27.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        724:
+        - Pressed: Toggle
+        426:
+        - Pressed: Toggle
+        722:
+        - Pressed: Toggle
+        427:
+        - Pressed: Toggle
+        721:
+        - Pressed: Toggle
+        425:
+        - Pressed: Toggle
+        718:
+        - Pressed: Toggle
+        717:
+        - Pressed: Toggle
+        428:
+        - Pressed: Toggle
+        424:
+        - Pressed: Toggle
+        634:
+        - Pressed: Toggle
+        633:
+        - Pressed: Toggle
+        423:
+        - Pressed: Toggle
+        429:
+        - Pressed: Toggle
 - proto: SignAtmos
   entities:
   - uid: 656
@@ -13861,16 +14035,6 @@ entities:
     - type: Transform
       pos: 11.5,19.5
       parent: 2
-  - uid: 2650
-    components:
-    - type: Transform
-      pos: -4.5,-0.5
-      parent: 2
-  - uid: 2651
-    components:
-    - type: Transform
-      pos: -4.5,-3.5
-      parent: 2
   - uid: 2656
     components:
     - type: Transform
@@ -13891,6 +14055,36 @@ entities:
     - type: Transform
       pos: -6.5,-19.5
       parent: 2
+  - uid: 2663
+    components:
+    - type: Transform
+      pos: 5.5,-25.5
+      parent: 2
+  - uid: 2664
+    components:
+    - type: Transform
+      pos: 0.5,-25.5
+      parent: 2
+  - uid: 2686
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 2
+  - uid: 2687
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 2
+  - uid: 2688
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 2
+  - uid: 2689
+    components:
+    - type: Transform
+      pos: 4.5,-10.5
+      parent: 2
 - proto: StimkitFilled
   entities:
   - uid: 3101
@@ -15697,12 +15891,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 11.5,-21.5
       parent: 2
-  - uid: 401
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-28.5
-      parent: 2
   - uid: 402
     components:
     - type: Transform
@@ -15779,12 +15967,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 11.5,-26.5
       parent: 2
-  - uid: 429
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-28.5
-      parent: 2
   - uid: 430
     components:
     - type: Transform
@@ -19246,6 +19428,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,12.5
       parent: 2
+  - uid: 2650
+    components:
+    - type: Transform
+      pos: -4.5,-28.5
+      parent: 2
+  - uid: 2651
+    components:
+    - type: Transform
+      pos: 10.5,-28.5
+      parent: 2
   - uid: 2730
     components:
     - type: Transform
@@ -19369,6 +19561,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,6.5
       parent: 2
+    - type: Gun
+      fireRate: 1
+    - type: BallisticAmmoProvider
+      proto: CartridgeMagnumAP
   - uid: 135
     components:
     - type: Transform
@@ -19385,6 +19581,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,6.5
       parent: 2
+    - type: Gun
+      fireRate: 1
+    - type: BallisticAmmoProvider
+      proto: CartridgeMagnumAP
   - uid: 144
     components:
     - type: Transform
@@ -19411,6 +19611,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -6.5,-3.5
       parent: 2
+    - type: BallisticAmmoProvider
+      proto: ShellShotgun
   - uid: 350
     components:
     - type: Transform
@@ -19566,12 +19768,19 @@ entities:
     - type: Transform
       pos: 2.5,-13.5
       parent: 2
+  - uid: 2665
+    components:
+    - type: Transform
+      pos: -9.5,-7.5
+      parent: 2
   - uid: 2698
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -6.5,-0.5
       parent: 2
+    - type: BallisticAmmoProvider
+      proto: ShellShotgun
   - uid: 2758
     components:
     - type: Transform
@@ -19699,26 +19908,6 @@ entities:
     - type: Transform
       pos: 15.5,-7.5
       parent: 2
-  - uid: 2987
-    components:
-    - type: Transform
-      pos: -9.5,3.5
-      parent: 2
-  - uid: 2988
-    components:
-    - type: Transform
-      pos: -2.5,10.5
-      parent: 2
-  - uid: 2989
-    components:
-    - type: Transform
-      pos: 8.5,10.5
-      parent: 2
-  - uid: 2990
-    components:
-    - type: Transform
-      pos: 14.5,5.5
-      parent: 2
   - uid: 2991
     components:
     - type: Transform
@@ -19729,9 +19918,4 @@ entities:
     - type: Transform
       pos: -2.5,-14.5
       parent: 2
-  - uid: 2994
-    components:
-    - type: Transform
-      pos: -9.5,-7.5
-      parent: 2
 ...