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

Merge branch 'master' into buckle-locker-fix-1262

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-07 00:20:07 +02:00
parent abfe86be81 c78ce3e27a
commit b850ac2437
267 changed files with 3520 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs
View File

@@ -2,6 +2,7 @@
using Content.Server.GameObjects.Components.Strap;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces;
using Content.Server.Interfaces.GameObjects.Components.Interaction;
using Content.Server.Mobs;
using Content.Server.Utility;
using Content.Shared.GameObjects;
@@ -22,7 +23,7 @@ using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Mobs
{
[RegisterComponent]
public class BuckleComponent : SharedBuckleComponent, IInteractHand
public class BuckleComponent : SharedBuckleComponent, IInteractHand, IDragDrop
{
#pragma warning disable 649
[Dependency] private readonly IEntitySystemManager _entitySystem = default!;
@@ -305,6 +306,11 @@ namespace Content.Server.GameObjects.Components.Mobs
return TryUnbuckle(eventArgs.User);
}
bool IDragDrop.DragDrop(DragDropEventArgs eventArgs)
{
return TryBuckle(eventArgs.User, eventArgs.Target);
}
[Verb]
private sealed class BuckleVerb : Verb<BuckleComponent>
{