tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Infinate chem dupe fixed (Toilet, drain) + dirty water toilet fix (#27446)

Browse Source 
innital commit
This commit is contained in:
beck-thompson
2024-04-28 20:08:41 -07:00
committed by GitHub
parent 405e020bfa
commit cdd900cef6
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Content.Server/Fluids/EntitySystems/DrainSystem.cs
View File

@@ -87,19 +87,25 @@ public sealed class DrainSystem : SharedDrainSystem
// Try to transfer as much solution as possible to the drain
var transferSolution = _solutionContainerSystem.SplitSolution(containerSoln.Value,
FixedPoint2.Min(containerSolution.Volume, drainSolution.AvailableVolume));
var amountToPutInDrain = drainSolution.AvailableVolume;
var amountToSpillOnGround = containerSolution.Volume - drainSolution.AvailableVolume;
_solutionContainerSystem.TryAddSolution(drain.Solution.Value, transferSolution);
_audioSystem.PlayPvs(drain.ManualDrainSound, target);
_ambientSoundSystem.SetAmbience(target, true);
// If drain is full, spill
if (drainSolution.MaxVolume == drainSolution.Volume)
if (amountToPutInDrain > 0)
{
_puddleSystem.TrySpillAt(Transform(target).Coordinates, containerSolution, out _);
var solutionToPutInDrain = _solutionContainerSystem.SplitSolution(containerSoln.Value, amountToPutInDrain);
_solutionContainerSystem.TryAddSolution(drain.Solution.Value, solutionToPutInDrain);
_audioSystem.PlayPvs(drain.ManualDrainSound, target);
_ambientSoundSystem.SetAmbience(target, true);
}
// Spill the remainder.
if (amountToSpillOnGround > 0)
{
var solutionToSpill = _solutionContainerSystem.SplitSolution(containerSoln.Value, amountToSpillOnGround);
_puddleSystem.TrySpillAt(Transform(target).Coordinates, solutionToSpill, out _);
_popupSystem.PopupEntity(
Loc.GetString("drain-component-empty-verb-target-is-full-message", ("object", target)),
container);