RefillableSolution: selective transfer outwards

Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs

@@ -255,6 +255,11 @@ private bool TryTwoWayAbsorbentRefillableTransfer(
             {
                 _popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", target)), user, user);
             }
+            // Frontier: out-only refillable solutions
+            else if (TryComp<RefillableSolutionComponent>(refillableSoln.Owner, out var refillableSolnComp) && refillableSolnComp.PreventTransferOut)
+            {
+            }
+            // End Frontier
             else
             {
                 // transfer as much contaminants to refillable as will fit

Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs

@@ -14,6 +14,11 @@ private void InitializeTransfers()
 
     private void OnRefillableDragged(Entity<RefillableSolutionComponent> entity, ref DragDropDraggedEvent args)
     {
+        // Frontier: silently prevent non-transferrable solution
+        if (entity.Comp.PreventTransferOut)
+            return;
+        // End Frontier
+
         if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.Solution, out var soln, out var solution) || solution.Volume == FixedPoint2.Zero)
         {
             _popups.PopupEntity(Loc.GetString("mopping-system-empty", ("used", entity.Owner)), entity, args.User);

Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs

@@ -22,4 +22,10 @@ public sealed partial class RefillableSolutionComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public FixedPoint2? MaxRefill = null;
+
+    /// <summary>
+    /// Frontier: prevent transferring solution out into others
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public bool PreventTransferOut = false;
 }

Content.Shared/Fluids/SharedPuddleSystem.cs

@@ -55,7 +55,7 @@ private void OnDumpCanDropTarget(Entity<DumpableSolutionComponent> entity, ref C
 
     private void OnDrainCanDropTarget(Entity<DrainableSolutionComponent> entity, ref CanDropTargetEvent args)
     {
-        if (HasComp<RefillableSolutionComponent>(args.Dragged))
+        if (TryComp<RefillableSolutionComponent>(args.Dragged, out var refillable) && !refillable.PreventTransferOut) // Frontier: HasComp<TryComp, add PreventTransferOut check
         {
             args.CanDrop = true;
             args.Handled = true;
@@ -66,6 +66,8 @@ private void OnRefillableCanDropDragged(Entity<RefillableSolutionComponent> enti
     {
         if (!HasComp<DrainableSolutionComponent>(args.Target) && !HasComp<DumpableSolutionComponent>(args.Target))
             return;
+        if (entity.Comp.PreventTransferOut) // Frontier
+            return; // Frontier
 
         args.CanDrop = true;
         args.Handled = true;

Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml

@@ -28,6 +28,7 @@
     solution: food
   - type: RefillableSolution
     solution: food
+    preventTransferOut: true # Frontier
 
 # usable by any food that can be opened
 # handles appearance with states "icon" and "icon-open"

Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml

@@ -11,7 +11,7 @@
       cube:
         maxVol: 11 # needs room for water
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: Enzyme # Nutriment<Enzyme
           Quantity: 10
   - type: Food
     solution: cube
@@ -172,7 +172,7 @@
       plushie:
         maxVol: 11 # needs room for water
         reagents:
-        - ReagentId: Nutriment #contains nutriment like other dehydrated animals, but isn't edible? Who is grinding dehydrated carp to eat them??
+        - ReagentId: CarpoToxin #Frontier Nutriment<CarpoToxin
           Quantity: 10
   - type: RefillableSolution
     solution: plushie
@@ -232,7 +232,7 @@
       cube:
         maxVol: 11 # needs room for water
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: Ipecac # Nutriment<Ipecac
           Quantity: 10
   - type: Food
     solution: cube