From 30f673793b44d400cb6f6a7f33e294f3d998fcfa Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Sat, 22 Feb 2025 04:20:44 -0500 Subject: [PATCH] Fix sink draining sound (#34173) --- Content.Server/Fluids/EntitySystems/DrainSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Fluids/EntitySystems/DrainSystem.cs b/Content.Server/Fluids/EntitySystems/DrainSystem.cs index 215c58804e..974d6f1ec1 100644 --- a/Content.Server/Fluids/EntitySystems/DrainSystem.cs +++ b/Content.Server/Fluids/EntitySystems/DrainSystem.cs @@ -141,7 +141,7 @@ public sealed class DrainSystem : SharedDrainSystem if (!_solutionContainerSystem.ResolveSolution((uid, manager), DrainComponent.SolutionName, ref drain.Solution, out var drainSolution)) continue; - if (drainSolution.AvailableVolume <= 0) + if (drainSolution.Volume <= 0 && !drain.AutoDrain) { _ambientSoundSystem.SetAmbience(uid, false); continue; @@ -158,7 +158,7 @@ public sealed class DrainSystem : SharedDrainSystem _puddles.Clear(); _lookup.GetEntitiesInRange(Transform(uid).Coordinates, drain.Range, _puddles); - if (_puddles.Count == 0) + if (_puddles.Count == 0 && drainSolution.Volume <= 0) { _ambientSoundSystem.SetAmbience(uid, false); continue;