Fansana · Lyroth001 · Nov 27, 2024 · Nov 28, 2024 · Nov 28, 2024 · Nov 28, 2024
@@ -41,4 +41,10 @@ public sealed partial class SolutionRegenerationComponent : Component
     [DataField("nextChargeTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
     [AutoPausedField]
     public TimeSpan NextRegenTime = TimeSpan.FromSeconds(0);
+
+    /// <summary>
+    /// Whether the entity with the solution needs to be equipped
+    /// </summary>
+    [DataField("needsEquipped"), ViewVariables(VVAccess.ReadWrite)]
+    public bool NeedsEquipped = false;
 }
@@ -2,6 +2,7 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Clothing.Components;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Timing;
 
@@ -22,6 +23,9 @@ public override void Update(float frameTime)
             if (_timing.CurTime < regen.NextRegenTime)
                 continue;
 
+            if (regen.NeedsEquipped && TryComp(uid, out ClothingComponent? clothing) && clothing.InSlot == null)
+                continue;
+
             // timer ignores if its full, it's just a fixed cycle
             regen.NextRegenTime = _timing.CurTime + regen.Duration;
             if (_solutionContainer.ResolveSolution((uid, manager), regen.SolutionName, ref regen.Solution, out var solution))

@@ -288,4 +288,4 @@ public void SetLayerState(ClothingComponent clothing, string slot, string mapKey
     }
 
     #endregion
-}
+}
@@ -206,3 +206,35 @@
     sprite: Floof/Clothing/Uniforms/musiciankingblack.rsi
   - type: Clothing
     sprite: Floof/Clothing/Uniforms/musiciankingblack.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformMilkingMachine
+  name: milking machine
+  components:
+  - type: Sprite #sprite is placeholder as I cannot sprite :((
+    sprite: Floof/Clothing/Uniforms/codervalidthong.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Uniforms/codervalidthong.rsi
+  - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts
+    tags:
+    - Skirt
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        maxVol: 100
+  - type: DrawableSolution
+    solution: tank
+  - type: DrainableSolution
+    solution: tank
+  - type: ExaminableSolution
+    solution: tank
+  - type: SolutionItemStatus
+    solution: tank
+  - type: SolutionRegeneration
+    solution: tank
+    generated:
+      reagents:
+      - ReagentId: Cum
+        Quantity: 0.01
+    needsEquipped: true
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         #endregion
-    }
+    }