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

Custom transfer amount to hydroponic trays (#5833)

Browse Source
This commit is contained in:
Mariner102
2021-12-21 19:52:59 -07:00
committed by GitHub
parent bf292a84a0
commit 4257e8e731
4 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Server/Botany/Components/PlantHolderComponent.cs
View File

@@ -3,6 +3,7 @@ using System.Threading.Tasks;
using Content.Server.Atmos;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Chemistry.EntitySystems;
using Content.Server.Chemistry.Components;
using Content.Server.Fluids.Components;
using Content.Server.Hands.Components;
using Content.Server.Plants;
@@ -727,23 +728,20 @@ namespace Content.Server.Botany.Components
var solutionSystem = EntitySystem.Get<SolutionContainerSystem>();
if (solutionSystem.TryGetDrainableSolution(usingItem, out var solution)
&& solutionSystem.TryGetSolution(Owner, SoilSolutionName, out var targetSolution))
&& solutionSystem.TryGetSolution(Owner, SoilSolutionName, out var targetSolution) && _entMan.TryGetComponent(usingItem, out SprayComponent? spray))
{
var amount = FixedPoint2.New(5);
var sprayed = false;
var amount = FixedPoint2.New(1);
var targetEntity = Owner;
var solutionEntity = usingItem;
if (_entMan.TryGetComponent(usingItem, out SprayComponent? spray))
{
sprayed = true;
amount = FixedPoint2.New(1);
SoundSystem.Play(Filter.Pvs(usingItem), spray.SpraySound.GetSound(), usingItem,
AudioHelpers.WithVariation(0.125f));
}
SoundSystem.Play(Filter.Pvs(usingItem), spray.SpraySound.GetSound(), usingItem,
AudioHelpers.WithVariation(0.125f));
var split = solutionSystem.Drain(solutionEntity, solution, amount);
if (split.TotalVolume == 0)
{
user.PopupMessageCursor(Loc.GetString("plant-holder-component-empty-message",
@@ -751,8 +749,7 @@ namespace Content.Server.Botany.Components
return true;
}
user.PopupMessageCursor(Loc.GetString(
sprayed ? "plant-holder-component-spray-message" : "plant-holder-component-transfer-message",
user.PopupMessageCursor(Loc.GetString("plant-holder-component-spray-message",
("owner", Owner),
("amount", split.TotalVolume)));