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

fix ripley grabber bugs (#12962)

Browse Source
This commit is contained in:
Nemanja
2022-12-10 16:00:04 -05:00
committed by GitHub
parent 85624fa9b5
commit 7702e334d7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
View File

@@ -134,6 +134,9 @@ public sealed class MechGrabberSystem : EntitySystem
if (component.Token != null) if (component.Token != null)
return; return;
if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value))
return;
args.Handled = true; args.Handled = true;
component.Token = new(); component.Token = new();
component.AudioStream = _audio.PlayPvs(component.GrabSound, uid); component.AudioStream = _audio.PlayPvs(component.GrabSound, uid);
@@ -142,7 +145,7 @@ public sealed class MechGrabberSystem : EntitySystem
BreakOnTargetMove = true, BreakOnTargetMove = true,
BreakOnUserMove = true, BreakOnUserMove = true,
UsedFinishedEvent = new MechGrabberGrabFinishedEvent(args.Target.Value), UsedFinishedEvent = new MechGrabberGrabFinishedEvent(args.Target.Value),
UserCancelledEvent = new MechGrabberGrabCancelledEvent() UsedCancelledEvent = new MechGrabberGrabCancelledEvent()
}); });
} }