upstream update

fix fix fix Update PostMapInitTest.cs
Rxup · Jan 17, 2025 · 17f87a6 · 17f87a6
1 parent a70a58c
commit 17f87a6
Show file tree

Hide file tree

Showing 16 changed files with 274,903 additions and 813,054 deletions.
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -60,7 +60,7 @@ public sealed class PostMapInitTest
             "CorvaxFrame",
             "CorvaxPearl",
             "CorvaxTushkan",
-            //"CorvaxGlacier",
+            "CorvaxGlacier",
             "CorvaxAwesome",
             // Corvax-End
             "Dev",

diff --git a/Content.Shared/Backmen/FootPrint/FootPrintComponent.cs b/Content.Shared/Backmen/FootPrint/FootPrintComponent.cs
@@ -16,5 +16,5 @@ public sealed partial class FootPrintComponent : Component
     public EntityUid PrintOwner;
 
     [DataField("solution")] public string SolutionName = "step";
-    [DataField("solutionRef")] public Entity<SolutionComponent>? Solution;
+    public Entity<SolutionComponent>? Solution;
 }
diff --git a/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.announcements.cs b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.announcements.cs
diff --git a/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.calculation.cs b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.calculation.cs