diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs index e6466c8157..cca529fd58 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs @@ -550,7 +550,7 @@ namespace Content.Server.Atmos.EntitySystems } InvalidateVisuals(ent, otherTile); - HandleDecompressionFloorRip(mapGrid, otherTile, otherTile.MonstermosInfo.CurrentTransferAmount); + HandleDecompressionFloorRip((owner, mapGrid), otherTile, otherTile.MonstermosInfo.CurrentTransferAmount); } if (GridImpulse && tileCount > 0) @@ -682,7 +682,7 @@ namespace Content.Server.Atmos.EntitySystems adj.MonstermosInfo[idx.ToOppositeDir()] -= amount; } - private void HandleDecompressionFloorRip(MapGridComponent mapGrid, TileAtmosphere tile, float sum) + private void HandleDecompressionFloorRip(Entity mapGrid, TileAtmosphere tile, float sum) { if (!MonstermosRipTiles) return; diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs index cf4c73aa2f..36355d7ba0 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs @@ -28,7 +28,8 @@ public partial class AtmosphereSystem // Pay more for gas canisters that are more pure float purity = 1; - if (totalMoles > 0) { + if (totalMoles > 0) + { purity = maxComponent / totalMoles; } @@ -88,7 +89,7 @@ public partial class AtmosphereSystem fixVacuum |= airtight.FixVacuum; - if(!airtight.AirBlocked) + if (!airtight.AirBlocked) continue; blockedDirs |= airtight.AirBlockedDirection; @@ -106,9 +107,9 @@ public partial class AtmosphereSystem /// /// The grid in question. /// The indices of the tile. - private void PryTile(MapGridComponent mapGrid, Vector2i tile) + private void PryTile(Entity mapGrid, Vector2i tile) { - if (!mapGrid.TryGetTileRef(tile, out var tileRef)) + if (!_mapSystem.TryGetTileRef(mapGrid.Owner, mapGrid.Comp, tile, out var tileRef)) return; _tile.PryTile(tileRef);