Fix master (#15256)

diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
index 80c4a40bb61ae2d33d2f2770fbe838b9cdf86c39..e46e82de0263238f64ba5223119ce9f3529dc833 100644 (file)
--- a/Content.Server/Materials/MaterialReclaimerSystem.cs
+++ b/Content.Server/Materials/MaterialReclaimerSystem.cs
@@ -32,7 +32,7 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly SharedBodySystem _body = default!; //bobby
-    [Dependency] private readonly SpillableSystem _spillable = default!;
+    [Dependency] private readonly PuddleSystem _puddle = default!;
     [Dependency] private readonly StackSystem _stack = default!;
 
     /// <inheritdoc/>
@@ -255,7 +255,7 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem
 
         if (overflow.Volume > 0)
         {
-            _spillable.SpillAt(reclaimer, overflow, reclaimerComponent.PuddleId, transformComponent: xform);
+            _puddle.TrySpillAt(reclaimer, overflow, out _, transformComponent: xform);
         }
     }
 }

diff --git a/Content.Server/Spreader/SpreaderSystem.cs b/Content.Server/Spreader/SpreaderSystem.cs
index 03b3e4559687a61779bb69ed60ad890e29e48fd7..c8274874413242fbc734614ac3297f07a71a6e2e 100644 (file)
--- a/Content.Server/Spreader/SpreaderSystem.cs
+++ b/Content.Server/Spreader/SpreaderSystem.cs
@@ -157,10 +157,7 @@ public sealed class SpreaderSystem : EntitySystem
                 // of an edge so we'll let them handle it.
                 if (!groupUpdates.TryGetValue(node.NodeGroup, out var updates))
                 {
-                    var spreadEv = new SpreadGroupUpdateRate()
-                    {
-                        Name = node.Name,
-                    };
+                    var spreadEv = new SpreadGroupUpdateRate(node.Name);
                     RaiseLocalEvent(ref spreadEv);
                     updates = (int) (spreadEv.UpdatesPerSecond * SpreadCooldown / TimeSpan.FromSeconds(1));
                 }

diff --git a/Content.Shared/Materials/MaterialReclaimerComponent.cs b/Content.Shared/Materials/MaterialReclaimerComponent.cs
index aaaa656f65d1945002e7d1eb532177d7188f9bf5..283ade2cd9151f7d12881eecc0754f003ce6db46 100644 (file)
--- a/Content.Shared/Materials/MaterialReclaimerComponent.cs
+++ b/Content.Shared/Materials/MaterialReclaimerComponent.cs
@@ -84,12 +84,6 @@ public sealed class MaterialReclaimerComponent : Component
     [DataField("solutionContainerId"), ViewVariables(VVAccess.ReadWrite)]
     public string SolutionContainerId = "output";
 
-    /// <summary>
-    /// The prototype for the puddle
-    /// </summary>
-    [DataField("puddleId", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>)), ViewVariables(VVAccess.ReadWrite)]
-    public string PuddleId = "PuddleSmear";
-
     /// <summary>
     /// The solution itself.
     /// </summary>