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

fix-alt click (#5977)

Browse Source
This commit is contained in:
Leon Friedrich
2022-01-01 16:16:45 +13:00
committed by GitHub
parent d6915b934f
commit d02b49b501
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -156,14 +156,14 @@ namespace Content.Shared.Interaction
return; return;
} }
else
{
// We are close to the nearby object. // We are close to the nearby object.
if (altInteract) if (altInteract)
{
// Perform alternative interactions, using context menu verbs. // Perform alternative interactions, using context menu verbs.
AltInteract(user, target.Value); AltInteract(user, target.Value);
}
if (!hands.TryGetActiveHeldEntity(out var heldEntity)) else if (!hands.TryGetActiveHeldEntity(out var heldEntity))
{ {
// Since our hand is empty we will use InteractHand/Activate // Since our hand is empty we will use InteractHand/Activate
InteractHand(user, target.Value); InteractHand(user, target.Value);
@@ -172,8 +172,6 @@ namespace Content.Shared.Interaction
{ {
await InteractUsing(user, heldEntity.Value, target.Value, coordinates); await InteractUsing(user, heldEntity.Value, target.Value, coordinates);
} }
}
} }
public virtual void InteractHand(EntityUid user, EntityUid target) public virtual void InteractHand(EntityUid user, EntityUid target)