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

Generalize ReagentUnit into FixedPoint2 and use it for damage calculations (#5151)

Browse Source 
* Damage units

* sum ext method
This commit is contained in:
mirrorcult
2021-11-03 16:48:03 -07:00
committed by GitHub
parent 8165d8f38c
commit 3ab4a30a0f
100 changed files with 730 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Extinguisher/FireExtinguisherComponent.cs
View File

@@ -9,6 +9,7 @@ using Content.Shared.Interaction;
using Content.Shared.Popups;
using Content.Shared.Sound;
using Content.Shared.Extinguisher;
using Content.Shared.FixedPoint;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
@@ -63,7 +64,7 @@ namespace Content.Server.Extinguisher
&& solutionContainerSystem.TryGetDrainableSolution(targetEntity.Uid, out var targetSolution)
&& solutionContainerSystem.TryGetDrainableSolution(Owner.Uid, out var container))
{
var transfer = ReagentUnit.Min(container.AvailableVolume, targetSolution.DrainAvailable);
var transfer = FixedPoint2.Min(container.AvailableVolume, targetSolution.DrainAvailable);
if (transfer > 0)
{
var drained = solutionContainerSystem.Drain(targetEntity.Uid, targetSolution, transfer);