- fix: Holy water mixing fix. (#105)

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;

Content.Shared/_White/Chemistry/MixableComponent.cs

@@ -0,0 +1,6 @@
+namespace Content.Shared._White.Chemistry;
+
+[RegisterComponent]
+public sealed partial class MixableComponent : Component
+{
+}

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:

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

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