Plumbing Sinks and Smart Dispensers now respect reagent filters

Author: Unrealomega

Content.Server/_Starlight/Plumbing/EntitySystems/PlumbingOutputSystem.cs

@@ -1,10 +1,13 @@
+using System.Linq;
 using Content.Server.Popups;
+using Content.Shared._Starlight.Chemistry.Components;
 using Content.Shared._Starlight.Plumbing.Components;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;
 using JetBrains.Annotations;
+using NetCord;
 
 namespace Content.Server._Starlight.Plumbing.EntitySystems;
 
@@ -35,6 +38,19 @@ private void OnOutputInteractUsing(Entity<PlumbingOutputComponent> ent, ref Inte
         if (!_solutionSystem.TryGetSolution(ent.Owner, ent.Comp.SolutionName, out var outputSolutionEnt, out var outputSolution))
             return;
 
+        // Starlight Start
+        if (TryComp<RefillReagentFilterComponent>(args.Used, out var filter)
+            && outputSolution.Contents.Any(sol => !filter.Reagents.Contains(sol.Reagent.Prototype)))
+        {
+            // Incorrect reagents being put into our lovely automenders (and anything with filters)!
+            if (args.User is { Valid: true })
+                _popup.PopupEntity(Loc.GetString(filter.Popup), ent.Owner, args.User);
+
+            args.Handled = true;
+            return;
+        }
+        // Starlight End
+
         var transferAmount = outputSolution.Volume;
         if (TryComp<SolutionTransferComponent>(args.Used, out var transferComp))
             transferAmount = FixedPoint2.Min(transferAmount, transferComp.TransferAmount);

Content.Server/_Starlight/Plumbing/EntitySystems/PlumbingSmartDispenserSystem.cs

@@ -1,4 +1,6 @@
 using Content.Server._Starlight.Plumbing.Components;
+using Content.Server.Hands.Systems;
+using Content.Shared._Starlight.Chemistry.Components;
 using Content.Shared._Starlight.Plumbing;
 using Content.Shared._Starlight.Plumbing.Components;
 using Content.Shared.Chemistry;
@@ -12,7 +14,6 @@
 using Content.Shared.Labels.Components;
 using Content.Shared.Popups;
 using JetBrains.Annotations;
-using Content.Server.Hands.Systems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
@@ -454,6 +455,18 @@ private bool TryDispenseReagent(
         if (sourceReagent is not { } sourceReagentValue)
             return false;
 
+        // Starlight Start
+        if (TryComp<RefillReagentFilterComponent>(targetContainer, out var filter)
+            && !filter.Reagents.Contains(reagentId))
+        {
+            // Incorrect reagents being put into our lovely automenders (and anything with filters)!
+            if (showPopup && user is { Valid: true })
+                _popup.PopupEntity(Loc.GetString(filter.Popup), ent.Owner, user.Value);
+
+            return false;
+        }
+        // Starlight End
+
         if (!_solutionSystem.TryGetFitsInDispenser(targetContainer, out var targetEnt, out var targetSolution)
             && !_solutionSystem.TryGetRefillableSolution(targetContainer, out targetEnt, out targetSolution)
             && (!TryComp<InjectorComponent>(targetContainer, out var injector)