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

Fix strip menu opening on regular click (#14272)

Browse Source
This commit is contained in:
Vasilis The Pikachu
2023-02-25 18:17:40 +01:00
committed by GitHub
parent 2351bbb607
commit c6407f6bdf
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Buckle/Systems/BuckleSystem.Buckle.cs
View File

@@ -76,7 +76,8 @@ public sealed partial class BuckleSystem
private void HandleInteractHand(EntityUid uid, BuckleComponent component, InteractHandEvent args) private void HandleInteractHand(EntityUid uid, BuckleComponent component, InteractHandEvent args)
{ {
args.Handled = TryUnbuckle(uid, args.User, buckle: component); if (TryUnbuckle(uid, args.User, buckle: component))
args.Handled = true;
} }
private void MoveEvent(EntityUid uid, BuckleComponent buckle, ref MoveEvent ev) private void MoveEvent(EntityUid uid, BuckleComponent buckle, ref MoveEvent ev)

3
Content.Server/Interaction/InteractionPopupSystem.cs
View File

@@ -34,6 +34,8 @@ public sealed class InteractionPopupSystem : EntitySystem
if (HasComp<SleepingComponent>(uid)) if (HasComp<SleepingComponent>(uid))
return; return;
args.Handled = true;
var curTime = _gameTiming.CurTime; var curTime = _gameTiming.CurTime;
if (curTime < component.LastInteractTime + component.InteractDelay) if (curTime < component.LastInteractTime + component.InteractDelay)
@@ -85,6 +87,5 @@ public sealed class InteractionPopupSystem : EntitySystem
} }
component.LastInteractTime = curTime; component.LastInteractTime = curTime;
args.Handled = true;
} }
} }