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

Firelock ECS + some other stuff. (#8366)

Browse Source 
* firelock rejig

* dont error failed resolves

* fix

* less resolves

* switch fire and pressure messages

* update

Co-authored-by: wrexbe <wrexbe@protonmail.com>
This commit is contained in:
Leon Friedrich
2022-09-06 17:55:33 +12:00
committed by GitHub
parent 414f32a4ee
commit 35a142965d
11 changed files with 192 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Atmos.Components;
using Content.Server.Doors.Components;
using Content.Server.Doors.Systems;
using Content.Shared.Atmos;
using Content.Shared.Database;
using Robust.Shared.Map;
@@ -10,6 +11,8 @@ namespace Content.Server.Atmos.EntitySystems
{
public sealed partial class AtmosphereSystem
{
[Dependency] private readonly FirelockSystem _firelockSystem = default!;
private readonly TileAtmosphereComparer _monstermosComparer = new();
private readonly TileAtmosphere?[] _equalizeTiles = new TileAtmosphere[Atmospherics.MonstermosHardTileLimit];
@@ -502,7 +505,7 @@ namespace Content.Server.Atmos.EntitySystems
if (!TryComp(entity, out FirelockComponent? firelock))
continue;
reconsiderAdjacent |= firelock.EmergencyPressureStop();
reconsiderAdjacent |= _firelockSystem.EmergencyPressureStop(entity, firelock);
}
foreach (var entity in mapGrid.GetAnchoredEntities(other.GridIndices))
@@ -510,7 +513,7 @@ namespace Content.Server.Atmos.EntitySystems
if (!TryComp(entity, out FirelockComponent? firelock))
continue;
reconsiderAdjacent |= firelock.EmergencyPressureStop();
reconsiderAdjacent |= _firelockSystem.EmergencyPressureStop(entity, firelock);
}
if (!reconsiderAdjacent)