Puddles & spreader refactor (#15191)

Content.Shared/Chemistry/Components/DrainableSolutionComponent.cs

@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Chemistry.Components;
+
+/// <summary>
+///     Denotes the solution that can be easily removed through any reagent container.
+///     Think pouring this or draining from a water tank.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed class DrainableSolutionComponent : Component
+{
+    /// <summary>
+    /// Solution name that can be drained.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("solution")]
+    public string Solution { get; set; } = "default";
+}

Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs

@@ -0,0 +1,27 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Chemistry.Components;
+
+/// <summary>
+///     Reagents that can be added easily. For example like
+///     pouring something into another beaker, glass, or into the gas
+///     tank of a car.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed class RefillableSolutionComponent : Component
+{
+    /// <summary>
+    /// Solution name that can added to easily.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("solution")]
+    public string Solution { get; set; } = "default";
+
+    /// <summary>
+    /// The maximum amount that can be transferred to the solution at once
+    /// </summary>
+    [DataField("maxRefill")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public FixedPoint2? MaxRefill { get; set; } = null;
+}

Content.Shared/Chemistry/Components/Solution.cs

@@ -432,6 +432,18 @@ namespace Content.Shared.Chemistry.Components
             _heatCapacity = 0;
         }
 
+        /// <summary>
+        /// Splits a solution without the specified reagent.
+        /// </summary>
+        public Solution SplitSolutionWithout(FixedPoint2 toTake, string without)
+        {
+            TryGetReagent(without, out var existing);
+            RemoveReagent(without, toTake);
+            var sol = SplitSolution(toTake);
+            AddReagent(without, existing);
+            return sol;
+        }
+
         public Solution SplitSolution(FixedPoint2 toTake)
         {
             if (toTake <= FixedPoint2.Zero)
@@ -599,7 +611,7 @@ namespace Content.Shared.Chemistry.Components
             ValidateSolution();
         }
 
-        public Color GetColor(IPrototypeManager? protoMan)
+        public Color GetColorWithout(IPrototypeManager? protoMan, params string[] without)
         {
             if (Volume == FixedPoint2.Zero)
             {
@@ -614,6 +626,9 @@ namespace Content.Shared.Chemistry.Components
 
             foreach (var reagent in Contents)
             {
+                if (without.Contains(reagent.ReagentId))
+                    continue;
+
                 runningTotalQuantity += reagent.Quantity;
 
                 if (!protoMan.TryIndex(reagent.ReagentId, out ReagentPrototype? proto))
@@ -634,6 +649,11 @@ namespace Content.Shared.Chemistry.Components
             return mixColor;
         }
 
+        public Color GetColor(IPrototypeManager? protoMan)
+        {
+            return GetColorWithout(protoMan);
+        }
+
         [Obsolete("Use ReactiveSystem.DoEntityReaction")]
         public void DoEntityReaction(EntityUid uid, ReactionMethod method)
         {