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

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

Browse Source
This commit is contained in:
ShadowCommander
2024-08-25 10:09:51 -07:00
committed by GitHub
parent 2d70c7d473
commit 5c0753b136
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Buckle/Components/StrapComponent.cs
View File

@@ -90,6 +90,12 @@ public sealed partial class StrapComponent : Component
/// </summary> /// </summary>
[DataField] [DataField]
public float BuckleDoafterTime = 2f; public float BuckleDoafterTime = 2f;
/// <summary>
/// Whether InteractHand will buckle the user to the strap.
/// </summary>
[DataField]
public bool BuckleOnInteractHand = true;
} }
public enum StrapPosition public enum StrapPosition

2
Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs
View File

@@ -84,7 +84,7 @@ public abstract partial class SharedBuckleSystem
if (!TryComp(args.User, out BuckleComponent? buckle)) if (!TryComp(args.User, out BuckleComponent? buckle))
return; return;
if (buckle.BuckledTo == null) if (buckle.BuckledTo == null && component.BuckleOnInteractHand)
TryBuckle(args.User, args.User, uid, buckle, popup: true); TryBuckle(args.User, args.User, uid, buckle, popup: true);
else if (buckle.BuckledTo == uid) else if (buckle.BuckledTo == uid)
TryUnbuckle(args.User, args.User, buckle, popup: true); TryUnbuckle(args.User, args.User, buckle, popup: true);

1
Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
View File

@@ -55,6 +55,7 @@
rotation: -90 rotation: -90
buckleOffset: "0,0.15" buckleOffset: "0,0.15"
unbuckleOffset: "0,0.15" unbuckleOffset: "0,0.15"
buckleOnInteractHand: False
- type: Appearance - type: Appearance
- type: GenericVisualizer - type: GenericVisualizer
visuals: visuals: