Massive Namespace Cleanup (#3120)

* Engine namespace changes.

* Automated remove redundant using statements.

* Simplified Graphics namespace.

* Apparently the container system stores full type names in the map file.😞 This updates those names.

* API Changes to LocalizationManager.LoadCulture.

* Update submodule to v0.3.2

Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.AI;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems.AI
 {

Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs

@@ -2,22 +2,16 @@
 using System;
 using System.Collections.Generic;
 using Content.Server.AI.Utility.AiLogic;
-using Content.Server.Administration;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Shared.GameObjects.Components.Mobs.State;
 using Content.Shared;
-using Content.Shared.Administration;
-using Content.Shared.GameObjects.Components.Movement;
 using JetBrains.Annotations;
 using Robust.Server.AI;
-using Robust.Server.Interfaces.Player;
+using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Configuration;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Reflection;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Reflection;
 using Robust.Shared.Utility;
 
 namespace Content.Server.GameObjects.EntitySystems.AI

Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionSystem.cs

@@ -1,6 +1,6 @@
 using System.Threading;
 using Content.Server.GameObjects.EntitySystems.JobQueues.Queues;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems.AI.LoadBalancer
 {

Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs

@@ -6,14 +6,11 @@ using Content.Shared.AI;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
-using Robust.Shared.GameObjects.Components;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Timing;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible

Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/BFSPathfinder.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
 namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible

Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/ReachableArgs.cs

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Access;
 using Content.Server.GameObjects.Components.Movement;
-using Robust.Shared.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
 {

Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs

@@ -2,12 +2,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Timing;
 
 namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
 {

Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs

@@ -2,8 +2,7 @@ using System;
 using System.Collections.Generic;
 using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible;
 using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;

Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs

@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Access;
 using Content.Server.GameObjects.Components.Doors;
-using Robust.Shared.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;

Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs

@@ -7,11 +7,7 @@ using Content.Server.GameObjects.EntitySystems.JobQueues;
 using Content.Server.GameObjects.EntitySystems.JobQueues.Queues;
 using Content.Shared.GameTicking;
 using Content.Shared.Physics;
-using Robust.Shared.GameObjects.Components;
-using Robust.Shared.GameObjects.Components.Transform;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;

Content.Server/GameObjects/EntitySystems/AI/Pathfinding/ServerPathfindingDebugSystem.cs

@@ -2,9 +2,9 @@ using System.Collections.Generic;
 using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders;
 using Content.Shared.AI;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
 namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding

Content.Server/GameObjects/EntitySystems/AI/ServerAiDebugSystem.cs

@@ -1,7 +1,7 @@
 using Content.Server.GameObjects.EntitySystems.AI.LoadBalancer;
 using Content.Shared.AI;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems.AI
 {

Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs

@@ -7,14 +7,10 @@ using Content.Server.GameObjects.Components.Movement;
 using Content.Server.GameObjects.EntitySystems.AI.Pathfinding;
 using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders;
 using Content.Server.GameObjects.EntitySystems.JobQueues;
-using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
 using Content.Shared.Utility;
-using Robust.Server.Interfaces.Timing;
-using Robust.Shared.GameObjects.Components;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Server.Timing;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;

Content.Server/GameObjects/EntitySystems/AI/Steering/EntityTargetSteeringRequest.cs

@@ -1,4 +1,4 @@
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
 namespace Content.Server.GameObjects.EntitySystems.AI.Steering

Content.Server/GameObjects/EntitySystems/AI/Steering/GridTargetSteeringRequest.cs

@@ -1,4 +1,4 @@
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 

Content.Server/GameObjects/EntitySystems/AntimatterEngineSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Power.AME;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/Atmos/AtmosDebugOverlaySystem.cs

@@ -6,14 +6,13 @@ using Content.Shared;
 using Content.Shared.Atmos;
 using Content.Shared.GameObjects.EntitySystems.Atmos;
 using JetBrains.Annotations;
-using Robust.Server.Interfaces.Player;
 using Robust.Server.Player;
+using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
-using Robust.Shared.Interfaces.Configuration;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Timing;
 
 namespace Content.Server.GameObjects.EntitySystems.Atmos
 {

Content.Server/GameObjects/EntitySystems/Atmos/GasTileOverlaySystem.cs

@@ -9,14 +9,11 @@ using Content.Shared.Atmos;
 using Content.Shared.GameObjects.EntitySystems.Atmos;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
-using Robust.Server.Interfaces.Player;
 using Robust.Server.Player;
 using Robust.Shared;
+using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
-using Robust.Shared.Interfaces.Configuration;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Timing;
+using Robust.Shared.GameObjects;
 // ReSharper disable once RedundantUsingDirective
 using Robust.Shared.IoC;
 using Robust.Shared.Map;

Content.Server/GameObjects/EntitySystems/AtmosExposedSystem.cs

@@ -1,9 +1,7 @@
 using Content.Server.Atmos;
 using Content.Server.GameObjects.Components.Atmos;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.IoC;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs

@@ -10,15 +10,10 @@ using Content.Shared.Atmos;
 using Content.Shared.GameObjects.EntitySystems.Atmos;
 using Content.Shared.Maps;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects.EntitySystems.TileLookup;
-using Robust.Server.Interfaces.Timing;
+using Robust.Server.GameObjects;
+using Robust.Server.Timing;
+using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Components.Map;
-using Robust.Shared.GameObjects.Components.Transform;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Configuration;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;

Content.Server/GameObjects/EntitySystems/BlockGameSystem.cs

@@ -1,10 +1,8 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Arcade;
 using Content.Shared.Arcade;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 
 namespace Content.Server.GameObjects.EntitySystems

Content.Server/GameObjects/EntitySystems/Body/Surgery/SurgeryToolSystem.cs

@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Body.Surgery;
 using Content.Server.GameObjects.Components.Body.Surgery.Messages;
-using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
 using Content.Shared.GameTicking;
 using Content.Shared.Utility;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems.Body.Surgery
 {

Content.Server/GameObjects/EntitySystems/BuckleSystem.cs

@@ -3,11 +3,9 @@ using Content.Server.GameObjects.Components.Buckle;
 using Content.Server.GameObjects.Components.Strap;
 using Content.Server.GameObjects.EntitySystems.Click;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects.EntitySystemMessages;
-using Robust.Server.GameObjects.EntitySystems;
+using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
-using Robust.Shared.GameObjects.Components.Transform;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/CargoConsoleSystem.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
-using Robust.Shared.GameObjects.Systems;
 using Content.Shared.Prototypes.Cargo;
 using Content.Shared.GameTicking;
 using Content.Server.Cargo;
 using Content.Server.GameObjects.Components.Cargo;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/ChemicalReactionSystem.cs

@@ -1,8 +1,8 @@
 #nullable enable
 using Content.Shared.Chemistry;
 using Content.Shared.GameObjects.EntitySystems;
-using Robust.Server.GameObjects.EntitySystems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Server.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems.NewFolder
 {

Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs

@@ -1,9 +1,8 @@
 using Content.Shared.GameObjects.EntitySystemMessages;
 using Content.Shared.GameObjects.EntitySystems;
 using JetBrains.Annotations;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Utility;

Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Pulling;
@@ -17,14 +16,11 @@ using Content.Shared.Interfaces.GameObjects.Components;
 using Content.Shared.Utility;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.GameObjects.Components;
-using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;

Content.Server/GameObjects/EntitySystems/ClimbSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Movement;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/CloningSystem.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using Content.Server.GameObjects.Components.Medical;
 using Content.Server.Mobs;
 using Content.Shared.GameTicking;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs

@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -9,22 +9,20 @@ using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Stack;
 using Content.Server.GameObjects.EntitySystems.DoAfter;
 using Content.Shared.Construction;
-using Content.Shared.GameObjects.Components;
 using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
 using Content.Shared.Interfaces;
 using Content.Shared.Utility;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects.Components.Container;
+using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 using Robust.Shared.Timers;
 
 

Content.Server/GameObjects/EntitySystems/ConveyorSystem.cs

@@ -1,8 +1,6 @@
-using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Conveyor;
-using Content.Shared.GameObjects.Components.Conveyor;
+using Content.Server.GameObjects.Components.Conveyor;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/DestructibleSystem.cs

@@ -1,9 +1,9 @@
 using Content.Shared.GameObjects.EntitySystems;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects.EntitySystems;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Random;
+using Robust.Server.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Random;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/DeviceNetworkSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.Interfaces;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.GameObjects.EntitySystems

Content.Server/GameObjects/EntitySystems/DisposableSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Disposal;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs

@@ -4,9 +4,9 @@ using System.Threading.Tasks;
 using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Mobs;
-using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
+using Robust.Shared.Timing;
 
 namespace Content.Server.GameObjects.EntitySystems.DoAfter
 {

Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs

@@ -3,7 +3,7 @@ using System;
 using System.Threading;
 using Content.Shared.Physics;
 using Content.Shared.Utility;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 // ReSharper disable UnassignedReadonlyField
 

Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.GameObjects.Components;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems.DoAfter
 {

Content.Server/GameObjects/EntitySystems/DoorSystem.cs

@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Doors;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/EmergencyLightSystem.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Interactable;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/GameMode/SuspicionEndTimerSystem.cs

@@ -4,12 +4,11 @@ using Content.Server.Interfaces.GameTicking;
 using Content.Shared.GameObjects.EntitySystemMessages;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
-using Robust.Server.Interfaces.Player;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Timing;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Timing;
 
 #nullable enable
 

Content.Server/GameObjects/EntitySystems/GameMode/SuspicionRoleSystem.cs

@@ -2,7 +2,7 @@
 using Content.Server.GameObjects.Components.Suspicion;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems.GameMode
 {

Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Atmos;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs

@@ -1,7 +1,6 @@
 using Content.Server.GameObjects.Components.Atmos;
-using Content.Server.GameObjects.Components.Recycling;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/GasTankSystem.cs

@@ -1,10 +1,6 @@
-using System;
 using Content.Server.GameObjects.Components.Atmos;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.EntitySystemMessages;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Timing;
-using Robust.Shared.IoC;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/GodmodeSystem.cs

@@ -4,8 +4,7 @@ using Content.Server.GameObjects.Components.Atmos;
 using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/GravitySystem.cs

@@ -5,11 +5,9 @@ using Content.Server.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.Components.Gravity;
 using Content.Shared.GameObjects.EntitySystemMessages.Gravity;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects.EntitySystems;
-using Robust.Server.Interfaces.Player;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Random;
+using Robust.Server.GameObjects;
+using Robust.Server.Player;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;

Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Interactable;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/HandsSystem.cs

@@ -10,13 +10,10 @@ using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.Input;
 using Content.Shared.Interfaces;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects.EntitySystemMessages;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.GameObjects;
+using Robust.Server.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Input.Binding;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;

Content.Server/GameObjects/EntitySystems/HungerSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Nutrition;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/InstrumentSystem.cs

@@ -1,8 +1,8 @@
 using Content.Server.GameObjects.Components.Instruments;
 using Content.Shared;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Configuration;
+using Robust.Shared.Configuration;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.GameObjects.EntitySystems

Content.Server/GameObjects/EntitySystems/LatheSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Research;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/ListeningSystem.cs

@@ -1,7 +1,6 @@
 using Content.Server.Interfaces;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Medical;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/MeleeWeaponSystem.cs

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.GameObjects.EntitySystemMessages;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
 namespace Content.Server.GameObjects.EntitySystems

Content.Server/GameObjects/EntitySystems/MetabolismSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Metabolism;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Kitchen;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/MorgueSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Morgue;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/MoverSystem.cs

@@ -1,9 +1,7 @@
 #nullable enable
-using Content.Server.GameObjects.Components;
 using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Movement;
 using Content.Server.GameObjects.Components.Sound;
 using Content.Shared.Audio;
 using Content.Shared.GameObjects.Components.Inventory;
@@ -13,14 +11,7 @@ using Content.Shared.Maps;
 using Content.Shared.Physics;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
-using Robust.Server.GameObjects.EntitySystems;
-using Robust.Server.Interfaces.GameObjects;
-using Robust.Server.Interfaces.Timing;
-using Robust.Shared.GameObjects.Components;
-using Robust.Shared.GameObjects.Components.Transform;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Random;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;

Content.Server/GameObjects/EntitySystems/NodeContainerSystem.cs

@@ -2,8 +2,7 @@
 using Content.Server.GameObjects.Components.NodeContainer;
 using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Components.Transform;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/NodeGroupSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.GameObjects.EntitySystems

Content.Server/GameObjects/EntitySystems/ParticleAcceleratorPartSystem.cs

@@ -2,8 +2,6 @@
 using Content.Server.GameObjects.Components.PA;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Components.Transform;
-using Robust.Shared.GameObjects.Systems;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/PlantSystem.cs

@@ -1,12 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Server.Botany;
 using Content.Server.GameObjects.Components.Botany;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Timing;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 

Content.Server/GameObjects/EntitySystems/PointingSystem.cs

@@ -4,27 +4,22 @@ using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Observer;
 using Content.Server.GameObjects.Components.Pointing;
 using Content.Server.Players;
-using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
 using Content.Shared.Input;
 using Content.Shared.Interfaces;
 using Content.Shared.Utility;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects.Components;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Input.Binding;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
+using Robust.Shared.Timing;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/Power/BaseChargerSystem.cs

@@ -1,7 +1,7 @@
 #nullable enable
 using Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/Power/BatteryDischargerSystem.cs

@@ -1,7 +1,7 @@
 #nullable enable
 using Content.Server.GameObjects.Components.Power.PowerNetComponents;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/Power/BatteryStorageSystem.cs

@@ -1,7 +1,7 @@
 #nullable enable
 using Content.Server.GameObjects.Components.Power.PowerNetComponents;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/Power/BatterySystem.cs

@@ -1,7 +1,7 @@
 #nullable enable
 using Content.Server.GameObjects.Components.Power;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/Power/PowerApcSystem.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/Power/PowerNetSystem.cs

@@ -1,7 +1,7 @@
 #nullable enable
 using Content.Server.GameObjects.Components.Power.PowerNetComponents;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.GameObjects.EntitySystems

Content.Server/GameObjects/EntitySystems/Power/PowerSmesSystem.cs

@@ -1,7 +1,7 @@
 #nullable enable
 using Content.Server.GameObjects.Components.Power.PowerNetComponents;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/Power/PowerSolarControlConsoleSystem.cs

@@ -1,7 +1,7 @@
 #nullable enable
 using Content.Server.GameObjects.Components.Power.PowerNetComponents;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/Power/PowerSolarSystem.cs

@@ -4,13 +4,12 @@ using System.Linq;
 using Content.Server.GameObjects.Components.Power.PowerNetComponents;
 using Content.Shared.Physics;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Physics;
-using Robust.Shared.Interfaces.Random;
-using Robust.Shared.Interfaces.Timing;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Projectiles;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/PuddleSystem.cs

@@ -1,8 +1,6 @@
 using Content.Server.GameObjects.Components.Fluids;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Components.Transform;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 

Content.Server/GameObjects/EntitySystems/RadioSystem.cs

@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/ReagentGrinderSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Kitchen;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/RecyclerSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Recycling;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/ResearchSystem.cs

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

Content.Server/GameObjects/EntitySystems/RoguePointingSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Pointing;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs

@@ -3,11 +3,11 @@ using System.Threading;
 using Content.Server.Interfaces.Chat;
 using Content.Server.Interfaces.GameTicking;
 using Content.Shared.GameTicking;
-using Robust.Server.GameObjects.EntitySystems;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Timing;
+using Robust.Server.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
+using Robust.Shared.Timing;
 using Timer = Robust.Shared.Timers.Timer;
 
 namespace Content.Server.GameObjects.EntitySystems

Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs

@@ -2,7 +2,6 @@
 using Content.Server.GameObjects.Components.MachineLinking;
 using Content.Server.GameObjects.EntitySystems.Click;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;

Content.Server/GameObjects/EntitySystems/SingularitySystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Singularity;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/SolutionAreaEffectSystem.cs

@@ -1,7 +1,7 @@
 #nullable enable
 using Content.Server.GameObjects.Components.Chemistry;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/StandingStateSystem.cs

@@ -4,8 +4,7 @@ using Content.Shared.GameObjects.Components.Rotation;
 using Content.Shared.GameObjects.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
-using Robust.Server.GameObjects.EntitySystems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs

@@ -1,9 +1,7 @@
 using Content.Server.GameObjects.Components.StationEvents;
-using Content.Shared.GameObjects.Components.Body;
 using Content.Shared.Interfaces.GameObjects.Components;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
 namespace Content.Server.GameObjects.EntitySystems.StationEvents

Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs

@@ -11,15 +11,15 @@ using Content.Shared.GameTicking;
 using Content.Shared.Network.NetMessages;
 using JetBrains.Annotations;
 using Robust.Server.Console;
-using Robust.Server.Interfaces.Player;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Configuration;
-using Robust.Shared.Interfaces.Network;
-using Robust.Shared.Interfaces.Random;
-using Robust.Shared.Interfaces.Reflection;
-using Robust.Shared.Interfaces.Timing;
+using Robust.Server.Player;
+using Robust.Shared.Configuration;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
+using Robust.Shared.Network;
+using Robust.Shared.Random;
+using Robust.Shared.Reflection;
+using Robust.Shared.Timing;
 
 namespace Content.Server.GameObjects.EntitySystems.StationEvents
 {

Content.Server/GameObjects/EntitySystems/StorageSystem.cs

@@ -2,9 +2,9 @@
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems.Click;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects.EntitySystemMessages;
-using Robust.Server.Interfaces.Player;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Server.GameObjects;
+using Robust.Server.Player;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/StressTestMovementSystem.cs

@@ -1,7 +1,7 @@
 using System;
 using Content.Server.GameObjects.Components;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
 namespace Content.Server.GameObjects.EntitySystems

Content.Server/GameObjects/EntitySystems/StunSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Mobs;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/ThirstSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Nutrition;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/TriggerSystem.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Linq;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Timers;
 
 namespace Content.Server.GameObjects.EntitySystems

Content.Server/GameObjects/EntitySystems/VaporSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.Chemistry;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/VerbSystem.cs

@@ -4,11 +4,9 @@ using System.Reflection;
 using Content.Shared.GameObjects.EntitySystemMessages;
 using Content.Shared.GameObjects.Verbs;
 using Content.Shared.GameTicking;
-using Robust.Server.Interfaces.Player;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using static Content.Shared.GameObjects.EntitySystemMessages.VerbSystemMessages;

Content.Server/GameObjects/EntitySystems/WeightlessSystem.cs

@@ -1,14 +1,10 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.EntitySystemMessages.Gravity;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects.Components.Map;
-using Robust.Shared.GameObjects.EntitySystemMessages;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;

Content.Server/GameObjects/EntitySystems/WelderSystem.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Interactable;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/WireHackingSystem.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Content.Shared.GameTicking;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 using static Content.Shared.GameObjects.Components.SharedWiresComponent;