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

Content changes for mapgrid kill (#12567)

Browse Source
This commit is contained in:
metalgearsloth
2022-11-22 13:12:04 +11:00
committed by GitHub
parent 9170e7ac9d
commit 6c76061887
75 changed files with 192 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/NodeContainer/Nodes/PipeNode.cs
View File

@@ -3,6 +3,7 @@ using Content.Server.NodeContainer.EntitySystems;
using Content.Server.NodeContainer.NodeGroups;
using Content.Shared.Atmos;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Utility;
namespace Content.Server.NodeContainer.Nodes
@@ -152,7 +153,7 @@ namespace Content.Server.NodeContainer.Nodes
public override IEnumerable<Node> GetReachableNodes(TransformComponent xform,
EntityQuery<NodeContainerComponent> nodeQuery,
EntityQuery<TransformComponent> xformQuery,
IMapGrid? grid,
MapGridComponent? grid,
IEntityManager entMan)
{
if (_alwaysReachable != null)
@@ -195,7 +196,7 @@ namespace Content.Server.NodeContainer.Nodes
/// <summary>
/// Gets the pipes that can connect to us from entities on the tile or adjacent in a direction.
/// </summary>
private IEnumerable<PipeNode> LinkableNodesInDirection(Vector2i pos, PipeDirection pipeDir, IMapGrid grid,
private IEnumerable<PipeNode> LinkableNodesInDirection(Vector2i pos, PipeDirection pipeDir, MapGridComponent grid,
EntityQuery<NodeContainerComponent> nodeQuery)
{
foreach (var pipe in PipesInDirection(pos, pipeDir, grid, nodeQuery))
@@ -211,7 +212,7 @@ namespace Content.Server.NodeContainer.Nodes
/// <summary>
/// Gets the pipes from entities on the tile adjacent in a direction.
/// </summary>
protected IEnumerable<PipeNode> PipesInDirection(Vector2i pos, PipeDirection pipeDir, IMapGrid grid,
protected IEnumerable<PipeNode> PipesInDirection(Vector2i pos, PipeDirection pipeDir, MapGridComponent grid,
EntityQuery<NodeContainerComponent> nodeQuery)
{
var offsetPos = pos.Offset(pipeDir.ToDirection());