From 690de73d7c5a0e374230d21d39a9822906f561f0 Mon Sep 17 00:00:00 2001
From: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Date: Sat, 24 Feb 2024 01:06:35 +0900
Subject: [PATCH] - fix: Holy water mixing fix. (#105)

---
 .../SharedSolutionContainerSystem.Capabilities.cs           | 5 ++++-
 Content.Shared/_White/Chemistry/MixableComponent.cs         | 6 ++++++
 Resources/Prototypes/Entities/Objects/base_item.yml         | 1 +
 .../Structures/Storage/Tanks/base_structuretanks.yml        | 3 ++-
 Resources/Prototypes/Recipes/Reactions/single_reagent.yml   | 2 ++
 5 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 Content.Shared/_White/Chemistry/MixableComponent.cs

diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs
index 0d4912a504..8d32f77cd8 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs
@@ -5,6 +5,7 @@ using Content.Shared.FixedPoint;
 using Robust.Shared.Utility;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
+using Content.Shared._White.Chemistry;
 
 namespace Content.Shared.Chemistry.EntitySystems;
 
@@ -94,7 +95,9 @@ public abstract partial class SharedSolutionContainerSystem
             return false;
         }
 
-        var tryGetSolution = EnumerateSolutions(container).FirstOrNull(x => x.Solution.Comp.Solution.CanMix);
+        var ignoreMixing = HasComp<MixableComponent>(container); // WD EDIT
+
+        var tryGetSolution = EnumerateSolutions(container).FirstOrNull(x => x.Solution.Comp.Solution.CanMix || ignoreMixing); // WD EDIT
         if (tryGetSolution.HasValue)
         {
             solution = tryGetSolution.Value.Solution;
diff --git a/Content.Shared/_White/Chemistry/MixableComponent.cs b/Content.Shared/_White/Chemistry/MixableComponent.cs
new file mode 100644
index 0000000000..bffa34198f
--- /dev/null
+++ b/Content.Shared/_White/Chemistry/MixableComponent.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared._White.Chemistry;
+
+[RegisterComponent]
+public sealed partial class MixableComponent : Component
+{
+}
diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml
index a83ee3b0f3..4f5c66dfb3 100644
--- a/Resources/Prototypes/Entities/Objects/base_item.yml
+++ b/Resources/Prototypes/Entities/Objects/base_item.yml
@@ -8,6 +8,7 @@
   - type: Clickable
   - type: InteractionOutline
   - type: MovedByPressure
+  - type: Mixable
   # WD edit sounds start
   - type: MeleeSound
     soundGroups:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
index 238efaf68d..01bacf11fb 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: StorageTank
   parent: BaseStructureDynamic
   name: storage tank
@@ -65,3 +65,4 @@
   - type: ReagentTank
   - type: Transform
     noRot: true
+  - type: Mixable
diff --git a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
index 160353219b..0f9835e804 100644
--- a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
+++ b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
@@ -24,6 +24,7 @@
 
 - type: reaction
   id: BloodToWine
+  sound: /Audio/Effects/holy.ogg
   impact: Low
   requiredMixerCategories:
   - Holy
@@ -35,6 +36,7 @@
 
 - type: reaction
   id: WatertoHolyWater
+  sound: /Audio/Effects/holy.ogg
   impact: Low
   requiredMixerCategories:
   - Holy