Fix mobs not being able to pry doors by just left clicking on them (#27349)

(cherry picked from commit adce5793707d83852f783f891335e0d481aaa94d)
This commit is contained in:
DrSmugleaf 2024-04-26 05:17:25 -07:00 committed by null
parent 7c857e7342
commit 4e2d82a9c6
No known key found for this signature in database
GPG Key ID: 212F05528FD678BE
1 changed files with 9 additions and 8 deletions

View File

@ -1,15 +1,14 @@
using Content.Shared.Prying.Components;
using Content.Shared.Verbs;
using Content.Shared.DoAfter;
using Robust.Shared.Serialization;
using System.Diagnostics.CodeAnalysis;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
using Content.Shared.DoAfter;
using Content.Shared.Doors.Components;
using System.Diagnostics.CodeAnalysis;
using Content.Shared.Interaction;
using Content.Shared.Popups;
using Robust.Shared.Audio;
using Content.Shared.Prying.Components;
using Content.Shared.Verbs;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Serialization;
using PryUnpoweredComponent = Content.Shared.Prying.Components.PryUnpoweredComponent;
namespace Content.Shared.Prying.Systems;
@ -99,14 +98,16 @@ public sealed class PryingSystem : EntitySystem
// to be marked as handled.
return true;
return StartPry(target, user, null, 0.1f, out id); // hand-prying is much slower
// hand-prying is much slower
var modifier = CompOrNull<PryingComponent>(user)?.SpeedModifier ?? 0.1f;
return StartPry(target, user, null, modifier, out id);
}
private bool CanPry(EntityUid target, EntityUid user, out string? message, PryingComponent? comp = null)
{
BeforePryEvent canev;
if (comp != null)
if (comp != null || Resolve(user, ref comp))
{
canev = new BeforePryEvent(user, comp.PryPowered, comp.Force);
}