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

feat: allow mopping evaporating puddles (#38743)

Browse Source
This commit is contained in:
Perry Fraser
2025-07-04 17:50:44 -04:00
committed by GitHub
parent f09bade8e7
commit 4905e097c8
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
View File

@@ -277,17 +277,22 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem
if (!_solutionContainerSystem.ResolveSolution(target, puddle.SolutionName, ref puddle.Solution, out var puddleSolution) || puddleSolution.Volume <= 0)
return false;
// Check if the puddle has any non-evaporative reagents
if (_puddleSystem.CanFullyEvaporate(puddleSolution))
{
_popups.PopupEntity(Loc.GetString("mopping-system-puddle-evaporate", ("target", target)), user, user);
return true;
}
Solution puddleSplit;
var isRemoved = false;
if (absorber.UseAbsorberSolution)
{
// No reason to mop something that 1) can evaporate, 2) is an absorber, and 3) is being mopped with
// something that uses absorbers.
var puddleAbsorberVolume =
puddleSolution.GetTotalPrototypeQuantity(_puddleSystem.GetAbsorbentReagents(puddleSolution));
if (puddleAbsorberVolume == puddleSolution.Volume)
{
_popups.PopupEntity(Loc.GetString("mopping-system-puddle-already-mopped", ("target", target)),
user,
user);
return true;
}
// Check if we have any evaporative reagents on our absorber to transfer
var absorberSolution = absorberSoln.Comp.Solution;
var available = absorberSolution.GetTotalPrototypeQuantity(_puddleSystem.GetAbsorbentReagents(absorberSolution));
@@ -317,6 +322,7 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem
}
else
{
// Note: arguably shouldn't this get all solutions?
puddleSplit = puddleSolution.SplitSolutionWithout(absorber.PickupAmount, _puddleSystem.GetAbsorbentReagents(puddleSolution));
// Despawn if we're done
if (puddleSolution.Volume == FixedPoint2.Zero)

1
Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
View File

@@ -46,6 +46,7 @@ public sealed partial class PuddleSystem
if (!_solutionContainerSystem.ResolveSolution(uid, puddle.SolutionName, ref puddle.Solution, out var puddleSolution))
continue;
// Yes, this means that 50u water + 50u holy water evaporates twice as fast as 100u water.
foreach ((string evaporatingReagent, FixedPoint2 evaporatingSpeed) in GetEvaporationSpeeds(puddleSolution))
{
var reagentTick = evaporation.EvaporationAmount * EvaporationCooldown.TotalSeconds * evaporatingSpeed;

4
Resources/Locale/en-US/fluids/components/absorbent-component.ftl
View File

@@ -1,7 +1,7 @@
mopping-system-target-container-empty = { CAPITALIZE(THE($target)) } is empty!
mopping-system-target-container-empty-water = { CAPITALIZE(THE($target)) } has no water!
mopping-system-puddle-space = { CAPITALIZE(THE($used)) } is full of water
mopping-system-puddle-evaporate = { CAPITALIZE(THE($target)) } is evaporating
mopping-system-puddle-space = { CAPITALIZE(THE($used)) } is full of water.
mopping-system-puddle-already-mopped = { CAPITALIZE(THE($target)) } is already mopped.
mopping-system-no-water = { CAPITALIZE(THE($used)) } has no water!
mopping-system-no-hands = You have no hands!