Revert "Firelocks are no longer pryable by hand if they are powered (…

…#29221)" This reverts commit 6aced66406ee61765a28a66ed83b370de29bb001.
DeltaV-Station · Sep 16, 2024 · 9ef2c54 · 9ef2c54
1 parent d27668e
commit 9ef2c54
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 24 deletions.
diff --git a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
@@ -21,7 +21,6 @@ public override void Initialize()
 
         // Access/Prying
         SubscribeLocalEvent<FirelockComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
-        SubscribeLocalEvent<FirelockComponent, BeforePryEvent>(OnBeforePry);
         SubscribeLocalEvent<FirelockComponent, GetPryTimeModifierEvent>(OnDoorGetPryTimeModifier);
         SubscribeLocalEvent<FirelockComponent, PriedEvent>(OnAfterPried);
 
@@ -61,14 +60,6 @@ private void OnBeforeDoorOpened(EntityUid uid, FirelockComponent component, Befo
             WarnPlayer((uid, component), args.User.Value);
     }
 
-    private void OnBeforePry(EntityUid uid, FirelockComponent component, ref BeforePryEvent args)
-    {
-        if (args.Cancelled || !component.Powered || args.StrongPry || args.PryPowered)
-            return;
-
-        args.Cancelled = true;
-    }
-
     private void OnDoorGetPryTimeModifier(EntityUid uid, FirelockComponent component, ref GetPryTimeModifierEvent args)
     {
         WarnPlayer((uid, component), args.User);

diff --git a/Content.Shared/Prying/Components/PryingComponent.cs b/Content.Shared/Prying/Components/PryingComponent.cs
@@ -43,26 +43,14 @@ public sealed partial class PryingComponent : Component
 /// Cancel to stop the entity from being pried open.
 /// </summary>
 [ByRefEvent]
-public record struct BeforePryEvent(EntityUid User, bool PryPowered, bool Force, bool StrongPry)
+public record struct BeforePryEvent(EntityUid User, bool PryPowered, bool Force)
 {
     public readonly EntityUid User = User;
 
-    /// <summary>
-    /// Whether prying should be allowed even if whatever is being pried is powered.
-    /// </summary>
     public readonly bool PryPowered = PryPowered;
 
-    /// <summary>
-    /// Whether prying should be allowed to go through under most circumstances. (E.g. airlock is bolted).
-    /// Systems may still wish to ignore this occasionally.
-    /// </summary>
     public readonly bool Force = Force;
 
-    /// <summary>
-    /// Whether anything other than bare hands were used. This should only be false if prying is being performed without a prying comp.
-    /// </summary>
-    public readonly bool StrongPry = StrongPry;
-
     public string? Message;
 
     public bool Cancelled;

diff --git a/Content.Shared/Prying/Systems/PryingSystem.cs b/Content.Shared/Prying/Systems/PryingSystem.cs
@@ -109,7 +109,7 @@ private bool CanPry(EntityUid target, EntityUid user, out string? message, Pryin
 
         if (comp != null || Resolve(user, ref comp, false))
         {
-            canev = new BeforePryEvent(user, comp.PryPowered, comp.Force, true);
+            canev = new BeforePryEvent(user, comp.PryPowered, comp.Force);
         }
         else
         {
@@ -119,7 +119,7 @@ private bool CanPry(EntityUid target, EntityUid user, out string? message, Pryin
                 return false;
             }
 
-            canev = new BeforePryEvent(user, false, false, false);
+            canev = new BeforePryEvent(user, false, false);
         }
 
         RaiseLocalEvent(target, ref canev);