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

Remove Explicit GridId References (#8315)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Acruid
2022-06-11 18:54:41 -07:00
committed by GitHub
parent 846321cebb
commit 4f9be42f40
131 changed files with 531 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs
View File

@@ -1,4 +1,4 @@
using Robust.Shared.Map;
using Robust.Shared.Map;
using Robust.Shared.Serialization;
namespace Content.Shared.Atmos.EntitySystems
@@ -37,13 +37,13 @@ namespace Content.Shared.Atmos.EntitySystems
[Serializable, NetSerializable]
public sealed class AtmosDebugOverlayMessage : EntityEventArgs
{
public GridId GridId { get; }
public EntityUid GridId { get; }
public Vector2i BaseIdx { get; }
// LocalViewRange*LocalViewRange
public AtmosDebugOverlayData[] OverlayData { get; }
public AtmosDebugOverlayMessage(GridId gridIndices, Vector2i baseIdx, AtmosDebugOverlayData[] overlayData)
public AtmosDebugOverlayMessage(EntityUid gridIndices, Vector2i baseIdx, AtmosDebugOverlayData[] overlayData)
{
GridId = gridIndices;
BaseIdx = baseIdx;

6
Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
View File

@@ -1,4 +1,4 @@
using Robust.Shared.Map;
using Robust.Shared.Map;
using Robust.Shared.Serialization;
namespace Content.Shared.Atmos.EntitySystems
@@ -84,11 +84,11 @@ namespace Content.Shared.Atmos.EntitySystems
[Serializable, NetSerializable]
public sealed class GasOverlayMessage : EntityEventArgs
{
public GridId GridId { get; }
public EntityUid GridId { get; }
public List<(Vector2i, GasOverlayData)> OverlayData { get; }
public GasOverlayMessage(GridId gridIndices, List<(Vector2i,GasOverlayData)> overlayData)
public GasOverlayMessage(EntityUid gridIndices, List<(Vector2i,GasOverlayData)> overlayData)
{
GridId = gridIndices;
OverlayData = overlayData;

4
Content.Shared/Atmos/GasOverlayChunk.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Shared.Atmos
/// <summary>
/// Grid for this chunk
/// </summary>
public GridId GridIndices { get; }
public EntityUid GridIndices { get; }
/// <summary>
/// Origin of this chunk
@@ -21,7 +21,7 @@ namespace Content.Shared.Atmos
public GameTick LastUpdate { get; private set; }
public GasOverlayChunk(GridId gridIndices, Vector2i vector2i)
public GasOverlayChunk(EntityUid gridIndices, Vector2i vector2i)
{
GridIndices = gridIndices;
Vector2i = vector2i;