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.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.EntitySystems;
+using Content.Server.GameObjects.Components.Interactable;
+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
 {
@@ -43,7 +44,7 @@ namespace Content.Server.GameObjects.Components.Damage
                     {
                             if (welder.WelderLit) return CallDamage(eventArgs, tool);
                     }
-                        break; //If the tool quality is welding and its not lit or its not actually a welder that can be lit then its pointless to continue. 
+                        break; //If the tool quality is welding and its not lit or its not actually a welder that can be lit then its pointless to continue.
                 }
 
                     if (tool.HasQuality(toolQuality)) return CallDamage(eventArgs, tool);

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;
@@ -51,7 +52,7 @@ namespace Content.Server.GameObjects.Components.Explosion
             {
                 Owner.Delete();
             }
-            
+
             return true;
         }
 

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.EntitySystems;
+using Content.Server.GameObjects.Components.Sound;
+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;
@@ -104,7 +105,7 @@ namespace Content.Server.GameObjects.Components.Power.Chargers
             {
                 batteryBarrelComponent.UpdateAppearance();
             }
-            
+
             UpdateStatus();
         }
 

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.EntitySystems;
+using Content.Server.GameObjects.Components.Projectiles;
+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;

Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs

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

Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs

@@ -3,6 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.Components.Power;
+using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Server.Utility;
 using Content.Shared.GameObjects.Components.VendingMachines;
 using Content.Shared.VendingMachines;

Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.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;
 using Content.Shared.GameObjects.Components.Items;
 using Robust.Server.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Power;
-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.Audio;
 using Content.Shared.GameObjects;

Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Audio;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;

Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Audio;
 using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
 using Content.Shared.Interfaces;
@@ -32,7 +33,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
         public int ShotsLeft => _spawnedAmmo.Count + _unspawnedCount;
         public int Capacity => _capacity;
         private int _capacity;
-        
+
         public MagazineType MagazineType => _magazineType;
         private MagazineType _magazineType;
         public BallisticCaliber Caliber => _caliber;
@@ -87,7 +88,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
             {
                 _appearanceComponent = appearanceComponent;
             }
-            
+
             _appearanceComponent?.SetData(MagazineBarrelVisuals.MagLoaded, true);
         }
 
@@ -96,7 +97,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
             _appearanceComponent?.SetData(AmmoVisuals.AmmoCount, ShotsLeft);
             _appearanceComponent?.SetData(AmmoVisuals.AmmoMax, Capacity);
         }
-        
+
         public bool TryInsertAmmo(IEntity user, IEntity ammo)
         {
             if (!ammo.TryGetComponent(out AmmoComponent ammoComponent))
@@ -136,7 +137,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
                 _unspawnedCount--;
                 ammo = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.GridPosition);
             }
-            
+
             UpdateAppearance();
             return ammo;
         }

Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
 using Content.Shared.Interfaces;
 using Robust.Server.GameObjects;
@@ -38,7 +39,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
             serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified);
             serializer.DataField(ref _capacity, "capacity", 6);
             serializer.DataField(ref _fillPrototype, "fillPrototype", null);
-            
+
             _spawnedAmmo = new Stack<IEntity>(_capacity);
         }
 
@@ -56,7 +57,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
                 }
             }
         }
-        
+
         void IMapInit.MapInit()
         {
             _unspawnedCount += _capacity;
@@ -91,7 +92,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
                 Owner.PopupMessage(user, Loc.GetString("No room"));
                 return false;
             }
-            
+
             _spawnedAmmo.Push(entity);
             _ammoContainer.Insert(entity);
             UpdateAppearance();
@@ -149,10 +150,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
             {
                 return;
             }
-            
+
             // This area is dirty but not sure of an easier way to do it besides add an interface or somethin
             bool changed = false;
-            
+
             if (eventArgs.Target.TryGetComponent(out RevolverBarrelComponent revolverBarrel))
             {
                 for (var i = 0; i < Capacity; i++)
@@ -193,9 +194,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
                     TryInsertAmmo(eventArgs.User, ammo);
                     break;
                 }
-                
+
             }
-            
+
             if (changed)
             {
                 UpdateAppearance();
@@ -212,4 +213,4 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
             return UseEntity(eventArgs.User);
         }
     }
-}
+}

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Sound;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
 using Content.Shared.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Sound;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
 using Content.Shared.Interfaces;
 using Robust.Server.GameObjects;

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs

@@ -2,6 +2,7 @@ using System;
 using Content.Server.GameObjects.Components.Sound;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
 using Content.Shared.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs

@@ -4,6 +4,7 @@ using Content.Server.GameObjects.Components.Power;
 using Content.Server.GameObjects.Components.Projectiles;
 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.Weapons.Ranged.Barrels;
 using Robust.Server.GameObjects;
@@ -68,9 +69,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
                 return (int) Math.Ceiling((float) (powerCell.GetComponent<BatteryComponent>().MaxCharge / _baseFireCost));
             }
         }
-        
+
         private AppearanceComponent _appearanceComponent;
-        
+
         // Sounds
         private string _soundPowerCellInsert;
         private string _soundPowerCellEject;
@@ -110,10 +111,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
             {
                 _appearanceComponent = appearanceComponent;
             }
-            
+
             UpdateAppearance();
         }
-        
+
         public void UpdateAppearance()
         {
             _appearanceComponent?.SetData(MagazineBarrelVisuals.MagLoaded, _powerCellContainer.ContainedEntity != null);
@@ -223,14 +224,14 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
             {
                 return null;
             }
-            
+
             var entity = _powerCellContainer.ContainedEntity;
             _powerCellContainer.Remove(entity);
             if (_soundPowerCellEject != null)
             {
                 EntitySystem.Get<AudioSystem>().PlayAtCoords(_soundPowerCellEject, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2));
             }
-            
+
             UpdateAppearance();
             //Dirty();
             return entity;
@@ -242,8 +243,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
             {
                 return false;
             }
-            
-            if (!eventArgs.User.TryGetComponent(out HandsComponent handsComponent) || 
+
+            if (!eventArgs.User.TryGetComponent(out HandsComponent handsComponent) ||
                 PowerCellEntity == null)
             {
                 return false;
@@ -254,7 +255,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
             {
                 return false;
             }
-            
+
             var powerCell = RemovePowerCell();
             handsComponent.PutInHand(itemComponent);
             powerCell.Transform.GridPosition = eventArgs.User.Transform.GridPosition;

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Weapons.Ranged;
 using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs

@@ -5,6 +5,7 @@ using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Projectiles;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Audio;
 using Content.Shared.GameObjects.Components.Weapons.Ranged;
 using Robust.Server.GameObjects.EntitySystems;

Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs

@@ -2,6 +2,7 @@ using System;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects.Components.Weapons.Ranged;
 using Content.Shared.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;

Content.Server/GameObjects/Components/WiresComponent.cs

@@ -3,7 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Interactable;
 using Content.Server.GameObjects.Components.VendingMachines;
-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.GameObjects;
 using Content.Shared.GameObjects.Components;