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

EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
nikthechampiongr
2023-09-28 11:34:21 +00:00
committed by GitHub
parent cbeba20ebb
commit 5ff79120e6
24 changed files with 463 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/NPC/Systems/NPCSteeringSystem.cs
View File

@@ -31,6 +31,7 @@ using Robust.Shared.Random;
using Robust.Shared.Threading;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
using Content.Shared.Prying.Systems;
namespace Content.Server.NPC.Systems;
@@ -63,6 +64,7 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly SharedCombatModeSystem _combat = default!;
[Dependency] private readonly PryingSystem _pryingSystem = default!;
private EntityQuery<FixturesComponent> _fixturesQuery;
private EntityQuery<MovementSpeedModifierComponent> _modifierQuery;
@@ -148,7 +150,7 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
private void OnDebugRequest(RequestNPCSteeringDebugEvent msg, EntitySessionEventArgs args)
{
if (!_admin.IsAdmin((IPlayerSession) args.SenderSession))
if (!_admin.IsAdmin((IPlayerSession)args.SenderSession))
return;
if (msg.Enabled)
@@ -440,7 +442,7 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
if (targetPoly != null &&
steering.Coordinates.Position.Equals(Vector2.Zero) &&
TryComp<PhysicsComponent>(uid, out var physics) &&
_interaction.InRangeUnobstructed(uid, steering.Coordinates.EntityId, range: 30f, (CollisionGroup) physics.CollisionMask))
_interaction.InRangeUnobstructed(uid, steering.Coordinates.EntityId, range: 30f, (CollisionGroup)physics.CollisionMask))
{
steering.CurrentPath.Clear();
steering.CurrentPath.Enqueue(targetPoly);