diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index a5df89e4a09736..0eda5008121db3 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -86,7 +86,7 @@ public sealed class PostMapInitTest
             "NTvsSSSP",
 
             // SS220 Test Maps
-            "TestSM"
+            // "TestSM"
         };
 
         /// <summary>
diff --git a/Resources/Maps/SS220/admin-shuttles/ss220_NT_CBURN.yml b/Resources/Maps/SS220/Shuttles/centCom/ss220_NT_CBURN.yml
similarity index 100%
rename from Resources/Maps/SS220/admin-shuttles/ss220_NT_CBURN.yml
rename to Resources/Maps/SS220/Shuttles/centCom/ss220_NT_CBURN.yml
diff --git a/Resources/Maps/SS220/admin-shuttles/ss220_NT_CENT.yml b/Resources/Maps/SS220/Shuttles/centCom/ss220_NT_CENT.yml
similarity index 100%
rename from Resources/Maps/SS220/admin-shuttles/ss220_NT_CENT.yml
rename to Resources/Maps/SS220/Shuttles/centCom/ss220_NT_CENT.yml
diff --git a/Resources/Maps/SS220/admin-shuttles/ss220_NT_DS.yml b/Resources/Maps/SS220/Shuttles/centCom/ss220_NT_DS.yml
similarity index 100%
rename from Resources/Maps/SS220/admin-shuttles/ss220_NT_DS.yml
rename to Resources/Maps/SS220/Shuttles/centCom/ss220_NT_DS.yml
diff --git a/Resources/Maps/SS220/admin-shuttles/ss220_NT_OBR.yml b/Resources/Maps/SS220/Shuttles/centCom/ss220_NT_OBR.yml
similarity index 100%
rename from Resources/Maps/SS220/admin-shuttles/ss220_NT_OBR.yml
rename to Resources/Maps/SS220/Shuttles/centCom/ss220_NT_OBR.yml
diff --git a/Resources/Maps/SS220/admin-shuttles/ss220_NT_OSO.yml b/Resources/Maps/SS220/Shuttles/centCom/ss220_NT_OSO.yml
similarity index 100%
rename from Resources/Maps/SS220/admin-shuttles/ss220_NT_OSO.yml
rename to Resources/Maps/SS220/Shuttles/centCom/ss220_NT_OSO.yml
diff --git a/Resources/Maps/SS220/Test/SM_Test.yml b/Resources/Maps/SS220/Test/SM_Test.yml
index 6692c86ac9c408..9cb61dd791b171 100644
--- a/Resources/Maps/SS220/Test/SM_Test.yml
+++ b/Resources/Maps/SS220/Test/SM_Test.yml
@@ -331,45 +331,15 @@ entities:
       id: TestSM
 - proto: AirAlarm
   entities:
-  - uid: 3
+  - uid: 628
     components:
     - type: Transform
-      pos: -3.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-5.5
       parent: 2
     - type: DeviceList
       devices:
       - 446
-- proto: AirlockAtmosphericsGlass
-  entities:
-  - uid: 4
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-3.5
-      parent: 2
-  - uid: 5
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-1.5
-      parent: 2
-  - uid: 6
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-1.5
-      parent: 2
-  - uid: 7
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-3.5
-      parent: 2
-  - uid: 8
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 2
 - proto: AirlockEngineeringGlass
   entities:
   - uid: 9
@@ -2746,7 +2716,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 3
+      - 628
 - proto: GasVolumePump
   entities:
   - uid: 447
@@ -2774,7 +2744,7 @@ entities:
   - uid: 450
     components:
     - type: Transform
-      pos: -5.543548,-7.737667
+      pos: -7.052323,-7.88517
       parent: 2
     - type: Geiger
       isEnabled: True
@@ -2782,7 +2752,7 @@ entities:
   - uid: 451
     components:
     - type: Transform
-      pos: 0.5438514,-7.553993
+      pos: 1.3070521,-7.6722603
       parent: 2
     - type: Geiger
       isEnabled: True
@@ -2802,17 +2772,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -9.5,-13.5
       parent: 2
-  - uid: 454
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,-5.5
-      parent: 2
   - uid: 455
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-9.5
       parent: 2
   - uid: 456
     components:
@@ -2979,14 +2943,50 @@ entities:
   - uid: 483
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-9.5
       parent: 2
-  - uid: 484
+  - uid: 666
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-5.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-8.5
+      parent: 2
+  - uid: 671
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-9.5
+      parent: 2
+  - uid: 672
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-7.5
+      parent: 2
+  - uid: 676
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 2
+  - uid: 705
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-8.5
+      parent: 2
+  - uid: 707
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-7.5
+      parent: 2
+  - uid: 794
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-6.5
       parent: 2
 - proto: HeatExchanger
   entities:
@@ -3619,6 +3619,40 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,-2.5
       parent: 2
+  - uid: 638
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-4.5
+      parent: 2
+  - uid: 639
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-4.5
+      parent: 2
+  - uid: 640
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 2
+  - uid: 643
+    components:
+    - type: Transform
+      pos: -9.5,3.5
+      parent: 2
+  - uid: 644
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,1.5
+      parent: 2
+  - uid: 658
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,2.5
+      parent: 2
 - proto: PoweredSmallLight
   entities:
   - uid: 596
@@ -3634,35 +3668,45 @@ entities:
       parent: 2
 - proto: RadiationCollectorFullTank
   entities:
-  - uid: 598
+  - uid: 8
     components:
     - type: Transform
-      pos: 0.5,-8.5
+      pos: 0.5,-6.5
       parent: 2
-  - uid: 599
+  - uid: 454
     components:
     - type: Transform
-      pos: 0.5,-6.5
+      pos: -5.5,-6.5
       parent: 2
-  - uid: 600
+  - uid: 598
     components:
     - type: Transform
-      pos: -5.5,-6.5
+      pos: 0.5,-8.5
       parent: 2
   - uid: 601
     components:
     - type: Transform
       pos: -5.5,-8.5
       parent: 2
-  - uid: 602
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 484
     components:
     - type: Transform
-      pos: -5.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-9.5
       parent: 2
-  - uid: 603
+  - uid: 599
     components:
     - type: Transform
-      pos: 0.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-9.5
+      parent: 2
+  - uid: 600
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-9.5
       parent: 2
 - proto: ReinforcedUraniumWindow
   entities:
@@ -3701,11 +3745,6 @@ entities:
     - type: Transform
       pos: 4.5,-11.5
       parent: 2
-  - uid: 611
-    components:
-    - type: Transform
-      pos: 4.5,-6.5
-      parent: 2
   - uid: 612
     components:
     - type: Transform
@@ -3786,11 +3825,6 @@ entities:
     - type: Transform
       pos: 4.5,-10.5
       parent: 2
-  - uid: 628
-    components:
-    - type: Transform
-      pos: 4.5,-5.5
-      parent: 2
   - uid: 629
     components:
     - type: Transform
@@ -3816,16 +3850,6 @@ entities:
     - type: Transform
       pos: -9.5,-10.5
       parent: 2
-  - uid: 634
-    components:
-    - type: Transform
-      pos: -9.5,-6.5
-      parent: 2
-  - uid: 635
-    components:
-    - type: Transform
-      pos: -9.5,-5.5
-      parent: 2
 - proto: ReinforcedWindow
   entities:
   - uid: 636
@@ -3838,21 +3862,6 @@ entities:
     - type: Transform
       pos: -4.5,-8.5
       parent: 2
-  - uid: 638
-    components:
-    - type: Transform
-      pos: -3.5,-9.5
-      parent: 2
-  - uid: 639
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 2
-  - uid: 640
-    components:
-    - type: Transform
-      pos: -1.5,-9.5
-      parent: 2
   - uid: 641
     components:
     - type: Transform
@@ -3863,16 +3872,6 @@ entities:
     - type: Transform
       pos: -0.5,-6.5
       parent: 2
-  - uid: 643
-    components:
-    - type: Transform
-      pos: -4.5,-9.5
-      parent: 2
-  - uid: 644
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 2
   - uid: 645
     components:
     - type: Transform
@@ -3961,6 +3960,11 @@ entities:
       parent: 2
 - proto: SMEmitter
   entities:
+  - uid: 611
+    components:
+    - type: Transform
+      pos: -6.5,3.5
+      parent: 2
   - uid: 656
     components:
     - type: Transform
@@ -3973,12 +3977,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-7.5
       parent: 2
-  - uid: 658
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-12.5
-      parent: 2
 - proto: SMESBasic
   entities:
   - uid: 659
@@ -4019,27 +4017,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,-24.5
       parent: 2
-- proto: SpawnPointCaptain
-  entities:
-  - uid: 666
-    components:
-    - type: Transform
-      pos: -2.5,-23.5
-      parent: 2
-- proto: SpawnPointLatejoin
-  entities:
-  - uid: 867
-    components:
-    - type: Transform
-      pos: -2.5,-22.5
-      parent: 2
-- proto: SpawnPointObserver
-  entities:
-  - uid: 868
-    components:
-    - type: Transform
-      pos: -3.5,-22.5
-      parent: 2
 - proto: SS220PosterWhoIsWycc
   entities:
   - uid: 667
@@ -4067,18 +4044,6 @@ entities:
     - type: Transform
       pos: -9.5,-22.5
       parent: 2
-- proto: SuitStorageAtmos
-  entities:
-  - uid: 671
-    components:
-    - type: Transform
-      pos: -3.5,-0.5
-      parent: 2
-  - uid: 672
-    components:
-    - type: Transform
-      pos: -1.5,-0.5
-      parent: 2
 - proto: SuitStorageCE
   entities:
   - uid: 673
@@ -4100,11 +4065,6 @@ entities:
       parent: 2
 - proto: SuitStorageSuperMatterOperator
   entities:
-  - uid: 676
-    components:
-    - type: Transform
-      pos: -3.5,-4.5
-      parent: 2
   - uid: 677
     components:
     - type: Transform
@@ -4173,6 +4133,12 @@ entities:
       parent: 2
 - proto: SuperMatterObserverConsole
   entities:
+  - uid: 634
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-12.5
+      parent: 2
   - uid: 687
     components:
     - type: Transform
@@ -4271,20 +4237,16 @@ entities:
     - type: Transform
       pos: -3.5,-10.5
       parent: 2
-  - uid: 705
-    components:
-    - type: Transform
-      pos: -4.5,-10.5
-      parent: 2
   - uid: 706
     components:
     - type: Transform
       pos: -1.5,-10.5
       parent: 2
-  - uid: 707
+  - uid: 795
     components:
     - type: Transform
-      pos: -0.5,-10.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-10.5
       parent: 2
 - proto: TeslaGroundingRod
   entities:
@@ -4343,8 +4305,57 @@ entities:
     - type: Transform
       pos: 0.5,-12.5
       parent: 2
+- proto: VendingMachineTankDispenserEVA
+  entities:
+  - uid: 635
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 2
 - proto: WallReinforced
   entities:
+  - uid: 3
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,-3.5
+      parent: 2
+  - uid: 4
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-3.5
+      parent: 2
+  - uid: 5
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-1.5
+      parent: 2
+  - uid: 6
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-1.5
+      parent: 2
+  - uid: 7
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-1.5
+      parent: 2
+  - uid: 602
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-9.5
+      parent: 2
+  - uid: 603
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-9.5
+      parent: 2
   - uid: 717
     components:
     - type: Transform
@@ -4730,31 +4741,11 @@ entities:
     - type: Transform
       pos: -11.5,-14.5
       parent: 2
-  - uid: 794
-    components:
-    - type: Transform
-      pos: -9.5,-4.5
-      parent: 2
-  - uid: 795
-    components:
-    - type: Transform
-      pos: -10.5,-4.5
-      parent: 2
   - uid: 796
     components:
     - type: Transform
       pos: 4.5,-4.5
       parent: 2
-  - uid: 797
-    components:
-    - type: Transform
-      pos: 5.5,-4.5
-      parent: 2
-  - uid: 798
-    components:
-    - type: Transform
-      pos: 6.5,-4.5
-      parent: 2
   - uid: 799
     components:
     - type: Transform
diff --git a/Resources/Maps/SS220/ss220-centcomm.yml b/Resources/Maps/SS220/ss220-centcomm.yml
index f0b9c8dd8dfe15..a40899ff8c3d18 100644
--- a/Resources/Maps/SS220/ss220-centcomm.yml
+++ b/Resources/Maps/SS220/ss220-centcomm.yml
@@ -8103,7 +8103,7 @@ entities:
       parent: 1
     - type: GridFill
       addComponents: []
-      path: /Maps/SS220/admin-shuttles/ss220_NT_OBR.yml
+      path: /Maps/SS220/Shuttles/centCom/ss220_NT_OBR.yml
   - uid: 182
     components:
     - type: Transform
@@ -8112,7 +8112,7 @@ entities:
       parent: 1
     - type: GridFill
       addComponents: []
-      path: /Maps/SS220/admin-shuttles/ss220_NT_CBURN.yml
+      path: /Maps/SS220/Shuttles/centCom/ss220_NT_CBURN.yml
   - uid: 3845
     components:
     - type: Transform
@@ -8127,7 +8127,7 @@ entities:
       parent: 1
     - type: GridFill
       addComponents: []
-      path: /Maps/SS220/admin-shuttles/ss220_NT_CENT.yml
+      path: /Maps/SS220/Shuttles/centCom/ss220_NT_CENT.yml
   - uid: 6116
     components:
     - type: Transform
@@ -8157,7 +8157,7 @@ entities:
       parent: 1
     - type: GridFill
       addComponents: []
-      path: /Maps/SS220/admin-shuttles/ss220_NT_DS.yml
+      path: /Maps/SS220/Shuttles/centCom/ss220_NT_DS.yml
   - uid: 8596
     components:
     - type: Transform
diff --git a/Resources/Prototypes/SS220/Entities/Structures/Power/Generation/Supermatter/crystal.yml b/Resources/Prototypes/SS220/Entities/Structures/Power/Generation/Supermatter/crystal.yml
index 815812cca84461..4f2814e9b9d754 100644
--- a/Resources/Prototypes/SS220/Entities/Structures/Power/Generation/Supermatter/crystal.yml
+++ b/Resources/Prototypes/SS220/Entities/Structures/Power/Generation/Supermatter/crystal.yml
@@ -12,7 +12,6 @@
   - type: Transform
     anchored: true
     noRot: true
-  - type: Anchorable
   - type: Fixtures # TODO find masks/layers together
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/SS220/Maps/debug.yml b/Resources/Prototypes/SS220/Maps/debug.yml
index 95b4e17e7c4471..a40cb33979b157 100644
--- a/Resources/Prototypes/SS220/Maps/debug.yml
+++ b/Resources/Prototypes/SS220/Maps/debug.yml
@@ -1,14 +1,15 @@
-- type: gameMap
-  id: TestSM
-  mapName: 'Test SM'
-  mapPath: /Maps/SS220/Test/SM_Test.yml
-  minPlayers: 0
-  stations:
-    TestSM:
-      stationProto: TestStation
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: "SM"
-        - type: StationJobs
-          availableJobs:
-            Captain: [ -1, -1 ]
+# until sm not inclued in gamemaps - commented
+#- type: gameMap
+#  id: TestSM
+#  mapName: 'Test SM'
+#  mapPath: /Maps/SS220/Test/SM_Test.yml
+#  minPlayers: 0
+#  stations:
+#    TestSM:
+#      stationProto: TestStation
+#      components:
+#        - type: StationNameSetup
+#          mapNameTemplate: "SM"
+#        - type: StationJobs
+#          availableJobs:
+#            Captain: [ -1, -1 ]