From: ElectroJr <leonsfriedrich@gmail.com>
Date: Sun, 12 Jan 2025 07:19:04 +0000 (+1300)
Subject: Merge branch 'master' of https://github.com/space-wizards/space-station-14 into map... 
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=5e47d25d7fe4015308f3ebb7d5c08919932bbf4f;p=space-station-14.git

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

5e47d25d7fe4015308f3ebb7d5c08919932bbf4f
diff --cc Content.IntegrationTests/Tests/PostMapInitTest.cs
index f07d1e4996,a331fad8f6..d898df8b62
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@@ -65,9 -63,10 +65,8 @@@ namespace Content.IntegrationTests.Test
              "Cog",
              "Gate",
              "Amber",
-             "Loop"
- 
- 
+             "Loop",
+             "Elkridge"
 -
 -
          };
  
          /// <summary>