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(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