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

diff --cc Content.IntegrationTests/Tests/PostMapInitTest.cs
index f07d1e4996895114415679a015ad949c9f8bf9f5,a331fad8f64a8a5af395de36be4db624818cf23a..d898df8b624f5bcfc3832d03e8eaaf2ad9d90f73
--- 1/Content.IntegrationTests/Tests/PostMapInitTest.cs
--- 2/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>