Fix namespaces and optimize imports (#1651)

* Fix namespaces and optimize imports

* Cleanup fixes

* Merge conflict fixes

* Merge conflict fixes

* Merge conflict fixes

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

@@ -2,9 +2,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.Interfaces;
-using Content.Server.Interfaces.GameObjects;
 using Content.Server.Interfaces.GameObjects.Components.Items;
 using Content.Shared.GameObjects.Components.Inventory;
 using JetBrains.Annotations;

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

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.GameObjects.Components.Items;
 using Content.Shared.Access;

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

@@ -1,5 +1,5 @@
 #nullable enable
-using Content.Shared.Jobs;
+using Content.Shared.Roles;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs

@@ -1,11 +1,9 @@
 using System;
-using Content.Server.Atmos;
 using Content.Server.GameObjects.EntitySystems;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.Transform;
 using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;

Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Runtime.CompilerServices;
+using Content.Server.GameObjects.Components.Damage;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces.GameObjects;
 using Content.Shared.Atmos;
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Mobs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;

Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs

@@ -1,8 +1,8 @@
 #nullable enable
+using System.Collections.Generic;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Utility;
 using Content.Shared.Atmos;
 using Content.Shared.GameObjects.Components;
 using Content.Shared.GameObjects.EntitySystems;
@@ -16,8 +16,6 @@ using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
-using System.Collections.Generic;
 
 namespace Content.Server.GameObjects.Components.Atmos
 {

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

@@ -7,11 +7,11 @@ using Content.Server.GameObjects.Components.Strap;
 using Content.Server.Interfaces;
 using Content.Server.Mobs;
 using Content.Server.Utility;
-using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Buckle;
 using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.Components.Strap;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.EntitySystemMessages;

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

@@ -1,10 +1,5 @@
 using Content.Shared.GameObjects.Components.Cargo;
 using Robust.Shared.GameObjects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Content.Server.GameObjects.Components.Cargo
 {

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

@@ -1,30 +1,30 @@
 using System;
 using System.Linq;
 using Content.Server.GameObjects.Components.GUI;
-using Content.Server.Interfaces.GameObjects.Components.Interaction;
+using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
-using Content.Server.Interfaces.GameObjects;
+using Content.Server.Interfaces.GameObjects.Components.Items;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Shared.GameObjects.Components.Chemistry.ChemMaster;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects.Components.Container;
 using Robust.Server.GameObjects.Components.UserInterface;
+using Robust.Server.GameObjects.EntitySystems;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Serialization;
-using Robust.Shared.ViewVariables;
-using Robust.Server.GameObjects.EntitySystems;
-using Robust.Shared.GameObjects.Systems;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Robust.Shared.Interfaces.Random;
 using Robust.Shared.Maths;
 using Robust.Shared.Random;
+using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Chemistry
 {

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

@@ -1,27 +1,28 @@
 using System;
 using System.Linq;
 using Content.Server.GameObjects.Components.GUI;
-using Content.Server.Interfaces.GameObjects.Components.Interaction;
+using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
+using Content.Server.Interfaces.GameObjects.Components.Items;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects.Components.Container;
 using Robust.Server.GameObjects.Components.UserInterface;
+using Robust.Server.GameObjects.EntitySystems;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
-using Robust.Server.GameObjects.EntitySystems;
-using Robust.Shared.GameObjects.Systems;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Server.Interfaces.GameObjects.Components.Items;
 
 namespace Content.Server.GameObjects.Components.Chemistry
 {

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

@@ -1,12 +1,17 @@
-using Content.Server.Chemistry;
-using Content.Server.Interfaces.GameObjects.Components.Interaction;
+using System.Collections.Generic;
+using System.Linq;
+using Content.Server.Chemistry;
+using Content.Server.GameObjects.Components.GUI;
+using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
 using Content.Shared.Utility;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
@@ -15,12 +20,6 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using System.Collections.Generic;
-using System.Linq;
-using Content.Server.GameObjects.Components.GUI;
-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.Interfaces.GameObjects.Components.Interaction;
+using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Chemistry;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;

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

@@ -1,27 +1,15 @@
-using Content.Server.GameObjects.Components.Fluids;
+using System.Linq;
+using Content.Server.GameObjects.Components.Fluids;
 using Content.Shared.Chemistry;
 using Content.Shared.Physics;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.EntityFrameworkCore.Update.Internal;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
 using Robust.Shared.Serialization;
-using Robust.Shared.Timers;
 using Robust.Shared.ViewVariables;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading;
-using Timer = Robust.Shared.Timers.Timer;
 
 namespace Content.Server.GameObjects.Components.Chemistry
 {

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

@@ -1,5 +1,5 @@
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.Interfaces.GameObjects.Components.Interaction;
+using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.Components.Command;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects.Components.UserInterface;

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

@@ -1,5 +1,4 @@
-using Content.Server.GameObjects.EntitySystems.Click;
-using Content.Shared.Construction;
+using Content.Shared.Construction;
 using Content.Shared.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;

Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Interactable;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.Components.Conveyor;

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

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

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

@@ -1,9 +1,7 @@
 using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Interfaces.GameObjects;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.Damage;
 using Robust.Server.GameObjects.EntitySystems;
-using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components;
 using Robust.Shared.GameObjects.Systems;

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

@@ -1,9 +1,10 @@
-using Content.Server.GameObjects.Components.Interactable;
+using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Interactable;
+using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Interactable;
+using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
-using System.Collections.Generic;
-using Content.Shared.Interfaces.GameObjects.Components;
 
 namespace Content.Server.GameObjects.Components.Damage
 {
@@ -56,9 +57,9 @@ namespace Content.Server.GameObjects.Components.Damage
         {
             if (eventArgs.Target.TryGetComponent<DamageableComponent>(out var damageable))
             {
-                if(tool.HasQuality(ToolQuality.Welding)) damageable.TakeDamage(Shared.GameObjects.DamageType.Heat, Damage, eventArgs.Using, eventArgs.User);
+                if(tool.HasQuality(ToolQuality.Welding)) damageable.TakeDamage(DamageType.Heat, Damage, eventArgs.Using, eventArgs.User);
                 else
-                damageable.TakeDamage(Shared.GameObjects.DamageType.Brute, Damage, eventArgs.Using, eventArgs.User);
+                damageable.TakeDamage(DamageType.Brute, Damage, eventArgs.Using, eventArgs.User);
                 return true;
             }
                 return false;

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

@@ -1,9 +1,8 @@
 using System;
-using Content.Shared.GameObjects;
-using JetBrains.Annotations;
+using Content.Shared.GameObjects.Components.Damage;
 using Robust.Shared.Interfaces.GameObjects;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Damage
 {
     /// <summary>
     /// Triggers an event when values rise above or drop below this threshold

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

@@ -1,15 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.Interfaces;
 using Content.Server.Interfaces.GameObjects;
-using Content.Shared.GameObjects;
+using Content.Server.Interfaces.GameObjects.Components.Damage;
+using Content.Shared.GameObjects.Components.Damage;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Damage
 {
     //TODO: add support for component add/remove
 

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Content.Server.Interfaces.GameObjects.Components.Interaction;
-using Content.Server.Interfaces;
-using Content.Shared.GameObjects;
+using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects;
+using Content.Shared.GameObjects.Components.Damage;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;
@@ -12,7 +12,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Destructible
+namespace Content.Server.GameObjects.Components.Damage
 {
     /// <summary>
     /// Deletes the entity once a certain damage threshold has been reached.

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

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.Damage;
 using Robust.Shared.Interfaces.Serialization;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Damage
 {
     /// <summary>
     /// Resistance set used by damageable objects.
@@ -35,7 +35,7 @@ namespace Content.Server.GameObjects
                 {
                     _resistances[damageType] = resistanceSetting;
                 });
-            } 
+            }
         }
 
         /// <summary>

Content.Server/GameObjects/Components/Disposal/DisposalCommands.cs

@@ -1,5 +1,4 @@
 #nullable enable
-using Content.Server.Interfaces;
 using Robust.Server.Interfaces.Console;
 using Robust.Server.Interfaces.Player;
 using Robust.Shared.GameObjects;

Content.Server/GameObjects/Components/Disposal/DisposalHolderComponent.cs

@@ -1,5 +1,7 @@
 #nullable enable
 using System.Linq;
+using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.GameObjects.Components.Mobs;
 using Robust.Server.GameObjects.Components.Container;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;

Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs

@@ -1,9 +1,9 @@
 #nullable enable
 using System;
 using System.Linq;
-using Content.Server.Interfaces.GameObjects.Components.Interaction;
-using Content.Shared.GameObjects;
+using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.Components.Disposal;
+using Content.Shared.GameObjects.Verbs;
 using Content.Shared.Interfaces;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;

Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs

@@ -4,12 +4,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Content.Server.GameObjects.Components.GUI;
+using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Disposal;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.Components.Container;

Content.Server/GameObjects/Components/DoAfterComponent.cs

@@ -1,6 +1,6 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.DoAfter;
 using Content.Shared.GameObjects.Components;
 using Robust.Server.GameObjects;
 using Robust.Server.Interfaces.GameObjects;
@@ -38,20 +38,20 @@ namespace Content.Server.GameObjects.Components
             {
                 return;
             }
-            
+
             foreach (var (doAfter, id) in _doAfters)
             {
                 // THE ALMIGHTY PYRAMID
                 var message = new DoAfterMessage(
-                    id, 
+                    id,
                     doAfter.UserGrid,
                     doAfter.TargetGrid,
-                    doAfter.StartTime, 
-                    doAfter.EventArgs.Delay, 
-                    doAfter.EventArgs.BreakOnUserMove, 
+                    doAfter.StartTime,
+                    doAfter.EventArgs.Delay,
+                    doAfter.EventArgs.BreakOnUserMove,
                     doAfter.EventArgs.BreakOnTargetMove,
                     doAfter.EventArgs.Target?.Uid ?? EntityUid.Invalid);
-                
+
                 SendNetworkMessage(message, connectedClient);
             }
         }
@@ -59,7 +59,7 @@ namespace Content.Server.GameObjects.Components
         private bool TryGetConnectedClient(out INetChannel? connectedClient)
         {
             connectedClient = null;
-            
+
             if (!Owner.TryGetComponent(out IActorComponent actorComponent))
             {
                 return false;
@@ -81,15 +81,15 @@ namespace Content.Server.GameObjects.Components
             if (TryGetConnectedClient(out var connectedClient))
             {
                 var message = new DoAfterMessage(
-                    _runningIndex, 
+                    _runningIndex,
                     doAfter.UserGrid,
                     doAfter.TargetGrid,
-                    doAfter.StartTime, 
-                    doAfter.EventArgs.Delay, 
-                    doAfter.EventArgs.BreakOnUserMove, 
+                    doAfter.StartTime,
+                    doAfter.EventArgs.Delay,
+                    doAfter.EventArgs.BreakOnUserMove,
                     doAfter.EventArgs.BreakOnTargetMove,
                     doAfter.EventArgs.Target?.Uid ?? EntityUid.Invalid);
-                
+
                 SendNetworkMessage(message, connectedClient);
             }
 
@@ -108,7 +108,7 @@ namespace Content.Server.GameObjects.Components
                 var message = new CancelledDoAfterMessage(index);
                 SendNetworkMessage(message, connectedClient);
             }
-            
+
             _doAfters.Remove(doAfter);
         }
 
@@ -127,4 +127,4 @@ namespace Content.Server.GameObjects.Components
             _doAfters.Remove(doAfter);
         }
     }
-}
+}

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

@@ -1,10 +1,12 @@
 using System;
 using System.Linq;
+using System.Threading;
 using Content.Server.GameObjects.Components.Access;
 using Content.Server.GameObjects.Components.Atmos;
+using Content.Server.GameObjects.Components.Damage;
 using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Interfaces.GameObjects;
+using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Doors;
 using Content.Shared.GameObjects.Components.Movement;
 using Content.Shared.Interfaces.GameObjects.Components;
@@ -17,11 +19,10 @@ using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
-using Robust.Shared.Timers;
 using Robust.Shared.ViewVariables;
-using CancellationTokenSource = System.Threading.CancellationTokenSource;
+using Timer = Robust.Shared.Timers.Timer;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Doors
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
@@ -237,7 +238,7 @@ namespace Content.Server.GameObjects
                     if (percentage < 0.1f)
                         continue;
 
-                    damage.TakeDamage(Shared.GameObjects.DamageType.Brute, DoorCrushDamage);
+                    damage.TakeDamage(DamageType.Brute, DoorCrushDamage);
                     stun.Paralyze(DoorStunTime);
                     hitSomeone = true;
                 }

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

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

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

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

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

@@ -1,9 +1,7 @@
-using System;
 using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 

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

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Content.Server.GameObjects.Components.Movement;
 using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.GameObjects.Components.Movement;
 using Content.Shared.Chemistry;
+using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.Physics;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.EntitySystems;
@@ -24,7 +24,6 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 using Timer = Robust.Shared.Timers.Timer;
-using Content.Shared.GameObjects.EntitySystems;
 
 namespace Content.Server.GameObjects.Components.Fluids
 {

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

@@ -1,7 +1,6 @@
 #nullable enable
 using Content.Shared.Chemistry;
 using Robust.Server.Interfaces.GameObjects;
-
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;

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

@@ -1,21 +1,13 @@
-using System;
-using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Chemistry;
+using Content.Server.GameObjects.Components.Chemistry;
 using Content.Server.Interfaces;
 using Content.Shared.Chemistry;
 using Content.Shared.Interfaces.GameObjects.Components;
-using Microsoft.EntityFrameworkCore.Update.Internal;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Components;
 using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 

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

@@ -3,14 +3,15 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Movement;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Items;
 using Content.Server.GameObjects.EntitySystems.Click;
 using Content.Server.Interfaces.GameObjects.Components.Interaction;
-using Content.Shared.BodySystem;
+using Content.Server.Interfaces.GameObjects.Components.Items;
+using Content.Shared.GameObjects.Components.Items;
 using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.Health.BodySystem;
 using Content.Shared.Physics;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.Components.Container;
@@ -202,7 +203,7 @@ namespace Content.Server.GameObjects.Components.GUI
                 if (!interactionSystem.TryDroppedInteraction(Owner, item.Owner))
                     return false;
             }
-            
+
             interactionSystem.DroppedInteraction(Owner, item.Owner);
             return true;
         }

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

@@ -1,4 +1,3 @@
-using Content.Server.GameObjects.Components;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Robust.Server.GameObjects.Components.Container;
 using Robust.Shared.GameObjects;
@@ -7,7 +6,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Timers;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.GUI
 {
     // Handles the special behavior of pockets/ID card slot and their relation to uniforms.
     [RegisterComponent]

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

@@ -1,7 +1,7 @@
 using Robust.Shared.Interfaces.GameObjects;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.GUI
 {
     /// <summary>
     ///     Allows for overriding inventory-related behavior on an entity.

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

@@ -1,15 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Server.GameObjects.Components.Items.Clothing;
 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;
 using Content.Server.Interfaces.GameObjects;
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.Inventory;
 using Content.Shared.GameObjects.EntitySystems;
 using Robust.Server.GameObjects.Components.Container;
 using Robust.Shared.GameObjects;
@@ -22,9 +20,9 @@ using Robust.Shared.Map;
 using Robust.Shared.Players;
 using Robust.Shared.ViewVariables;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
-using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage;
+using static Content.Shared.GameObjects.Components.Inventory.SharedInventoryComponent.ClientInventoryMessage;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.GUI
 {
     [RegisterComponent]
     public class InventoryComponent : SharedInventoryComponent, IExAct, IEffectBlocker, IPressureProtection
@@ -101,7 +99,7 @@ namespace Content.Server.GameObjects
         bool IEffectBlocker.CanSlip()
         {
             if(Owner.TryGetComponent(out InventoryComponent inventoryComponent) &&
-                inventoryComponent.TryGetSlotItem(EquipmentSlotDefines.Slots.SHOES, out ItemComponent shoes)
+                inventoryComponent.TryGetSlotItem(Slots.SHOES, out ItemComponent shoes)
             )
             {
                 return EffectBlockerSystem.CanSlip(shoes.Owner);

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

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

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

@@ -1,11 +1,12 @@
-using Content.Server.GameObjects.Components.Stack;
+using Content.Server.GameObjects.Components.Damage;
+using Content.Server.GameObjects.Components.Stack;
 using Content.Server.Utility;
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Server.GameObjects.Components.Weapon.Melee
+namespace Content.Server.GameObjects.Components.Healing
 {
     [RegisterComponent]
     public class HealingComponent : Component, IAfterInteract, IUse

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

@@ -1,10 +1,11 @@
 using Content.Server.GameObjects.Components.GUI;
+using Content.Server.GameObjects.Components.Items.Clothing;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Power;
-using Content.Server.GameObjects.EntitySystems.Click;
 using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
 using Content.Shared.Interfaces;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects;

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

@@ -2,9 +2,8 @@
 using System;
 using Content.Server.Atmos;
 using Content.Server.GameObjects.Components.Chemistry;
+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;
 using Content.Server.Interfaces.Chat;
 using Content.Server.Interfaces.GameObjects;
@@ -21,7 +20,6 @@ using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 using Robust.Shared.Serialization;
 using Content.Shared.GameObjects.EntitySystems;
-using Robust.Shared.GameObjects.Systems;
 
 namespace Content.Server.GameObjects.Components.Interactable
 {

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

@@ -1,19 +1,18 @@
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components;
 using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.Interfaces;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Items;
 using Content.Shared.Interfaces.GameObjects.Components;
-using Robust.Shared.IoC;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
-using Robust.Shared.Interfaces.GameObjects;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Items.Clothing
 {
     [RegisterComponent]
     [ComponentReference(typeof(ItemComponent))]

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

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

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

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

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

@@ -1,16 +1,12 @@
 using System.Linq;
-using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.Interfaces.GameObjects.Components;
-using Microsoft.EntityFrameworkCore.Internal;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
 using Robust.Shared.Random;
 
 namespace Content.Server.GameObjects.Components.Items.Storage

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

@@ -2,11 +2,12 @@
 using System.Linq;
 using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Interactable;
-using Content.Server.Interfaces.GameObjects.Components.Interaction;
-using Content.Shared.GameObjects;
+using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.Components.Interactable;
 using Content.Shared.GameObjects.Components.Storage;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
 using Content.Shared.Interfaces;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Content.Shared.Physics;

Content.Server/GameObjects/Components/Items/Storage/Fill/CustodialClosetFill.cs

@@ -2,7 +2,6 @@ using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Random;
 
 namespace Content.Server.GameObjects.Components.Items.Storage.Fill
 {

Content.Server/GameObjects/Components/Items/Storage/Fill/MedkitFillComponent.cs

@@ -1,9 +1,7 @@
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
 
 namespace Content.Server.GameObjects.Components.Items.Storage.Fill
 {

Content.Server/GameObjects/Components/Items/Storage/Fill/ToolLockerFillComponent.cs

@@ -1,6 +1,5 @@
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;

Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs

@@ -3,7 +3,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
 using Robust.Shared.Random;
 
 namespace Content.Server.GameObjects.Components.Items.Storage.Fill

Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxEmergencyFillComponent.cs

@@ -3,7 +3,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
 using Robust.Shared.Random;
 
 namespace Content.Server.GameObjects.Components.Items.Storage.Fill

Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxGoldFillComponent.cs

@@ -3,7 +3,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
 using Robust.Shared.Random;
 
 namespace Content.Server.GameObjects.Components.Items.Storage.Fill

Content.Server/GameObjects/Components/Items/Storage/Fill/UtilityBeltClothingFillComponent.cs

@@ -1,7 +1,6 @@
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
 
 namespace Content.Server.GameObjects.Components.Items.Storage.Fill

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

@@ -1,12 +1,12 @@
 using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.Interfaces.GameObjects.Components.Interaction;
+using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces.GameObjects.Components.Items;
 using Content.Server.Throw;
 using Content.Server.Utility;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Items;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.Containers;
@@ -18,7 +18,7 @@ using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.GameObjects.Components.Items.Storage
 {
     [RegisterComponent]
     [ComponentReference(typeof(StorableComponent))]

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

@@ -1,8 +1,8 @@
 using Content.Server.GameObjects.Components.Access;
 using Content.Server.Interfaces;
-using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Storage;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
 using Content.Shared.Interfaces;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects;

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

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

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

@@ -1,34 +1,36 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using Content.Server.BodySystem;
-using Content.Server.Interfaces.GameObjects.Components.Interaction;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.ViewVariables;
 using Content.Server.GameObjects.Components.Chemistry;
 using Content.Server.GameObjects.Components.GUI;
-using Content.Shared.Chemistry;
-using Robust.Shared.Serialization;
-using Robust.Shared.Interfaces.GameObjects;
-using Content.Shared.Prototypes.Kitchen;
-using Content.Shared.Kitchen;
-using Robust.Shared.Timers;
-using Robust.Server.GameObjects;
-using Content.Shared.GameObjects.Components.Power;
-using Robust.Server.GameObjects.EntitySystems;
-using Robust.Server.GameObjects.Components.Container;
-using Robust.Server.GameObjects.Components.UserInterface;
-using Robust.Server.Interfaces.GameObjects;
-using Robust.Shared.Localization;
-using Content.Server.Interfaces;
-using Robust.Shared.Audio;
-using Content.Server.Interfaces.GameObjects;
-using Content.Server.Interfaces.Chat;
-using Content.Shared.BodySystem;
-using Robust.Shared.GameObjects.Systems;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Health.BodySystem;
+using Content.Server.Interfaces;
+using Content.Server.Interfaces.Chat;
+using Content.Server.Interfaces.GameObjects;
+using Content.Shared.Chemistry;
+using Content.Shared.GameObjects.Components.Power;
+using Content.Shared.Health.BodySystem;
 using Content.Shared.Interfaces;
 using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Kitchen;
+using Content.Shared.Prototypes.Kitchen;
+using Robust.Server.GameObjects;
+using Robust.Server.GameObjects.Components.Container;
+using Robust.Server.GameObjects.Components.UserInterface;
+using Robust.Server.GameObjects.EntitySystems;
+using Robust.Server.Interfaces.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timers;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Kitchen
 {
@@ -311,7 +313,7 @@ namespace Content.Server.GameObjects.Components.Kitchen
                            (_currentCookTimerTime == (uint)recipeToCook.CookTime);
             SetAppearance(MicrowaveVisualState.Cooking);
             _audioSystem.PlayFromEntity(_startCookingSound, Owner, AudioParams.Default);
-            Timer.Spawn((int)(_currentCookTimerTime * _cookTimeMultiplier), (System.Action)(() =>
+            Timer.Spawn((int)(_currentCookTimerTime * _cookTimeMultiplier), (Action)(() =>
             {
                 if (_lostPower)
                 {

Content.Server/GameObjects/Components/ListeningComponent.cs

@@ -1,14 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Interfaces;
+using Content.Server.Interfaces;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.IoC;
 
 namespace Content.Server.GameObjects.Components
 {

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

@@ -8,10 +8,10 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.Interfaces.Reflection;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
-using Logger = Robust.Shared.Log.Logger;
 
 namespace Content.Server.GameObjects.Components.Markers
 {

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

@@ -1,5 +1,5 @@
 using Content.Shared.GameObjects.Components.Markers;
-using Content.Shared.Jobs;
+using Content.Shared.Roles;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;

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

@@ -1,18 +1,13 @@
-using System;
-using Content.Server.GameObjects.Components.Markers;
 using System.Collections.Generic;
-using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
-using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
-using Robust.Shared.Maths;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
+using Robust.Shared.Maths;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
-using Logger = Robust.Shared.Log.Logger;
 
 namespace Content.Server.GameObjects.Components.Markers
 {

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

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

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

@@ -1,8 +1,13 @@
 using System;
 using System.Collections.Generic;
-using Content.Shared.GameObjects;
+using Content.Server.GameObjects.Components.Damage;
+using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Medical;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
+using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.Components.Container;
 using Robust.Server.GameObjects.Components.UserInterface;
@@ -11,8 +16,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Shared.Interfaces.GameObjects.Components;
 
 namespace Content.Server.GameObjects.Components.Medical
 {

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

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

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

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

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

@@ -1,12 +1,11 @@
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Mobs;
+using Content.Server.Mobs;
 using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.EntitySystems;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Mobs
 {
     /// <summary>
     /// Defines the blocking effect of each damage state, and what effects to apply upon entering or exiting the state

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

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
-using Content.Shared.GameObjects;
+using Content.Server.GameObjects.Components.Damage;
+using Content.Shared.GameObjects.Components.Damage;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Mobs.DamageThresholdTemplates
 {
     /// <summary>
     /// Defines the threshold values for each damage state for any kind of species

Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects;
+using Content.Server.GameObjects.Components.Damage;
+using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Mobs;
 using JetBrains.Annotations;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Mobs.DamageThresholdTemplates
 {
     [UsedImplicitly]
     public class Human : DamageTemplates

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

@@ -1,8 +1,10 @@
 using System;
+using Content.Server.GameObjects.Components.GUI;
+using Content.Server.GameObjects.Components.Items.Clothing;
 using Content.Shared.GameObjects.Components.Inventory;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Mobs
 {
     [RegisterComponent]
     public class HeatResistanceComponent : Component

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

@@ -1,19 +1,18 @@
 #nullable enable
 using Content.Server.GameObjects.Components.Observer;
-using Content.Server.GameObjects.EntitySystems.Click;
 using Content.Server.Interfaces.GameTicking;
 using Content.Server.Mobs;
+using Content.Shared.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
 using Robust.Shared.Localization;
+using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timers;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using Content.Shared.GameObjects.EntitySystems;
 
 namespace Content.Server.GameObjects.Components.Mobs
 {

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

@@ -1,14 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Content.Shared.GameObjects.Components.Mobs;
 using Robust.Server.Interfaces.GameObjects;
-using Robust.Server.Player;
-using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.Players;
-using Robust.Shared.Timers;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Mobs

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

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Interfaces.GameObjects.Components.Interaction;
-using Content.Server.Interfaces;
+using Content.Server.GameObjects.Components.Damage;
+using Content.Server.GameObjects.Components.Mobs.DamageThresholdTemplates;
+using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Interfaces.GameObjects;
 using Content.Server.Observer;
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.Components.Movement;
 using Content.Shared.GameObjects.EntitySystems;
@@ -15,7 +16,7 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.GameObjects.Components.Mobs
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedSpeciesComponent))]
@@ -50,7 +51,7 @@ namespace Content.Server.GameObjects
 
             serializer.DataField(ref templatename, "Template", "Human");
 
-            var type = typeof(SpeciesComponent).Assembly.GetType("Content.Server.GameObjects." + templatename);
+            var type = typeof(SpeciesComponent).Assembly.GetType("Content.Server.GameObjects.Components.Mobs.DamageThresholdTemplates." + templatename);
             DamageTemplate = (DamageTemplates) Activator.CreateInstance(type);
             serializer.DataFieldCached(ref _heatResistance, "HeatResistance", 323);
         }

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

@@ -1,11 +1,10 @@
 using Content.Server.Mobs;
 using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.GameObjects.Components.Movement;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
-using Robust.Shared.ViewVariables;
-using Timer = Robust.Shared.Timers.Timer;
-using Content.Shared.GameObjects.Components.Movement;
+using Robust.Shared.Timers;
 
 namespace Content.Server.GameObjects.Components.Mobs
 {

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

@@ -1,5 +1,5 @@
-using Robust.Shared.GameObjects;
 using Content.Shared.GameObjects.EntitySystems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.Components.Movement
 {

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

@@ -12,7 +12,6 @@ using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timers;
 using Robust.Shared.ViewVariables;
-using Robust.Shared.Utility;
 
 namespace Content.Server.GameObjects.Components.Movement
 {

Content.Server/GameObjects/Components/NodeContainer/NodeContainerComponent.cs

@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
+using System.Collections.Generic;
+using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
-using System.Collections.Generic;
 
 namespace Content.Server.GameObjects.Components.NodeContainer
 {

Content.Server/GameObjects/Components/NodeContainer/NodeGroups/ApcNetNodeGroup.cs

@@ -1,9 +1,9 @@
-using Content.Server.GameObjects.Components.Power;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Robust.Shared.ViewVariables;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using Content.Server.GameObjects.Components.Power;
+using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
 {

Content.Server/GameObjects/Components/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs

@@ -1,7 +1,7 @@
-using Content.Server.GameObjects.Components.Power;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using Content.Server.GameObjects.Components.NodeContainer.Nodes;
+using Content.Server.GameObjects.Components.Power;
 
 namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
 {

Content.Server/GameObjects/Components/NodeContainer/NodeGroups/INodeGroup.cs

@@ -1,7 +1,7 @@
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
+using System.Collections.Generic;
+using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
-using System.Collections.Generic;
 
 namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
 {

Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs

@@ -1,8 +1,8 @@
-using Robust.Shared.Interfaces.Reflection;
-using Robust.Shared.IoC;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
+using Robust.Shared.Interfaces.Reflection;
+using Robust.Shared.IoC;
 
 namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
 {

Content.Server/GameObjects/Components/NodeContainer/NodeGroups/PowerNetNodeGroup.cs

@@ -1,9 +1,9 @@
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
-using Robust.Shared.IoC;
-using Robust.Shared.ViewVariables;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using Content.Server.GameObjects.Components.Power.PowerNetComponents;
+using Robust.Shared.IoC;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
 {

Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs

@@ -1,6 +1,6 @@
-using Robust.Shared.GameObjects.Components.Transform;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using Robust.Shared.GameObjects.Components.Transform;
 
 namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
 {

Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs

@@ -1,13 +1,13 @@
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.ViewVariables;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
 using Robust.Shared.GameObjects.Components;
+using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Serialization;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
 {

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

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

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

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Chemistry;
 using Content.Server.GameObjects.Components.GUI;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Utensil;
 using Content.Server.Utility;
 using Content.Shared.Chemistry;

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

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.GUI;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Shared.GameObjects.Components.Nutrition;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects;

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

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Damage;
 using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.Components.Movement;
 using Content.Shared.GameObjects.Components.Nutrition;
@@ -40,7 +40,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
         [ViewVariables(VVAccess.ReadOnly)]
         public override HungerThreshold CurrentHungerThreshold => _currentHungerThreshold;
         private HungerThreshold _currentHungerThreshold;
-        
+
         private HungerThreshold _lastHungerThreshold;
 
         [ViewVariables(VVAccess.ReadWrite)]

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

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Damage;
 using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.Components.Movement;
 using Content.Shared.GameObjects.Components.Nutrition;
@@ -40,7 +40,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
         [ViewVariables(VVAccess.ReadOnly)]
         public override ThirstThreshold CurrentThirstThreshold => _currentThirstThreshold;
         private ThirstThreshold _currentThirstThreshold;
-        
+
         private ThirstThreshold _lastThirstThreshold;
 
         [ViewVariables(VVAccess.ReadWrite)]
@@ -72,7 +72,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
             "/Textures/Interface/StatusEffects/Thirst/Parched.png",
             "/Textures/Interface/StatusEffects/Thirst/Dead.png",
         };
-        
+
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);

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

@@ -5,11 +5,12 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Access;
 using Content.Server.GameObjects.Components.GUI;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.PDA;
-using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.PDA;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.Components.Container;

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

@@ -1,5 +1,4 @@
-using Content.Server.GameObjects.EntitySystems.Click;
-using Content.Shared.GameObjects.Components;
+using Content.Shared.GameObjects.Components;
 using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects;
@@ -8,7 +7,7 @@ using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.Components.Interactable
+namespace Content.Server.GameObjects.Components.Paper
 {
     [RegisterComponent]
     public class PaperComponent : SharedPaperComponent, IExamine, IInteractUsing, IUse

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

@@ -1,7 +1,6 @@
-using Content.Shared.GameObjects.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Interactable
+namespace Content.Server.GameObjects.Components.Paper
 {
     [RegisterComponent]
     public class WriteComponent : Component

Content.Server/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs

@@ -1,5 +1,4 @@
 #nullable enable
-using System;
 using System.Linq;
 using Content.Server.Explosions;
 using Content.Shared.GameObjects.Components.Pointing;

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

@@ -1,6 +1,8 @@
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
+using System;
 using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using Content.Server.GameObjects.Components.Power.PowerNetComponents;
 using Content.Shared.GameObjects.Components.Power;
+using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.Components.UserInterface;
 using Robust.Server.GameObjects.EntitySystems;
@@ -8,11 +10,9 @@ using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.ViewVariables;
-using System;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Robust.Shared.IoC;
 using Robust.Shared.Interfaces.Timing;
+using Robust.Shared.IoC;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
 {

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

@@ -1,13 +1,13 @@
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
 {

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

@@ -1,18 +1,17 @@
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using System;
+using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
 using Content.Shared.GameObjects.Components.Power;
+using Content.Shared.GameObjects.EntitySystems;
 using Robust.Server.GameObjects;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects.Components;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
-using Robust.Shared.Serialization;
-using Robust.Shared.ViewVariables;
-using System;
-using Content.Server.GameObjects.EntitySystems.Click;
-using Robust.Shared.GameObjects.Components;
 using Robust.Shared.Localization;
+using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
-using Content.Shared.GameObjects.EntitySystems;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
 {

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

@@ -1,10 +1,10 @@
 using System;
 using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
-using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Power;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
 using Content.Shared.Interfaces;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects;
@@ -16,7 +16,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.Chargers
+namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers
 {
     [ComponentReference(typeof(IActivate))]
     [ComponentReference(typeof(IInteractUsing))]

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

@@ -13,7 +13,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power
+namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers
 {
     public enum LightBulbState
     {

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

@@ -2,7 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Power.Chargers
+namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers
 {
     /// <summary>
     /// Recharges an entity with a <see cref="BatteryComponent"/>.