upstream update

fix fix fix
Rxup · Jan 17, 2025 · e8a057e · e8a057e
1 parent a70a58c
commit e8a057e
Show file tree

Hide file tree

Showing 15 changed files with 274,902 additions and 813,053 deletions.
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