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

Fix NPC door prying (#15605)

Browse Source
This commit is contained in:
metalgearsloth
2023-04-21 15:05:29 +10:00
committed by GitHub
parent 2744ef81d8
commit e780c6a98a
7 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Doors/Systems/DoorSystem.cs
View File

@@ -1,3 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using Content.Server.Access;
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
@@ -127,7 +128,7 @@ public sealed class DoorSystem : SharedDoorSystem
if (tool.Qualities.Contains(door.PryingQuality))
{
args.Handled = TryPryDoor(uid, args.Used, args.User, door);
args.Handled = TryPryDoor(uid, args.Used, args.User, door, out _);
}
}
@@ -164,7 +165,7 @@ public sealed class DoorSystem : SharedDoorSystem
{
Text = Loc.GetString("door-pry"),
Impact = LogImpact.Low,
Act = () => TryPryDoor(uid, args.User, args.User, component, true),
Act = () => TryPryDoor(uid, args.User, args.User, component, out _, force: true),
});
}
@@ -172,8 +173,10 @@ public sealed class DoorSystem : SharedDoorSystem
/// <summary>
/// Pry open a door. This does not check if the user is holding the required tool.
/// </summary>
public bool TryPryDoor(EntityUid target, EntityUid tool, EntityUid user, DoorComponent door, bool force = false)
public bool TryPryDoor(EntityUid target, EntityUid tool, EntityUid user, DoorComponent door, out DoAfterId? id, bool force = false)
{
id = null;
if (door.State == DoorState.Welded)
return false;
@@ -191,7 +194,7 @@ public sealed class DoorSystem : SharedDoorSystem
var modEv = new DoorGetPryTimeModifierEvent(user);
RaiseLocalEvent(target, modEv, false);
_toolSystem.UseTool(tool, user, target, modEv.PryTimeModifier * door.PryTime, door.PryingQuality, new DoorPryDoAfterEvent());
_toolSystem.UseTool(tool, user, target, TimeSpan.FromSeconds(modEv.PryTimeModifier * door.PryTime), new[] {door.PryingQuality}, new DoorPryDoAfterEvent(), out id);
return true; // we might not actually succeeded, but a do-after has started
}