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/AI/Operators/AiOperator.cs

@@ -1,6 +1,4 @@
 
-using System;
-
 namespace Content.Server.AI.Operators
 {
     public abstract class AiOperator

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

@@ -2,7 +2,7 @@ using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Weapon.Melee;
 using Content.Server.GameObjects.EntitySystems.Click;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Operators.Combat.Melee

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

@@ -1,7 +1,7 @@
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Weapon.Melee;
 using Content.Server.GameObjects.EntitySystems.Click;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Operators.Combat.Melee

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

@@ -3,7 +3,7 @@ using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Content.Shared.Utility;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Operators.Inventory
 {

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

@@ -1,5 +1,5 @@
 using Content.Server.GameObjects.Components.GUI;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Operators.Inventory
 {

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

@@ -1,5 +1,5 @@
 using Content.Server.GameObjects.Components.GUI;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Operators.Inventory
 {

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

@@ -1,5 +1,5 @@
 using Content.Server.GameObjects.Components.GUI;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Operators.Inventory
 {

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

@@ -1,7 +1,7 @@
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.EntitySystems.Click;
 using Content.Shared.Utility;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Operators.Inventory

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

@@ -5,7 +5,7 @@ using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Content.Shared.Utility;
 using Robust.Shared.Containers;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Operators.Inventory
 {

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

@@ -4,7 +4,7 @@ using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems.Click;
 using Content.Shared.Utility;
 using Robust.Shared.Containers;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Operators.Inventory

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

@@ -1,7 +1,7 @@
 #nullable enable
 using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Storage;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Operators.Inventory
 {

Content.Server/AI/Operators/Movement/MoveToEntityOperator.cs

@@ -1,7 +1,6 @@
 using System;
 using Content.Server.GameObjects.EntitySystems.AI.Steering;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 
 namespace Content.Server.AI.Operators.Movement

Content.Server/AI/Operators/Movement/MoveToGridOperator.cs

@@ -1,7 +1,6 @@
 using System;
 using Content.Server.GameObjects.EntitySystems.AI.Steering;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
 

Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs

@@ -3,8 +3,7 @@ using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Nutrition;
 using Content.Shared.GameObjects.Components.Nutrition;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Random;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
 

Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs

@@ -3,8 +3,7 @@ using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Nutrition;
 using Content.Shared.GameObjects.Components.Nutrition;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Random;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
 

Content.Server/AI/Operators/Sequences/GoPickupEntitySequence.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Content.Server.AI.Operators.Inventory;
 using Content.Server.AI.Operators.Movement;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Operators.Sequences
 {

Content.Server/AI/Utility/Actions/Clothing/Gloves/EquipGloves.cs

@@ -6,7 +6,7 @@ using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.Utility.Considerations.Inventory;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Clothing.Gloves

Content.Server/AI/Utility/Actions/Clothing/Gloves/PickUpGloves.cs

@@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Inventory;
 using Content.Server.AI.Utility.Considerations.Movement;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Clothing.Gloves

Content.Server/AI/Utility/Actions/Clothing/Head/EquipHead.cs

@@ -6,7 +6,7 @@ using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.Utility.Considerations.Inventory;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Clothing.Head

Content.Server/AI/Utility/Actions/Clothing/Head/PickUpHead.cs

@@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Inventory;
 using Content.Server.AI.Utility.Considerations.Movement;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Clothing.Head

Content.Server/AI/Utility/Actions/Clothing/OuterClothing/EquipOuterClothing.cs

@@ -6,7 +6,7 @@ using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.Utility.Considerations.Inventory;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Clothing.OuterClothing

Content.Server/AI/Utility/Actions/Clothing/OuterClothing/PickUpOuterClothing.cs

@@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Inventory;
 using Content.Server.AI.Utility.Considerations.Movement;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Clothing.OuterClothing

Content.Server/AI/Utility/Actions/Clothing/Shoes/EquipShoes.cs

@@ -6,7 +6,7 @@ using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.Utility.Considerations.Inventory;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Clothing.Shoes

Content.Server/AI/Utility/Actions/Clothing/Shoes/PickUpShoes.cs

@@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Inventory;
 using Content.Server.AI.Utility.Considerations.Movement;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Clothing.Shoes

Content.Server/AI/Utility/Actions/Combat/Melee/EquipMelee.cs

@@ -8,7 +8,7 @@ using Content.Server.AI.Utility.Considerations.Inventory;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Combat;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Combat.Melee

Content.Server/AI/Utility/Actions/Combat/Melee/MeleeWeaponAttackEntity.cs

@@ -14,7 +14,7 @@ using Content.Server.AI.WorldState.States.Combat;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.AI.WorldState.States.Movement;
 using Content.Server.GameObjects.Components.Weapon.Melee;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Combat.Melee

Content.Server/AI/Utility/Actions/Combat/Melee/PickUpMeleeWeapon.cs

@@ -8,7 +8,7 @@ using Content.Server.AI.Utility.Considerations.Movement;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Combat;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Combat.Melee

Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs

@@ -12,7 +12,7 @@ using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Combat;
 using Content.Server.AI.WorldState.States.Movement;
 using Content.Server.GameObjects.Components.Weapon.Melee;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Combat.Melee

Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs

@@ -10,7 +10,7 @@ using Content.Server.AI.Utility.Considerations.State;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Idle

Content.Server/AI/Utility/Actions/Idle/WanderAndWait.cs

@@ -8,10 +8,7 @@ using Content.Server.AI.Utility.Considerations.ActionBlocker;
 using Content.Server.AI.WorldState;
 using Content.Server.GameObjects.EntitySystems.AI.Pathfinding;
 using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible;
-using Robust.Shared.GameObjects.Systems;
-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.Map;
 using Robust.Shared.Random;

Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs

@@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Movement;
 using Content.Server.AI.Utility.Considerations.Nutrition.Drink;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Nutrition.Drink

Content.Server/AI/Utility/Actions/Nutrition/Drink/UseDrinkInInventory.cs

@@ -8,7 +8,7 @@ using Content.Server.AI.Utility.Considerations.Inventory;
 using Content.Server.AI.Utility.Considerations.Nutrition.Drink;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Nutrition.Drink

Content.Server/AI/Utility/Actions/Nutrition/Food/PickUpFood.cs

@@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Movement;
 using Content.Server.AI.Utility.Considerations.Nutrition.Food;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Nutrition.Food

Content.Server/AI/Utility/Actions/Nutrition/Food/UseFoodInInventory.cs

@@ -8,7 +8,7 @@ using Content.Server.AI.Utility.Considerations.Inventory;
 using Content.Server.AI.Utility.Considerations.Nutrition.Food;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.Actions.Nutrition.Food

Content.Server/AI/Utility/Actions/Test/MoveRightAndLeftTen.cs

@@ -4,7 +4,7 @@ using Content.Server.AI.Operators;
 using Content.Server.AI.Operators.Movement;
 using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.WorldState;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 

Content.Server/AI/Utility/Actions/UtilityAction.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Content.Server.AI.Operators;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States.Utility;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 
 namespace Content.Server.AI.Utility.Actions

Content.Server/AI/Utility/AiLogic/UtilityAI.cs

@@ -9,12 +9,9 @@ using Content.Server.AI.WorldState.States.Utility;
 using Content.Server.GameObjects.EntitySystems.AI;
 using Content.Server.GameObjects.EntitySystems.AI.LoadBalancer;
 using Content.Server.GameObjects.EntitySystems.JobQueues;
-using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Mobs.State;
 using Robust.Server.AI;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Utility;

Content.Server/AI/Utility/BehaviorSets/BehaviorSet.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Content.Server.AI.Utility.Actions;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility.BehaviorSets
 {

Content.Server/AI/Utility/BehaviorSets/ClothingBehaviorSet.cs

@@ -3,7 +3,7 @@ using Content.Server.AI.Utility.ExpandableActions.Clothing.Gloves;
 using Content.Server.AI.Utility.ExpandableActions.Clothing.Head;
 using Content.Server.AI.Utility.ExpandableActions.Clothing.OuterClothing;
 using Content.Server.AI.Utility.ExpandableActions.Clothing.Shoes;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility.BehaviorSets
 {

Content.Server/AI/Utility/BehaviorSets/HungerBehaviorSet.cs

@@ -1,6 +1,6 @@
 using Content.Server.AI.Utility.Actions;
 using Content.Server.AI.Utility.ExpandableActions.Nutrition;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility.BehaviorSets
 {

Content.Server/AI/Utility/BehaviorSets/IdleBehaviorSet.cs

@@ -1,6 +1,6 @@
 using Content.Server.AI.Utility.Actions;
 using Content.Server.AI.Utility.Actions.Idle;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility.BehaviorSets
 {

Content.Server/AI/Utility/BehaviorSets/PathingDummyBehaviorSet.cs

@@ -1,6 +1,6 @@
 using Content.Server.AI.Utility.Actions;
 using Content.Server.AI.Utility.Actions.Test;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility.BehaviorSets
 {

Content.Server/AI/Utility/BehaviorSets/SpirateBehaviorSet.cs

@@ -1,6 +1,6 @@
 using Content.Server.AI.Utility.Actions;
 using Content.Server.AI.Utility.ExpandableActions.Combat.Melee;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility.BehaviorSets
 {

Content.Server/AI/Utility/BehaviorSets/ThirstBehaviorSet.cs

@@ -1,6 +1,6 @@
 using Content.Server.AI.Utility.Actions;
 using Content.Server.AI.Utility.ExpandableActions.Nutrition;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility.BehaviorSets
 {

Content.Server/AI/Utility/BehaviorSets/UnarmedAttackPlayersBehaviorSet.cs

@@ -1,6 +1,6 @@
 using Content.Server.AI.Utility.Actions;
 using Content.Server.AI.Utility.ExpandableActions.Combat.Melee;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility.BehaviorSets
 {

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

@@ -1,6 +1,5 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
 
 namespace Content.Server.AI.Utility.Considerations.ActionBlocker

Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs

@@ -1,6 +1,5 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Mobs.State;
 
 namespace Content.Server.AI.Utility.Considerations.Combat

Content.Server/AI/Utility/Considerations/Combat/TargetIsDeadCon.cs

@@ -1,6 +1,5 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Mobs.State;
 
 namespace Content.Server.AI.Utility.Considerations.Combat

Content.Server/AI/Utility/Considerations/ConsiderationsManager.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Robust.Shared.Interfaces.Reflection;
 using Robust.Shared.IoC;
+using Robust.Shared.Reflection;
 
 namespace Content.Server.AI.Utility.Considerations
 {

Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs

@@ -4,7 +4,7 @@ using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible;
 using Content.Shared.GameObjects.EntitySystems;
 using Robust.Shared.Containers;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility.Considerations.Containers
 {

Content.Server/AI/Utility/Considerations/State/StoredStateEntityIsNullCon.cs

@@ -1,7 +1,7 @@
 using System;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States.Utility;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility.Considerations.State
 {

Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs

@@ -8,7 +8,7 @@ using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Server.GameObjects.EntitySystems.AI;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Combat.Melee

Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyPlayerExp.cs

@@ -8,7 +8,7 @@ using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Server.GameObjects.EntitySystems.AI;
-using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Combat.Melee

Content.Server/AI/Utility/UtilityAiHelpers.cs

@@ -1,7 +1,7 @@
 using Content.Server.AI.Utility.AiLogic;
 using Content.Server.AI.WorldState;
 using Content.Server.GameObjects.Components.Movement;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility
 {

Content.Server/AI/Utils/Visibility.cs

@@ -4,11 +4,10 @@ using System.Linq;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Shared.Physics;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Physics;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 
 namespace Content.Server.AI.Utils
 {

Content.Server/AI/WorldState/Blackboard.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.WorldState

Content.Server/AI/WorldState/BlackboardManager.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Robust.Shared.Interfaces.Reflection;
 using Robust.Shared.IoC;
+using Robust.Shared.Reflection;
 using Robust.Shared.Utility;
 
 namespace Content.Server.AI.WorldState

Content.Server/AI/WorldState/StateData.cs

@@ -1,7 +1,7 @@
 using System;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Timing;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Timing;
 
 namespace Content.Server.AI.WorldState
 {

Content.Server/AI/WorldState/States/Clothing/EquippedClothingState.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using Content.Server.GameObjects.Components.GUI;
 using Content.Shared.GameObjects.Components.Inventory;
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.WorldState.States.Clothing
 {

Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs

@@ -5,7 +5,7 @@ using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Movement;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.WorldState.States.Clothing
 {

Content.Server/AI/WorldState/States/Combat/Nearby/NearbyMeleeWeapons.cs

@@ -3,7 +3,7 @@ using Content.Server.AI.Utils;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Server.GameObjects.Components.Weapon.Melee;
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.WorldState.States.Combat.Nearby
 {

Content.Server/AI/WorldState/States/Combat/WeaponEntityState.cs

@@ -1,5 +1,5 @@
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.WorldState.States.Combat
 {

Content.Server/AI/WorldState/States/Hands/HandItemsState.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.GUI;
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.WorldState.States.Hands
 {

Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs

@@ -1,6 +1,6 @@
 using Content.Server.GameObjects.Components.GUI;
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.WorldState.States.Inventory
 {

Content.Server/AI/WorldState/States/Inventory/InventoryState.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.GUI;
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.WorldState.States.Inventory
 {

Content.Server/AI/WorldState/States/Inventory/LastOpenedStorageState.cs

@@ -1,5 +1,5 @@
 using Content.Server.GameObjects.Components.Items.Storage;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 
 namespace Content.Server.AI.WorldState.States.Inventory

Content.Server/AI/WorldState/States/Mobs/NearbyBodiesState.cs

@@ -3,7 +3,7 @@ using Content.Server.AI.Utils;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Shared.GameObjects.Components.Body;
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.WorldState.States.Mobs
 {

Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs

@@ -2,8 +2,8 @@
 using Content.Server.GameObjects.Components.Movement;
 using Content.Shared.GameObjects.Components.Damage;
 using JetBrains.Annotations;
-using Robust.Server.Interfaces.Player;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Server.Player;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.WorldState.States.Mobs

Content.Server/AI/WorldState/States/Movement/MoveTargetState.cs

@@ -1,5 +1,5 @@
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.WorldState.States.Movement
 {

Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs

@@ -5,7 +5,7 @@ using Content.Server.GameObjects.Components.Movement;
 using Content.Server.GameObjects.Components.Nutrition;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.WorldState.States.Nutrition
 {

Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs

@@ -5,7 +5,7 @@ using Content.Server.GameObjects.Components.Movement;
 using Content.Server.GameObjects.Components.Nutrition;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.WorldState.States.Nutrition
 {

Content.Server/AI/WorldState/States/SelfState.cs

@@ -1,5 +1,5 @@
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.WorldState.States
 {

Content.Server/AI/WorldState/States/TargetEntityState.cs

@@ -1,5 +1,5 @@
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.WorldState.States
 {

Content.Server/Actions/DebugInstant.cs

@@ -2,7 +2,6 @@
 using Content.Shared.Actions;
 using Content.Shared.Utility;
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.Serialization;
 using Robust.Shared.Serialization;
 
 namespace Content.Server.Actions

Content.Server/Actions/DebugTargetEntity.cs

@@ -1,7 +1,6 @@
 using Content.Server.Utility;
 using Content.Shared.Actions;
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.Serialization;
 using Robust.Shared.Serialization;
 
 namespace Content.Server.Actions

Content.Server/Actions/DebugTargetPoint.cs

@@ -1,9 +1,6 @@
-using Content.Server.Utility;
+using Content.Server.Utility;
 using Content.Shared.Actions;
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Serialization;
-using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
 
 namespace Content.Server.Actions

Content.Server/Actions/DebugToggle.cs

@@ -1,7 +1,6 @@
 using Content.Server.Utility;
 using Content.Shared.Actions;
 using JetBrains.Annotations;
-using Robust.Shared.Interfaces.Serialization;
 using Robust.Shared.Serialization;
 
 namespace Content.Server.Actions

Content.Server/Actions/DisarmAction.cs

@@ -1,27 +1,18 @@
 #nullable enable
 using System;
 using System.Linq;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Pulling;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces.GameObjects;
 using Content.Server.Utility;
 using Content.Shared.Actions;
 using Content.Shared.Audio;
 using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Pulling;
 using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
 using Content.Shared.Interfaces;
 using Content.Shared.Utility;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects.EntitySystems;
-using Robust.Server.Interfaces.Player;
-using Robust.Shared.Audio;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Random;
-using Robust.Shared.Interfaces.Serialization;
+using Robust.Server.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;

Content.Server/Actions/ScreamAction.cs

@@ -4,16 +4,13 @@ using Content.Server.GameObjects.Components.Mobs;
 using Content.Shared.Actions;
 using Content.Shared.Audio;
 using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
 using Content.Shared.Preferences;
 using Content.Shared.Utility;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects.EntitySystems;
+using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.Random;
-using Robust.Shared.Interfaces.Serialization;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;

Content.Server/Administration/AdminManager.cs

@@ -12,13 +12,11 @@ using Content.Shared;
 using Content.Shared.Administration;
 using Content.Shared.Network.NetMessages;
 using Robust.Server.Console;
-using Robust.Server.Interfaces.Player;
 using Robust.Server.Player;
+using Robust.Shared.Configuration;
 using Robust.Shared.Console;
+using Robust.Shared.ContentPack;
 using Robust.Shared.Enums;
-using Robust.Shared.Interfaces.Configuration;
-using Robust.Shared.Interfaces.Network;
-using Robust.Shared.Interfaces.Resources;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Network;

Content.Server/Administration/AdminPermsChangedEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 
 namespace Content.Server.Administration
 {

Content.Server/Administration/Commands/AGhost.cs

@@ -1,11 +1,10 @@
-using Content.Server.Commands.Observer;
-using Content.Server.GameObjects.Components.Observer;
+using Content.Server.GameObjects.Components.Observer;
 using Content.Server.Interfaces.GameTicking;
 using Content.Server.Players;
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.Administration.Commands

Content.Server/Administration/Commands/BanCommand.cs

@@ -1,7 +1,7 @@
 using System;
 using Content.Server.Database;
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;

Content.Server/Administration/Commands/ControlMob.cs

@@ -2,10 +2,9 @@ using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Observer;
 using Content.Server.Players;
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 

Content.Server/Administration/Commands/DSay.cs

@@ -1,6 +1,6 @@
 using Content.Server.Interfaces.Chat;
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;

Content.Server/Administration/Commands/DeAdminCommand.cs

@@ -1,6 +1,6 @@
 using Content.Shared.Administration;
 using JetBrains.Annotations;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 

Content.Server/Administration/Commands/DeleteComponent.cs

@@ -1,8 +1,7 @@
 #nullable enable
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
 using Robust.Shared.Console;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.Administration.Commands

Content.Server/Administration/Commands/DeleteEntitiesWithComponent.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 

Content.Server/Administration/Commands/DeleteEntitiesWithId.cs

@@ -1,9 +1,7 @@
 #nullable enable
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.Administration.Commands

Content.Server/Administration/Commands/ExplosionCommand.cs

@@ -1,6 +1,6 @@
 using Content.Server.Explosions;
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
 

Content.Server/Administration/Commands/OpenPermissionsCommand.cs

@@ -1,6 +1,6 @@
 using Content.Server.Eui;
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 

Content.Server/Administration/Commands/PromoteHostCommand.cs

@@ -1,6 +1,6 @@
 #nullable enable
 using JetBrains.Annotations;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 

Content.Server/Administration/Commands/ReAdminCommand.cs

@@ -1,4 +1,4 @@
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 

Content.Server/Administration/Commands/ReadyAll.cs

@@ -2,7 +2,7 @@
 using Content.Server.GameTicking;
 using Content.Server.Interfaces.GameTicking;
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 

Content.Server/Administration/Commands/Rejuvenate.cs

@@ -1,9 +1,8 @@
 using Content.Server.GlobalVerbs;
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 

Content.Server/Administration/Commands/SetMindCommand.cs

@@ -3,10 +3,9 @@ using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.Mobs;
 using Content.Server.Players;
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 

Content.Server/Administration/Commands/SetOutfitCommand.cs

@@ -3,10 +3,9 @@ using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Shared.Administration;
 using Content.Shared.Roles;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;

Content.Server/Administration/Commands/WarpCommand.cs

@@ -2,12 +2,10 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Markers;
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
-using Robust.Shared.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 

Content.Server/Administration/IAdminManager.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Content.Shared.Administration;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 
 #nullable enable
 

Content.Server/Administration/PermissionsEui.cs

@@ -6,7 +6,7 @@ using Content.Server.Database;
 using Content.Server.Eui;
 using Content.Shared.Administration;
 using Content.Shared.Eui;
-using Robust.Server.Interfaces.Player;
+using Robust.Server.Player;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Network;