Cancel CanBuckle before popup for foldable items (#24358)

* Cancel CanBuckle before popup for foldable items

* Moved to FoldableSystem

diff --git a/Content.Shared/Foldable/FoldableSystem.cs b/Content.Shared/Foldable/FoldableSystem.cs
index 7bf00a5d243c8f8c771f41134e8e4fb2a26646e9..6f2e9f3ee5e9ceb78a7a1cd4b66ce41004fb9f6e 100644 (file)
--- a/Content.Shared/Foldable/FoldableSystem.cs
+++ b/Content.Shared/Foldable/FoldableSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Buckle;
+using Content.Shared.Buckle.Components;
 using Content.Shared.Storage.Components;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
@@ -26,6 +27,8 @@ public sealed class FoldableSystem : EntitySystem
         SubscribeLocalEvent<FoldableComponent, ContainerGettingInsertedAttemptEvent>(OnInsertEvent);
         SubscribeLocalEvent<FoldableComponent, StoreMobInItemContainerAttemptEvent>(OnStoreThisAttempt);
         SubscribeLocalEvent<FoldableComponent, StorageOpenAttemptEvent>(OnFoldableOpenAttempt);
+
+        SubscribeLocalEvent<FoldableComponent, BuckleAttemptEvent>(OnBuckleAttempt);
     }
 
     private void OnGetState(EntityUid uid, FoldableComponent component, ref ComponentGetState args)
@@ -61,6 +64,12 @@ public sealed class FoldableSystem : EntitySystem
             args.Cancelled = true;
     }
 
+    public void OnBuckleAttempt(EntityUid uid, FoldableComponent comp, ref BuckleAttemptEvent args)
+    {
+        if (args.Buckling && comp.IsFolded)
+            args.Cancelled = true;
+    }
+
     /// <summary>
     /// Returns false if the entity isn't foldable.
     /// </summary>