diff --git a/Content.Shared/Interaction/IInteractUsing.cs b/Content.Shared/Interaction/InteractUsing.cs
similarity index 50%
rename from Content.Shared/Interaction/IInteractUsing.cs
rename to Content.Shared/Interaction/InteractUsing.cs
index e27fcd05fd..3ebf40a517 100644
--- a/Content.Shared/Interaction/IInteractUsing.cs
+++ b/Content.Shared/Interaction/InteractUsing.cs
@@ -1,47 +1,9 @@
-using System.Threading.Tasks;
using JetBrains.Annotations;
using Robust.Shared.Map;
using Robust.Shared.Utility;
namespace Content.Shared.Interaction
{
- ///
- /// This interface gives components behavior when their entity is clicked on by a user with an object in their hand
- /// who is in range and has unobstructed reach of the target entity (allows inside blockers). This includes
- /// clicking on an object in the world as well as clicking on an object in inventory.
- ///
- [RequiresExplicitImplementation]
- public interface IInteractUsing
- {
- ///
- /// The interaction priority. Higher numbers get called first.
- ///
- /// Priority defaults to 0
- int Priority => 0;
-
- ///
- /// Called when using one object on another when user is in range of the target entity.
- ///
- [Obsolete("Use InteractUsingMessage instead")]
- Task InteractUsing(InteractUsingEventArgs eventArgs);
- }
-
- public sealed class InteractUsingEventArgs : EventArgs, ITargetedInteractEventArgs
- {
- public InteractUsingEventArgs(EntityUid user, EntityCoordinates clickLocation, EntityUid @using, EntityUid target)
- {
- User = user;
- ClickLocation = clickLocation;
- Using = @using;
- Target = target;
- }
-
- public EntityUid User { get; }
- public EntityCoordinates ClickLocation { get; }
- public EntityUid Using { get; }
- public EntityUid Target { get; }
- }
-
///
/// Raised when a target entity is interacted with by a user while holding an object in their hand.
///
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 965f9cfe1b..f8c37c462b 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -623,16 +623,6 @@ namespace Content.Shared.Interaction
if (interactUsingEvent.Handled)
return;
- var interactUsingEventArgs = new InteractUsingEventArgs(user, clickLocation, used, target);
- var interactUsings = AllComps(target).OrderByDescending(x => x.Priority);
-
- foreach (var interactUsing in interactUsings)
- {
- // If an InteractUsing returns a status completion we finish our interaction
- if (await interactUsing.InteractUsing(interactUsingEventArgs))
- return;
- }
-
InteractDoAfter(user, used, target, clickLocation, canReach: true);
}