Soapy Water & Edible Soap (#20364)

* soap reagent and soapy water * make soapy water recognizable * Fix tile cleaning bug CleanDecalsReaction was able to take more than the reactVolume it was given. * make soapy water an evaporating reagent * Tile reactions when mopping * Fix indescribably soap flavor * Adjust soap flavours Soap and soapy water now taste clean and syndie soap tastes like punishment. * Better soap numbers & DeleteOnSolutionEmpty * Changed TrashOnEmpty to TrashOnSolutionEmpty * Last TrashOnSolutionEmpty change * Fix merged code not compiling * Requested changes.
2023-10-31 21:39:12 +01:00
parent 672969b710
commit 6a18bdc023
57 changed files with 415 additions and 78 deletions
--- a/Content.Server/Nutrition/EntitySystems/TrashOnSolutionEmptySystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/TrashOnSolutionEmptySystem.cs
@@ -0,0 +1,51 @@
+using Content.Server.Nutrition.Components;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Tag;
+
+namespace Content.Server.Nutrition.EntitySystems
+{
+    public sealed class TrashOnSolutionEmptySystem : EntitySystem
+    {
+        [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+        [Dependency] private readonly TagSystem _tagSystem = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<TrashOnSolutionEmptyComponent, ComponentStartup>(OnStartup);
+            SubscribeLocalEvent<TrashOnSolutionEmptyComponent, SolutionChangedEvent>(OnSolutionChange);
+        }
+
+        public void OnStartup(EntityUid uid, TrashOnSolutionEmptyComponent component, ComponentStartup args)
+        {
+            CheckSolutions(component);
+        }
+
+        public void OnSolutionChange(EntityUid uid, TrashOnSolutionEmptyComponent component, SolutionChangedEvent args)
+        {
+            CheckSolutions(component);
+        }
+
+        public void CheckSolutions(TrashOnSolutionEmptyComponent component)
+        {
+            if (!EntityManager.HasComponent<SolutionContainerManagerComponent>((component).Owner))
+                return;
+
+            if (_solutionContainerSystem.TryGetSolution(component.Owner, component.Solution, out var solution))
+                UpdateTags(component, solution);
+        }
+
+        public void UpdateTags(TrashOnSolutionEmptyComponent component, Solution solution)
+        {
+            if (solution.Volume <= 0)
+            {
+                _tagSystem.AddTag(component.Owner, "Trash");
+                return;
+            }
+            if (_tagSystem.HasTag(component.Owner, "Trash"))
+                _tagSystem.RemoveTag(component.Owner, "Trash");
+        }
+    }
+}