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

2025-01-18 04:14:18 +13:00
parent 5e47d25d7f 50bb5e0c13
commit dc13744188
246 changed files with 209699 additions and 13785 deletions
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -66,6 +66,7 @@ namespace Content.IntegrationTests.Tests
            "Gate",
            "Amber",
            "Loop",
+            "Plasma",
            "Elkridge"
        };