CentComm Map v0.1

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -30,6 +30,7 @@ public sealed class PostMapInitTest
         private static readonly string[] NoSpawnMaps =
         {
             "CentComm",
+            "SS220_CentComm",
             "Dart",
             "NukieOutpost",
             "SS220_syndicate"
@@ -38,10 +39,11 @@ public sealed class PostMapInitTest
         private static readonly string[] Grids =
         {
             "/Maps/centcomm.yml",
+            "/Maps/SS220/ss220-centcomm.yml",
             "/Maps/Shuttles/cargo.yml",
             "/Maps/Shuttles/emergency.yml",
             "/Maps/Shuttles/infiltrator.yml",
-            "/Maps/NukeOps/ss220_Nuke_shuttle_grid.yml",
+            "/Maps/SS220/Shuttles/ss220-nukeshuttle.yml",
         };
 
         private static readonly string[] GameMaps =
@@ -69,21 +71,16 @@ public sealed class PostMapInitTest
             "Oasis",
 
             // SS220 Maps
-            "220Delta",
             "Frankenstein",
-            "220Bagel",
-            "220Fland",
-            "220Ishimura",
-            "220Gate",
             "Nox",
+            "Axioma",
+            "SS220_syndicate",
+            "SS220_CentComm",
+
+            // SS220 Event Maps
             "Snout",
-            "220Avrite",
-            "220Marathon",
-            "220Hive",
             "VoidZone",
             "NTvsSSSP",
-            "Axioma",
-            "SS220_syndicate",
         };
 
         /// <summary>

Content.Server/Shuttles/Components/StationCentcommComponent.cs

@@ -16,7 +16,7 @@ public sealed partial class StationCentcommComponent : Component
     public float ShuttleIndex;
 
     [DataField]
-    public ResPath Map = new("/Maps/centcomm.yml");
+    public ResPath Map = new("/Maps/SS220/ss220-centcomm.yml"); // SS220 centcomm map update
 
     /// <summary>
     /// Centcomm entity that was loaded.

Resources/Maps/Shuttles/ss220_NT_CBURN.yml → Resources/Maps/SS220/admin-shuttles/ss220_NT_CBURN.yml

@@ -24,7 +24,7 @@ entities:
       name: NT-CBURN-X3 "Asclepius"
     - type: Transform
       pos: -0.5625,-1.1555071
-      parent: 9
+      parent: invalid
     - type: MapGrid
       chunks:
         0,0:
@@ -495,19 +495,6 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
-  - uid: 9
-    components:
-    - type: MetaData
-      name: map 2
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
 - proto: AirAlarm
   entities:
   - uid: 2
@@ -2513,15 +2500,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,8.5
       parent: 1
-- proto: FaxMachineBase
-  entities:
-  - uid: 375
-    components:
-    - type: Transform
-      pos: 1.5,11.5
-      parent: 1
-    - type: FaxMachine
-      name: Шаттл РХБЗЗ
 - proto: FireAxeCabinetFilled
   entities:
   - uid: 376