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

carpet (#5464)

Browse Source 
* carpet

* reviews

* why tf i gotta fix integration tests in the carpet pr
This commit is contained in:
mirrorcult
2021-11-22 18:01:51 -07:00
committed by GitHub
parent 6c88a15c7e
commit 6fc397f801
11 changed files with 147 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs
View File

@@ -29,6 +29,11 @@ namespace Content.Server.Chemistry.Components
public int Amount { get; set; }
public SolutionAreaEffectInceptionComponent? Inception { get; set; }
/// <summary>
/// Have we reacted with our tile yet?
/// </summary>
public bool ReactedTile = false;
/// <summary>
/// Adds an <see cref="SolutionAreaEffectInceptionComponent"/> to owner so the effect starts spreading and reacting.
/// </summary>
@@ -138,7 +143,12 @@ namespace Content.Server.Chemistry.Components
var reagent = PrototypeManager.Index<ReagentPrototype>(reagentQuantity.ReagentId);
// React with the tile the effect is on
reagent.ReactionTile(tile, reagentQuantity.Quantity * solutionFraction);
// We don't multiply by solutionFraction here since the tile is only ever reacted once
if (!ReactedTile)
{
reagent.ReactionTile(tile, reagentQuantity.Quantity);
ReactedTile = true;
}
// Touch every entity on the tile
foreach (var entity in tile.GetEntitiesInTileFast().ToArray())