Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ECS Atmos Part 2: Moves a lot of Gas Mixture methods to AtmosphereSystem. (#4218)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-06-23 11:35:30 +02:00
committed by GitHub
parent e16c23a747
commit 263c9ef974
34 changed files with 461 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Atmos/ExcitedGroup.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Atmos;
using Robust.Shared.ViewVariables;
@@ -82,7 +83,7 @@ namespace Content.Server.Atmos
DismantleCooldown = 0;
}
public void SelfBreakdown(bool spaceIsAllConsuming = false)
public void SelfBreakdown(AtmosphereSystem atmosphereSystem, bool spaceIsAllConsuming = false)
{
var combined = new GasMixture(Atmospherics.CellVolume);
@@ -99,7 +100,7 @@ namespace Content.Server.Atmos
foreach (var tile in _tiles)
{
if (tile?.Air == null) continue;
combined.Merge(tile.Air);
atmosphereSystem.Merge(combined, tile.Air);
if (!spaceIsAllConsuming || !tile.Air.Immutable) continue;
combined.Clear();
break;