Merge branch 'master' of https://github.com/space-wizards/space-station-14 into map-load-refactor

2025-02-16 16:52:51 +13:00
parent b13ccfefd6 fb1d180c7d
commit eedc992d57
1624 changed files with 385006 additions and 263837 deletions
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -59,12 +59,13 @@ namespace Content.IntegrationTests.Tests
            "Reach",
            "Train",
            "Oasis",
-            "Cog",
            "Gate",
            "Amber",
            "Loop",
            "Plasma",
-            "Elkridge"
+            "Elkridge",
+            "Convex",
+            "Relic"
        };

        /// <summary>