Merge branch 'master' into subpoenahud

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -36,7 +36,7 @@ public sealed class PostMapInitTest
 
         private static readonly string[] Grids =
         {
-            "/Maps/centcomm.yml",
+            "/Maps/DeltaV/centcomm.yml",
             "/Maps/Shuttles/cargo.yml",
             "/Maps/Shuttles/emergency.yml",
             "/Maps/Shuttles/infiltrator.yml",

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/DeltaV/centcomm.yml"); // DeltaV
 
     /// <summary>
     /// Centcomm entity that was loaded.

Resources/Changelog/DeltaVChangelog.yml

@@ -2791,3 +2791,25 @@
   id: 407
   time: '2024-06-19T05:02:56.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1330
+- author: deltanedas
+  changes:
+  - message: CentComm now has a justice department if you want to use it for admemes.
+    type: Tweak
+  id: 408
+  time: '2024-06-19T14:48:59.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1352
+- author: Velcroboy
+  changes:
+  - message: Added the NTES-Fishbowl, a stylish new ride to Centcomm from The Hive
+      Station
+    type: Add
+  id: 409
+  time: '2024-06-20T17:32:27.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1417
+- author: Lyndomen
+  changes:
+  - message: Sleeper Agents are waking up!
+    type: Add
+  id: 410
+  time: '2024-06-20T20:36:51.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1389