Add a bool to disable buckling on InteractHand (#30001)

diff --git a/Content.Shared/Buckle/Components/StrapComponent.cs b/Content.Shared/Buckle/Components/StrapComponent.cs
index b8186e2b79f6b7967b6fc04604c5efe3e06018a8..101c388a8bfcf80fc3aa7cbf87d31451b162b719 100644 (file)
--- a/Content.Shared/Buckle/Components/StrapComponent.cs
+++ b/Content.Shared/Buckle/Components/StrapComponent.cs
@@ -90,6 +90,12 @@ public sealed partial class StrapComponent : Component
     /// </summary>
     [DataField]
     public float BuckleDoafterTime = 2f;
+
+    /// <summary>
+    /// Whether InteractHand will buckle the user to the strap.
+    /// </summary>
+    [DataField]
+    public bool BuckleOnInteractHand = true;
 }
 
 public enum StrapPosition

diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs b/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs
index 381789f32d68f7ab89f06f77ed004e886e41d92d..7677e800fe96780811e262a97a3242d988577cef 100644 (file)
--- a/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs
@@ -84,7 +84,7 @@ public abstract partial class SharedBuckleSystem
         if (!TryComp(args.User, out BuckleComponent? buckle))
             return;
 
-        if (buckle.BuckledTo == null)
+        if (buckle.BuckledTo == null && component.BuckleOnInteractHand)
             TryBuckle(args.User, args.User, uid, buckle, popup: true);
         else if (buckle.BuckledTo == uid)
             TryUnbuckle(args.User, args.User, buckle, popup: true);

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
index f7b1be8ecdedd561c5b58e9749459c531fd36bf4..965c8261cceb44acefc8973e4f42ffc9e31f066e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
@@ -55,6 +55,7 @@
       rotation: -90
       buckleOffset: "0,0.15"
       unbuckleOffset: "0,0.15"
+      buckleOnInteractHand: False
     - type: Appearance
     - type: GenericVisualizer
       visuals: