Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

3
Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Linq;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Disposal.Unit.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
@@ -28,7 +29,7 @@ namespace Content.Server.Disposal.Tube.Components
holderComponent.TryInsert(entity);
}
holderComponent.Air.Merge(from.Air);
EntitySystem.Get<AtmosphereSystem>().Merge(holderComponent.Air, from.Air);
from.Air.Clear();
return TryInsert(holderComponent);