Click Drag Functionality + Refactor Interaction Interfaces (#1125)

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>

Content.Client/EscapeMenuOwner.cs

@@ -6,6 +6,7 @@ using Robust.Client.Interfaces.Placement;
 using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.Interfaces.State;
 using Robust.Shared.Input;
+using Robust.Shared.Input.Binding;
 using Robust.Shared.Interfaces.Configuration;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;

Content.Client/GameObjects/Components/Items/ItemComponent.cs

@@ -1,4 +1,6 @@
-using Content.Shared.GameObjects;
+using Content.Client.GameObjects.Components.Storage;
+using Content.Client.Interfaces.GameObjects.Components.Interaction;
+using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Items;
 using Robust.Client.Graphics;
 using Robust.Client.Interfaces.ResourceManagement;

Content.Client/GameObjects/Components/PlaceableSurfaceComponent.cs

@@ -0,0 +1,11 @@
+using Content.Shared.GameObjects.Components;
+using Robust.Shared.GameObjects;
+
+namespace Content.Client.GameObjects.Components
+{
+    [RegisterComponent]
+    public class PlaceableSurfaceComponent : SharedPlaceableSurfaceComponent
+    {
+
+    }
+}

Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Content.Shared.GameObjects.Components.Storage;
 using Content.Client.Interfaces.GameObjects;
+using Content.Client.Interfaces.GameObjects.Components.Interaction;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Client.UserInterface;
@@ -21,7 +22,7 @@ namespace Content.Client.GameObjects.Components.Storage
     /// Client version of item storage containers, contains a UI which displays stored entities and their size
     /// </summary>
     [RegisterComponent]
-    public class ClientStorageComponent : SharedStorageComponent
+    public class ClientStorageComponent : SharedStorageComponent, IClientDraggable
     {
         private Dictionary<EntityUid, int> StoredEntities { get; set; } = new Dictionary<EntityUid, int>();
         private int StorageSizeUsed;
@@ -316,5 +317,17 @@ namespace Content.Client.GameObjects.Components.Storage
                 AddChild(hBoxContainer);
             }
         }
+
+        public bool ClientCanDropOn(CanDropEventArgs eventArgs)
+        {
+            //can only drop on placeable surfaces to empty out contents
+            return eventArgs.Target.HasComponent<PlaceableSurfaceComponent>();
+        }
+
+        public bool ClientCanDrag(CanDragEventArgs eventArgs)
+        {
+            //always draggable, at least for now
+            return true;
+        }
     }
 }

Content.Client/GameObjects/EntitySystems/DragDropSystem.cs

@@ -0,0 +1,397 @@
+using System.Collections.Generic;
+using Content.Client.Interfaces.GameObjects.Components.Interaction;
+using Content.Client.State;
+using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.EntitySystemMessages;
+using Content.Shared.GameObjects.EntitySystems;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+using Robust.Client.GameObjects.EntitySystems;
+using Robust.Client.Graphics.Shaders;
+using Robust.Client.Interfaces.Graphics.ClientEye;
+using Robust.Client.Interfaces.Input;
+using Robust.Client.Interfaces.State;
+using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.Input;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Interfaces.Map;
+using Robust.Shared.IoC;
+using Robust.Shared.Log;
+using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.GameObjects.EntitySystems
+{
+    /// <summary>
+    /// Handles clientside drag and drop logic
+    /// </summary>
+    [UsedImplicitly]
+    public class DragDropSystem : EntitySystem
+    {
+        // drag will be triggered when mouse leaves this deadzone around the click position.
+        private const float DragDeadzone = 2f;
+        // how often to recheck possible targets (prevents calling expensive
+        // check logic each update)
+        private const float TargetRecheckInterval = 0.25f;
+
+        // if a drag ends up being cancelled and it has been under this
+        // amount of time since the mousedown, we will "replay" the original
+        // mousedown event so it can be treated like a regular click
+        private const float MaxMouseDownTimeForReplayingClick = 0.85f;
+
+        private const string ShaderDropTargetInRange = "SelectionOutlineInrange";
+        private const string ShaderDropTargetOutOfRange = "SelectionOutline";
+
+#pragma warning disable 649
+        [Dependency] private readonly IStateManager _stateManager;
+        [Dependency] private readonly IEntityManager _entityManager;
+        [Dependency] private readonly IInputManager _inputManager;
+        [Dependency] private readonly IEyeManager _eyeManager;
+        [Dependency] private readonly IPrototypeManager _prototypeManager;
+        [Dependency] private readonly IMapManager _mapManager;
+#pragma warning restore 649
+
+        // entity performing the drag action
+        private IEntity _dragger;
+        private IEntity _draggedEntity;
+        private IClientDraggable _draggable;
+        private IEntity _dragShadow;
+        private DragState _state;
+        // time since mouse down over the dragged entity
+        private float _mouseDownTime;
+        // screen pos where the mouse down began
+        private Vector2 _mouseDownScreenPos;
+        // how much time since last recheck of all possible targets
+        private float _targetRecheckTime;
+        // reserved initial mousedown event so we can replay it if no drag ends up being performed
+        private PointerInputCmdHandler.PointerInputCmdArgs? _savedMouseDown;
+        // whether we are currently replaying the original mouse down, so we
+        // can ignore any events sent to this system
+        private bool _isReplaying;
+
+        private ShaderInstance _dropTargetInRangeShader;
+        private ShaderInstance _dropTargetOutOfRangeShader;
+        private SharedInteractionSystem _interactionSystem;
+        private InputSystem _inputSystem;
+
+        private List<SpriteComponent> highlightedSprites = new List<SpriteComponent>();
+
+        private enum DragState
+        {
+            NotDragging,
+            // not dragging yet, waiting to see
+            // if they hold for long enough
+            MouseDown,
+            // currently dragging something
+            Dragging,
+        }
+
+
+        public override void Initialize()
+        {
+            _state = DragState.NotDragging;
+
+            _dropTargetInRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetInRange).Instance();
+            _dropTargetOutOfRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetOutOfRange).Instance();
+            _interactionSystem = EntitySystem.Get<SharedInteractionSystem>();
+            _inputSystem = EntitySystem.Get<InputSystem>();
+            // needs to fire on mouseup and mousedown so we can detect a drag / drop
+            CommandBinds.Builder
+                .Bind(EngineKeyFunctions.Use, new PointerInputCmdHandler(OnUse, false))
+                .Register<DragDropSystem>();
+
+        }
+
+        public override void Shutdown()
+        {
+            CancelDrag(false, null);
+            CommandBinds.Unregister<DragDropSystem>();
+            base.Shutdown();
+        }
+
+        private bool OnUse(in PointerInputCmdHandler.PointerInputCmdArgs args)
+        {
+            // not currently predicted
+            if (_inputSystem.Predicted) return false;
+
+            // currently replaying a saved click, don't handle this because
+            // we already decided this click doesn't represent an actual drag attempt
+            if (_isReplaying) return false;
+
+            if (args.State == BoundKeyState.Down)
+            {
+                return OnUseMouseDown(args);
+            }
+            else if (args.State == BoundKeyState.Up)
+            {
+                return OnUseMouseUp(args);
+            }
+
+            return false;
+        }
+
+        private bool OnUseMouseDown(in PointerInputCmdHandler.PointerInputCmdArgs args)
+        {
+            var dragger = args.Session.AttachedEntity;
+            // cancel any current dragging if there is one (shouldn't be because they would've had to have lifted
+            // the mouse, canceling the drag, but just being cautious)
+            CancelDrag(false, null);
+
+            // possibly initiating a drag
+            // check if the clicked entity is draggable
+            if (_entityManager.TryGetEntity(args.EntityUid, out var entity))
+            {
+                // check if the entity is reachable
+                if (_interactionSystem.InRangeUnobstructed(dragger.Transform.MapPosition,
+                    entity.Transform.MapPosition, ignoredEnt: dragger) == false)
+                {
+                    {
+                        return false;
+                    }
+                }
+                foreach (var draggable in entity.GetAllComponents<IClientDraggable>())
+                {
+                    var dragEventArgs = new CanDragEventArgs(args.Session.AttachedEntity, entity);
+                    if (draggable.ClientCanDrag(dragEventArgs))
+                    {
+                        // wait to initiate a drag
+                        _dragger = dragger;
+                        _draggedEntity = entity;
+                        _draggable = draggable;
+                        _mouseDownTime = 0;
+                        _state = DragState.MouseDown;
+                        _mouseDownScreenPos = _inputManager.MouseScreenPosition;
+                        // don't want anything else to process the click,
+                        // but we will save the event so we can "re-play" it if this drag does
+                        // not turn into an actual drag so the click can be handled normally
+                        _savedMouseDown = args;
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        private bool OnUseMouseUp(in PointerInputCmdHandler.PointerInputCmdArgs args)
+        {
+            if (_state == DragState.MouseDown)
+            {
+                // quick mouseup, definitely treat it as a normal click by
+                // replaying the original
+                CancelDrag(true, args.OriginalMessage);
+                return false;
+            }
+            if (_state != DragState.Dragging) return false;
+
+            // remaining CancelDrag calls will not replay the click because
+            // by this time we've determined the input was actually a drag attempt
+
+
+            // tell the server we are dropping if we are over a valid drop target in range.
+            // We don't use args.EntityUid here because drag interactions generally should
+            // work even if there's something "on top" of the drop target
+            if (_interactionSystem.InRangeUnobstructed(_dragger.Transform.MapPosition,
+                    args.Coordinates.ToMap(_mapManager), ignoredEnt: _dragger) == false)
+            {
+                {
+                    CancelDrag(false, null);
+                    return false;
+                }
+            }
+
+            var entities = GameScreenBase.GetEntitiesUnderPosition(_stateManager, args.Coordinates);
+            foreach (var entity in entities)
+            {
+                // check if it's able to be dropped on by current dragged entity
+                if (_draggable.ClientCanDropOn(new CanDropEventArgs(_dragger, _draggedEntity, entity)))
+                {
+                    // tell the server about the drop attempt
+                    RaiseNetworkEvent(new DragDropMessage(args.Coordinates, _draggedEntity.Uid,
+                        entity.Uid));
+
+                    CancelDrag(false, null);
+                    return true;
+                }
+            }
+            CancelDrag(false, null);
+            return false;
+        }
+
+        private void StartDragging()
+        {
+            // this is checked elsewhere but adding this as a failsafe
+            if (_draggedEntity == null || _draggedEntity.Deleted)
+            {
+                Logger.Error("Programming error. Cannot initiate drag, no dragged entity or entity" +
+                               " was deleted.");
+                return;
+            }
+
+            if (_draggedEntity.TryGetComponent<SpriteComponent>(out var draggedSprite))
+            {
+                _state = DragState.Dragging;
+                // pop up drag shadow under mouse
+                var mousePos = _eyeManager.ScreenToMap(_inputManager.MouseScreenPosition);
+                _dragShadow = _entityManager.SpawnEntity("dragshadow", mousePos);
+                var dragSprite = _dragShadow.GetComponent<SpriteComponent>();
+                dragSprite.CopyFrom(draggedSprite);
+                dragSprite.RenderOrder = EntityManager.CurrentTick.Value;
+                dragSprite.Color = dragSprite.Color.WithAlpha(0.7f);
+                // keep it on top of everything
+                dragSprite.DrawDepth = (int) DrawDepth.Overlays;
+
+                HighlightTargets();
+            }
+            else
+            {
+                Logger.Warning("Unable to display drag shadow for {0} because it" +
+                               " has no sprite component.", _draggedEntity.Name);
+            }
+        }
+
+        private void HighlightTargets()
+        {
+            if (_state != DragState.Dragging || _draggedEntity == null ||
+                _draggedEntity.Deleted || _dragShadow == null || _dragShadow.Deleted)
+            {
+                Logger.Warning("Programming error. Can't highlight drag and drop targets, not currently " +
+                               "dragging anything or dragged entity / shadow was deleted.");
+                return;
+            }
+
+            // highlights the possible targets which are visible
+            // and able to be dropped on by the current dragged entity
+
+            // remove current highlights
+            RemoveHighlights();
+
+            // find possible targets on screen even if not reachable
+            // TODO: Duplicated in SpriteSystem
+            var pvsBounds = _eyeManager.GetWorldViewport().Enlarged(5);
+            var pvsEntities = EntityManager.GetEntitiesIntersecting(_eyeManager.CurrentMap, pvsBounds, true);
+            foreach (var pvsEntity in pvsEntities)
+            {
+                if (pvsEntity.TryGetComponent<SpriteComponent>(out var inRangeSprite))
+                {
+                    // can't highlight if there's no sprite or it's not visible
+                    if (inRangeSprite.Visible == false) continue;
+
+                    // check if it's able to be dropped on by current dragged entity
+                    if (_draggable.ClientCanDropOn(new CanDropEventArgs(_dragger, _draggedEntity, pvsEntity)))
+                    {
+                        // highlight depending on whether its in or out of range
+                        var inRange = _interactionSystem.InRangeUnobstructed(_dragger.Transform.MapPosition,
+                            pvsEntity.Transform.MapPosition, ignoredEnt: _dragger);
+                        inRangeSprite.PostShader = inRange ? _dropTargetInRangeShader : _dropTargetOutOfRangeShader;
+                        inRangeSprite.RenderOrder = EntityManager.CurrentTick.Value;
+                        highlightedSprites.Add(inRangeSprite);
+                    }
+                }
+            }
+        }
+
+        private void RemoveHighlights()
+        {
+            foreach (var highlightedSprite in highlightedSprites)
+            {
+                highlightedSprite.PostShader = null;
+                highlightedSprite.RenderOrder = 0;
+            }
+            highlightedSprites.Clear();
+        }
+
+        /// <summary>
+        /// Cancels the drag, firing our saved drag event if instructed to do so and
+        /// we are within the threshold for replaying the click
+        /// (essentially reverting the drag attempt and allowing the original click
+        /// to proceed as if no drag was performed)
+        /// </summary>
+        /// <param name="cause">if fireSavedCmd is true, this should be passed with the value of
+        ///  the pointer cmd that caused the drag to be cancelled</param>
+        private void CancelDrag(bool fireSavedCmd, FullInputCmdMessage cause)
+        {
+            RemoveHighlights();
+            if (_dragShadow != null)
+            {
+                _entityManager.DeleteEntity(_dragShadow);
+            }
+
+            _dragShadow = null;
+            _draggedEntity = null;
+            _draggable = null;
+            _dragger = null;
+            _state = DragState.NotDragging;
+
+            _mouseDownTime = 0;
+
+            if (fireSavedCmd && _savedMouseDown.HasValue && _mouseDownTime < MaxMouseDownTimeForReplayingClick)
+            {
+                var savedValue = _savedMouseDown.Value;
+                _isReplaying = true;
+                // adjust the timing info based on the current tick so it appears as if it happened now
+                var replayMsg = savedValue.OriginalMessage;
+                var adjustedInputMsg = new FullInputCmdMessage(cause.Tick, cause.SubTick, replayMsg.InputFunctionId, replayMsg.State, replayMsg.Coordinates, replayMsg.ScreenCoordinates, replayMsg.Uid);
+
+                _inputSystem.HandleInputCommand(savedValue.Session, EngineKeyFunctions.Use,
+                    adjustedInputMsg, true);
+                _isReplaying = false;
+            }
+
+            _savedMouseDown = null;
+
+        }
+
+        public override void Update(float frameTime)
+        {
+            base.Update(frameTime);
+            if (_state == DragState.MouseDown)
+            {
+                var screenPos = _inputManager.MouseScreenPosition;
+                if (_draggedEntity == null || _draggedEntity.Deleted)
+                {
+                    // something happened to the clicked entity or we moved the mouse off the target so
+                    // we shouldn't replay the original click
+                    CancelDrag(false, null);
+                    return;
+                }
+                else if ((_mouseDownScreenPos - screenPos).Length > DragDeadzone)
+                {
+                    // initiate actual drag
+                    StartDragging();
+                    _mouseDownTime = 0;
+                }
+            }
+            else if (_state == DragState.Dragging)
+            {
+                if (_draggedEntity == null || _draggedEntity.Deleted)
+                {
+                    CancelDrag(false, null);
+                    return;
+                }
+                // still in range of the thing we are dragging?
+                if (_interactionSystem.InRangeUnobstructed(_dragger.Transform.MapPosition,
+                        _draggedEntity.Transform.MapPosition, ignoredEnt: _dragger) == false)
+                {
+                    CancelDrag(false, null);
+                    return;
+                }
+
+                // keep dragged entity under mouse
+                var mousePos = _eyeManager.ScreenToMap(_inputManager.MouseScreenPosition);
+                // TODO: would use MapPosition instead if it had a setter, but it has no setter.
+                // is that intentional, or should we add a setter for Transform.MapPosition?
+                _dragShadow.Transform.WorldPosition = mousePos.Position;
+
+                _targetRecheckTime += frameTime;
+                if (_targetRecheckTime > TargetRecheckInterval)
+                {
+                    HighlightTargets();
+                    _targetRecheckTime = 0;
+                }
+
+            }
+        }
+    }
+}

Content.Client/IgnoredComponents.cs

@@ -25,7 +25,6 @@
             "ItemTeleporter",
             "Portal",
             "EntityStorage",
-            "PlaceableSurface",
             "Wirecutter",
             "Screwdriver",
             "Multitool",

Content.Client/Interfaces/GameObjects/Components/Interaction/IClientDraggable.cs

@@ -0,0 +1,59 @@
+using System;
+using Robust.Shared.Interfaces.GameObjects;
+
+namespace Content.Client.Interfaces.GameObjects.Components.Interaction
+{
+    /// <summary>
+    /// This interface allows a local client to initiate dragging of the component's entity by mouse, for drag and
+    /// drop interactions. The actual logic of what happens on drop
+    /// is handled by IDragDrop
+    /// </summary>
+    public interface IClientDraggable
+    {
+
+        /// <summary>
+        /// Invoked on entities visible to the user to check if this component's entity
+        /// can be dropped on the indicated target entity. No need to check range / reachability in here.
+        /// </summary>
+        /// <returns>true iff target is a valid target to be dropped on by this
+        /// component's entity. Returning true will cause the target entity to be highlighted as a potential
+        /// target and allow dropping when in range.</returns>
+        bool ClientCanDropOn(CanDropEventArgs eventArgs);
+
+        /// <summary>
+        /// Invoked clientside when user is attempting to initiate a drag with this component's entity
+        /// in range. Return true if the drag should be initiated. It's fine to
+        /// return true even if there wouldn't be any valid targets - just return true
+        /// if this entity is in a "draggable" state.
+        /// </summary>
+        /// <param name="eventArgs"></param>
+        /// <returns>true iff drag should be initiated</returns>
+        bool ClientCanDrag(CanDragEventArgs eventArgs);
+    }
+
+    public class CanDropEventArgs : EventArgs
+    {
+        public CanDropEventArgs(IEntity user, IEntity dragged, IEntity target)
+        {
+            User = user;
+            Dragged = dragged;
+            Target = target;
+        }
+
+        public IEntity User { get; }
+        public IEntity Dragged { get; }
+        public IEntity Target { get; }
+    }
+
+    public class CanDragEventArgs : EventArgs
+    {
+        public CanDragEventArgs(IEntity user, IEntity dragged)
+        {
+            User = user;
+            Dragged = dragged;
+        }
+
+        public IEntity User { get; }
+        public IEntity Dragged { get; }
+    }
+}

Content.Client/Sandbox/SandboxManager.cs

@@ -8,6 +8,7 @@ using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Input;
+using Robust.Shared.Input.Binding;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;

Content.Client/ScreenshotHook.cs

@@ -5,6 +5,7 @@ using Content.Shared.Input;
 using Robust.Client.Interfaces.Graphics;
 using Robust.Client.Interfaces.Input;
 using Robust.Shared.Input;
+using Robust.Shared.Input.Binding;
 using Robust.Shared.Interfaces.Resources;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;

Content.Client/State/GameScreen.cs

@@ -1,13 +1,19 @@
+using System.Collections.Generic;
+using System.Collections.Immutable;
 using Content.Client.Chat;
 using Content.Client.Interfaces.Chat;
 using Content.Client.UserInterface;
 using Content.Shared.Input;
 using Robust.Client.Interfaces.Input;
+using Robust.Client.Interfaces.State;
 using Robust.Client.Interfaces.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
+using Robust.Shared.Map;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Client.State

Content.Client/State/GameScreenBase.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using Content.Client.GameObjects.Components;
-using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.EntitySystems;
 using Robust.Client.GameObjects.EntitySystems;
 using Robust.Client.Interfaces.GameObjects;
@@ -9,6 +9,7 @@ using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Client.Interfaces.Graphics.ClientEye;
 using Robust.Client.Interfaces.Input;
 using Robust.Client.Interfaces.UserInterface;
+using Robust.Client.Interfaces.State;
 using Robust.Client.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
@@ -71,7 +72,7 @@ namespace Content.Client.State
                     .InRangeUnobstructed(playerPos, entityPos,
                         predicate: entity =>
                             entity == _playerManager.LocalPlayer.ControlledEntity || entity == entityToClick,
-                        insideBlockerValid: true);
+                        ignoreInsideBlocker: true);
             }
 
             InteractionOutlineComponent outline;
@@ -146,6 +147,25 @@ namespace Content.Client.State
             return foundEntities.Select(a => a.clicked).ToList();
         }
 
+        /// <summary>
+        /// Gets all entities intersecting the given position.
+        ///
+        /// Static alternative to GetEntitiesUnderPosition to cut out
+        /// some of the boilerplate needed to get state manager and check the current state.
+        /// </summary>
+        /// <param name="stateManager">state manager to use to get the current game screen</param>
+        /// <param name="coordinates">coordinates to check</param>
+        /// <returns>the entities under the position, empty list if none found</returns>
+        public static IList<IEntity> GetEntitiesUnderPosition(IStateManager stateManager, GridCoordinates coordinates)
+        {
+            if (stateManager.CurrentState is GameScreenBase gameScreenBase)
+            {
+                return gameScreenBase.GetEntitiesUnderPosition(coordinates);
+            }
+
+            return ImmutableList<IEntity>.Empty;
+        }
+
         internal class ClickableEntityComparer : IComparer<(IEntity clicked, int depth, uint renderOrder)>
         {
             public int Compare((IEntity clicked, int depth, uint renderOrder) x,

Content.Client/State/LobbyState.cs

@@ -12,6 +12,7 @@ using Robust.Client.Interfaces.UserInterface;
 using Robust.Client.Player;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;
+using Robust.Shared.Input.Binding;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;

Content.Client/UserInterface/GameHud.cs

@@ -9,6 +9,7 @@ using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;
+using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;

Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs

@@ -2,6 +2,7 @@ using Content.Server.GameObjects;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Weapon.Melee;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 

Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs

@@ -2,6 +2,7 @@ using Content.Server.GameObjects;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Weapon.Melee;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 

Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs

@@ -1,7 +1,7 @@
 using Content.Server.AI.Utility;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects.Components;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Robust.Shared.Interfaces.GameObjects;
 

Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs

@@ -1,5 +1,5 @@
 using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
 using Content.Server.Utility;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;

Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs

@@ -1,7 +1,7 @@
 using Content.Server.AI.Utility;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects.Components;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.GameObjects.EntitySystems;
 using Robust.Shared.Containers;

Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs

@@ -1,5 +1,5 @@
 using Content.Server.GameObjects;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
 using Content.Server.Utility;
 using Robust.Shared.Containers;
 using Robust.Shared.Interfaces.GameObjects;

Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs

@@ -1,6 +1,8 @@
 using Content.Server.AI.Utility.Curves;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
+using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects.EntitySystems;
 
 namespace Content.Server.AI.Utility.Considerations.ActionBlocker

Content.Server/Chat/ChatManager.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 using Content.Server.GameObjects.Components.Observer;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.Chat;
 using Content.Server.Observer;

Content.Server/Explosions/ExplosionHelper.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Maps;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.GameObjects;
 using Content.Server.Utility;

Content.Server/GameObjects/Components/AnchorableComponent.cs

@@ -1,5 +1,5 @@
-using Content.Server.GameObjects.Components.Interactable;
+using Content.Server.GameObjects.Components.Interactable;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects.Components.Interactable;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components;

Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs

@@ -1,6 +1,7 @@
 using Content.Server.Cargo;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects.Components.Cargo;
 using Content.Shared.Prototypes.Cargo;
 using JetBrains.Annotations;

Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs

@@ -1,6 +1,6 @@
 using System;
 using Content.Server.GameObjects.Components.Metabolism;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Server.Utility;
 using Content.Shared.Chemistry;

Content.Server/GameObjects/Components/Chemistry/PourableComponent.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using Content.Server.GameObjects.Components.Nutrition;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Server.Utility;
 using Content.Shared.Chemistry;

Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using Content.Server.GameObjects.Components.Sound;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.GameObjects.Components.Power;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.GameObjects;

Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs

@@ -1,5 +1,5 @@
 using Content.Server.Chemistry;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Chemistry;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Chemistry;
@@ -19,6 +19,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects.Systems;
+using Content.Server.GameObjects.EntitySystems.Click;
 
 namespace Content.Server.GameObjects.Components.Chemistry
 {

Content.Server/GameObjects/Components/Chemistry/TransformableContainerComponent.cs

@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Chemistry;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;

Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.Components.Power;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces.GameTicking;
 using Content.Server.Utility;
 using Content.Shared.GameObjects.Components.Command;

Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs

@@ -1,4 +1,11 @@
-using Content.Shared.Construction;
+using System;
+using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Interactable;
+using Content.Server.GameObjects.Components.Stack;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
+using Content.Server.Interfaces;
+using Content.Server.Utility;
+using Content.Shared.Construction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;

Content.Server/GameObjects/Components/Damage/BreakableComponent.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Shared.GameObjects;
 using Robust.Shared.GameObjects;

Content.Server/GameObjects/Components/Damage/DamageOnToolInteractComponent.cs

@@ -4,6 +4,7 @@ using Content.Shared.GameObjects.Components.Interactable;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using System.Collections.Generic;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 
 namespace Content.Server.GameObjects.Components.Damage
 {

Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Shared.GameObjects;
 using Robust.Server.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Doors/AirlockComponent.cs

@@ -3,7 +3,7 @@ using System.Threading;
 using Content.Server.GameObjects.Components.Interactable;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.Components.VendingMachines;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Shared.GameObjects.Components.Doors;
 using Content.Shared.GameObjects.Components.Interactable;

Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs

@@ -1,6 +1,8 @@
 using System;
 using Content.Server.GameObjects.Components.Access;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
+using Content.Server.Utility;
 using Content.Shared.GameObjects.Components.Doors;
 using Content.Shared.GameObjects.Components.Movement;
 using Robust.Server.GameObjects;

Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs

@@ -1,5 +1,5 @@
 using Content.Server.Explosions;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 

Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs

@@ -1,5 +1,6 @@
 using Content.Server.GameObjects.Components.Weapon;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;

Content.Server/GameObjects/Components/Fluids/BucketComponent.cs

@@ -1,7 +1,7 @@
 using System;
 using Content.Server.GameObjects.Components.Chemistry;
 using Content.Server.GameObjects.Components.Sound;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.Chemistry;
 using Content.Shared.Interfaces;

Content.Server/GameObjects/Components/Fluids/MopComponent.cs

@@ -1,7 +1,7 @@
 using System;
 using Content.Server.GameObjects.Components.Chemistry;
 using Content.Server.GameObjects.Components.Sound;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.Chemistry;
 using Content.Shared.Interfaces;

Content.Server/GameObjects/Components/GUI/InventoryComponent.cs

@@ -2,7 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks.Dataflow;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs

@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces.GameObjects;
 using Content.Shared.GameObjects;
 using Robust.Server.GameObjects;

Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs

@@ -2,7 +2,7 @@
 using Content.Server.GameObjects.Components.Interactable;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.Components.Power;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Server.Utility;
 using Content.Shared.GameObjects.Components.Gravity;

Content.Server/GameObjects/Components/Healing/HealingComponent.cs

@@ -1,5 +1,5 @@
 using Content.Server.GameObjects.Components.Stack;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.GameObjects;
 using Robust.Shared.GameObjects;

Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Server.Mobs;
 using Content.Shared.GameObjects.Components.Instruments;

Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs

@@ -1,4 +1,7 @@
 using Content.Server.GameObjects.Components.Power;
+using Content.Server.GameObjects.Components.Sound;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces.GameObjects;
 using Content.Shared.GameObjects;

Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Interactable;
 using Robust.Server.GameObjects;

Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs

@@ -1,4 +1,5 @@
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects.Components.Interactable;
 using Content.Shared.Maps;
 using Robust.Shared.GameObjects;

Content.Server/GameObjects/Components/Interactable/ToolComponent.cs

@@ -3,6 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Reflection.Metadata.Ecma335;
+using Content.Server.GameObjects.Components.Chemistry;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Audio;
 using Content.Shared.GameObjects.Components.Interactable;
 using Content.Shared.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Interactable/WelderComponent.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Runtime.Remoting;
 using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.Chat;
 using Content.Server.Interfaces.GameObjects;

Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs

@@ -3,7 +3,7 @@
 using Robust.Shared.Utility;
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Items;

Content.Server/GameObjects/Components/Items/DiceComponent.cs

@@ -1,5 +1,6 @@
-using Content.Server.GameObjects.Components.Sound;
+using Content.Server.GameObjects.Components.Sound;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.Audio;
 using Robust.Server.GameObjects;

Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs

@@ -1,5 +1,5 @@
 using Content.Server.GameObjects.Components.Stack;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.Maps;
 using Robust.Server.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using Content.Server.GameObjects.Components.Interactable;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Sound;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Interactable;
 using Content.Shared.GameObjects.Components.Storage;

Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs

@@ -1,4 +1,8 @@
-using Content.Server.GameObjects.EntitySystems;
+using System;
+using Content.Server.GameObjects.Components;
+using Content.Server.GameObjects.Components.Destructible;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
+using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces.GameObjects;
 using Content.Server.Throw;
 using Content.Server.Utility;
@@ -89,7 +93,7 @@ namespace Content.Server.GameObjects
             var userPos = user.Transform.MapPosition;
             var itemPos = Owner.Transform.MapPosition;
 
-            return InteractionChecks.InRangeUnobstructed(user, itemPos, ignoredEnt: Owner, insideBlockerValid:true);
+            return InteractionChecks.InRangeUnobstructed(user, itemPos, ignoredEnt: Owner, ignoreInsideBlocker:true);
         }
 
         public bool InteractHand(InteractHandEventArgs eventArgs)

Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs

@@ -1,5 +1,5 @@
 using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Storage;

Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs

@@ -3,7 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components;
 using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces.GameObjects;
 using Content.Server.Utility;
 using Content.Shared.GameObjects.Components.Storage;
@@ -21,6 +22,7 @@ using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Maths;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 
@@ -32,7 +34,8 @@ namespace Content.Server.GameObjects
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
     [ComponentReference(typeof(IStorageComponent))]
-    public class ServerStorageComponent : SharedStorageComponent, IInteractUsing, IUse, IActivate, IStorageComponent, IDestroyAct, IExAct
+    public class ServerStorageComponent : SharedStorageComponent, IInteractUsing, IUse, IActivate, IStorageComponent, IDestroyAct, IExAct,
+        IDragDrop
     {
 #pragma warning disable 649
         [Dependency] private readonly IMapManager _mapManager;
@@ -409,5 +412,26 @@ namespace Content.Server.GameObjects
             Owner.PopupMessage(player, "Can't insert.");
             return false;
         }
+
+        public bool DragDrop(DragDropEventArgs eventArgs)
+        {
+            if (eventArgs.Target.TryGetComponent<PlaceableSurfaceComponent>(out var placeableSurface))
+            {
+                if (!placeableSurface.IsPlaceable) return false;
+
+                // empty everything out
+                foreach (var storedEntity in StoredEntities.ToList())
+                {
+                    if (Remove(storedEntity))
+                    {
+                        storedEntity.Transform.WorldPosition = eventArgs.DropLocation.Position;
+                    }
+                }
+
+                return true;
+            }
+
+            return false;
+        }
     }
 }

Content.Server/GameObjects/Components/Items/ToysComponent.cs

@@ -1,5 +1,6 @@
 using Content.Server.GameObjects.Components.Sound;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.Audio;
 using Robust.Server.GameObjects;

Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;

Content.Server/GameObjects/Components/MagicMirrorComponent.cs

@@ -1,5 +1,5 @@
 using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.GameObjects.Components;
 using Content.Shared.Interfaces;

Content.Server/GameObjects/Components/Markers/WarpPointComponent.cs

@@ -1,4 +1,5 @@
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization;

Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Medical;
 using Content.Server.GameObjects.Components.Power;

Content.Server/GameObjects/Components/Metabolism/BloodstreamComponent.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Chemistry;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Sound;
 using Content.Server.GameObjects.Components.Weapon.Melee;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.GameObjects;
 using Robust.Server.GameObjects;

Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs

@@ -1,6 +1,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;

Content.Server/GameObjects/Components/Mobs/DamageStates.cs

@@ -1,5 +1,5 @@
 using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Mobs;
 using Content.Shared.Audio;
 using Content.Shared.GameObjects.Components.Mobs;

Content.Server/GameObjects/Components/Mobs/MindComponent.cs

@@ -1,5 +1,6 @@
 using Content.Server.GameObjects.Components.Observer;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces.GameTicking;
 using Content.Server.Mobs;
 using Robust.Shared.GameObjects;

Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Server.Observer;
 using Content.Shared.GameObjects;

Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs

@@ -1,5 +1,8 @@
 using System;
 using System.Threading;
+using Content.Server.GameObjects.Components.Movement;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
+using Content.Server.Interfaces.GameObjects;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Mobs;
 using Content.Shared.Audio;

Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects.Components.Movement;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs

@@ -1,6 +1,7 @@
 using System;
 using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Audio;
 using Content.Shared.Chemistry;
 using Content.Shared.GameObjects.Components.Nutrition;

Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs

@@ -4,6 +4,8 @@ using Content.Server.GameObjects.Components.Chemistry;
 using Content.Server.GameObjects.Components.Utensil;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Utility;
+using Content.Server.GameObjects.Components.Sound;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Chemistry;
 using Content.Shared.GameObjects.Components.Utensil;
 using Content.Shared.Interfaces;

Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects.Components.Nutrition;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;

Content.Server/GameObjects/Components/Observer/GhostComponent.cs

@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Players;
 using Content.Shared.GameObjects.Components.Observer;
 using Content.Shared.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/PDA/PDAComponent.cs

@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.PDA;
 using Content.Shared.GameObjects;

Content.Server/GameObjects/Components/Paper/PaperComponent.cs

@@ -1,4 +1,5 @@
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.GameObjects.Components;
 using Robust.Server.GameObjects;

Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs

@@ -1,15 +1,14 @@
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
+using Content.Shared.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
 namespace Content.Server.GameObjects.Components
 {
     [RegisterComponent]
-    public class PlaceableSurfaceComponent : Component, IInteractUsing
+    public class PlaceableSurfaceComponent : SharedPlaceableSurfaceComponent, IInteractUsing
     {
-        public override string Name => "PlaceableSurface";
-
         private bool _isPlaceable;
         public bool IsPlaceable { get => _isPlaceable; set => _isPlaceable = value; }
 

Content.Server/GameObjects/Components/PottedPlantHideComponent.cs

@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Interfaces.GameObjects;
 using Content.Shared.Audio;
 using Content.Shared.Interfaces;

Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs

@@ -11,6 +11,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.ViewVariables;
 using System;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Robust.Shared.IoC;
 using Robust.Shared.Interfaces.Timing;
 

Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs

@@ -2,6 +2,7 @@
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Power;
 using Content.Shared.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs

@@ -1,5 +1,5 @@
 using System;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Audio;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs

@@ -1,4 +1,5 @@
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 

Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs

@@ -1,6 +1,7 @@
 using System;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.Components.Sound;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
 using Content.Server.Utility;

Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs

@@ -1,5 +1,6 @@
 using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 

Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs

@@ -1,11 +1,11 @@
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
+using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.Components.Power;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces.GameTicking;
 using Content.Shared.GameObjects.Components.Power;
 using Robust.Server.GameObjects.Components.UserInterface;
 using Robust.Server.Interfaces.GameObjects;
-using Robust.Server.Interfaces.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;

Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs

@@ -1,5 +1,6 @@
 using System;
 using Content.Server.GameObjects.Components.Damage;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.GameObjects.Components.Power.PowerNetComponents;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Audio;

Content.Server/GameObjects/Components/Power/WireComponent.cs

@@ -1,6 +1,7 @@
 using Content.Server.GameObjects.Components.Interactable;
 using Content.Server.GameObjects.Components.Stack;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects.Components.Interactable;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;

Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs

@@ -2,7 +2,7 @@
 using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
 using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Content.Server.GameObjects.Components.Stack;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;

Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs

@@ -1,5 +1,6 @@
-using Content.Server.GameObjects.Components.Projectiles;
+using Content.Server.GameObjects.Components.Projectiles;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects;
 using Content.Shared.Physics;
 using Robust.Shared.GameObjects;

Content.Server/GameObjects/Components/Research/LatheComponent.cs

@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Power;
 using Content.Server.GameObjects.Components.Stack;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.GameObjects.Components.Materials;
 using Content.Shared.GameObjects.Components.Power;

Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs

@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.GameObjects.Components.Research;
 using Robust.Server.GameObjects.Components.UserInterface;

Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.Components.Power;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.Audio;
 using Content.Shared.GameObjects.Components.Research;

Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.Components.Power;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;

Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Power;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Research;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;

Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs

@@ -1,4 +1,5 @@
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Audio;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Shared.Audio;

Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs

@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Audio;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Shared.Audio;

Content.Server/GameObjects/Components/Stack/StackComponent.cs

@@ -1,5 +1,6 @@
 using System;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.GameObjects.Components;
 using Content.Shared.Interfaces;

Content.Server/GameObjects/Components/Strap/StrapComponent.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Strap;
 using Content.Shared.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs

@@ -1,5 +1,5 @@
 using System;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects.Components.Triggers;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;