diff --git a/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs b/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs index 257489a3a2..d8aac40278 100644 --- a/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs +++ b/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs @@ -1,9 +1,8 @@ -using Content.Server.AI.Utility; +using Content.Server.AI.Utility; using Content.Server.AI.WorldState.States.Inventory; using Content.Server.GameObjects.Components; -using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Utility; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.AI.Operators.Inventory diff --git a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs index cd6dacc616..a5216cd76f 100644 --- a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs +++ b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs @@ -1,10 +1,8 @@ -using Content.Server.AI.Utility; +using Content.Server.AI.Utility; using Content.Server.AI.WorldState.States.Inventory; using Content.Server.GameObjects.Components; -using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Utility; -using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Containers; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs b/Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs index 0be12ebd50..c45230589b 100644 --- a/Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs +++ b/Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs @@ -1,7 +1,5 @@ -using Content.Server.AI.WorldState; +using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects.EntitySystems; namespace Content.Server.AI.Utility.Considerations.ActionBlocker diff --git a/Content.Server/Chat/ChatManager.cs b/Content.Server/Chat/ChatManager.cs index 21dedca1df..c57fe6c464 100644 --- a/Content.Server/Chat/ChatManager.cs +++ b/Content.Server/Chat/ChatManager.cs @@ -1,10 +1,7 @@ using System.Linq; using Content.Server.GameObjects.Components.Observer; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces; using Content.Server.Interfaces.Chat; -using Content.Server.Observer; -using Content.Server.Players; using Content.Shared.Chat; using Content.Shared.GameObjects.EntitySystems; using Robust.Server.Console; @@ -13,7 +10,6 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Log; namespace Content.Server.Chat { diff --git a/Content.Server/Explosions/ExplosionHelper.cs b/Content.Server/Explosions/ExplosionHelper.cs index 54d6bb4ba0..3ba7bd1f53 100644 --- a/Content.Server/Explosions/ExplosionHelper.cs +++ b/Content.Server/Explosions/ExplosionHelper.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Mobs; using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.Maps; -using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.Player; diff --git a/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs b/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs index 3f12ad5f47..100ad449f4 100644 --- a/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs @@ -1,13 +1,10 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces; using Content.Server.Interfaces.GameObjects; -using Content.Server.Utility; using Content.Shared.Access; using Content.Shared.GameObjects.Components.Access; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/AnchorableComponent.cs b/Content.Server/GameObjects/Components/AnchorableComponent.cs index ef8e0b4a27..3c2311b6a3 100644 --- a/Content.Server/GameObjects/Components/AnchorableComponent.cs +++ b/Content.Server/GameObjects/Components/AnchorableComponent.cs @@ -1,6 +1,6 @@ -using Content.Server.GameObjects.Components.Interactable; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.Components.Interactable; using Content.Shared.GameObjects.Components.Interactable; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; diff --git a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs index 1a2786a412..634bdefa19 100644 --- a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs +++ b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs @@ -3,7 +3,6 @@ using System; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Strap; using Content.Server.Interfaces; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Mobs; using Content.Server.Utility; using Content.Shared.GameObjects; @@ -11,6 +10,7 @@ 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.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystemMessages; using Robust.Server.GameObjects.EntitySystems; diff --git a/Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs b/Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs index 78c30dc9b4..9e263f5795 100644 --- a/Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs @@ -2,8 +2,8 @@ using Content.Server.Cargo; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects.Components.Cargo; +using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Prototypes.Cargo; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs b/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs index 3a73ee3444..18d285307c 100644 --- a/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs @@ -1,12 +1,8 @@ -using System; +using System; using System.Linq; -using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.GameObjects.Components.Sound; using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.GameObjects.Components.Power; using Content.Server.Interfaces; using Content.Server.Interfaces.GameObjects; -using Content.Server.Utility; using Content.Shared.Chemistry; using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.GameObjects.EntitySystems; @@ -18,14 +14,13 @@ using Robust.Shared.GameObjects; 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 Robust.Shared.Interfaces.Random; -using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs b/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs index 189a7c3808..9f78004304 100644 --- a/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs @@ -1,10 +1,10 @@ using System; using Content.Server.GameObjects.Components.Metabolism; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces; using Content.Server.Utility; using Content.Shared.Chemistry; using Content.Shared.GameObjects.Components.Chemistry; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/GameObjects/Components/Chemistry/PillComponent.cs b/Content.Server/GameObjects/Components/Chemistry/PillComponent.cs index b41f462c5c..6d682e594f 100644 --- a/Content.Server/GameObjects/Components/Chemistry/PillComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/PillComponent.cs @@ -1,23 +1,15 @@ -using System; -using System.Collections.Generic; -using Content.Server.GameObjects.Components.Chemistry; -using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.GameObjects.Components.Nutrition; +using Content.Server.GameObjects.Components.Nutrition; using Content.Server.GameObjects.Components.Utensil; -using Content.Server.GameObjects.EntitySystems; using Content.Server.Utility; -using Content.Server.GameObjects.Components.Sound; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.Chemistry; -using Content.Shared.GameObjects.Components.Utensil; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Log; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Chemistry/PourableComponent.cs b/Content.Server/GameObjects/Components/Chemistry/PourableComponent.cs index c23f727381..13fd1e2081 100644 --- a/Content.Server/GameObjects/Components/Chemistry/PourableComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/PourableComponent.cs @@ -1,18 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Content.Server.GameObjects.Components.Nutrition; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Interfaces; -using Content.Server.Utility; +using Content.Server.Interfaces; using Content.Shared.Chemistry; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using Robust.Shared.Utility; namespace Content.Server.GameObjects.Components.Chemistry { diff --git a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs b/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs index 85004d542c..60998b2d5f 100644 --- a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs @@ -1,12 +1,8 @@ using System; using System.Linq; -using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.GameObjects.Components.Sound; using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.GameObjects.Components.Power; using Content.Server.Interfaces; using Content.Server.Interfaces.GameObjects; -using Content.Server.Utility; using Content.Shared.Chemistry; using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.GameObjects.EntitySystems; @@ -24,6 +20,7 @@ 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; namespace Content.Server.GameObjects.Components.Chemistry { diff --git a/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs b/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs index 38e54736b5..53b2fa5675 100644 --- a/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs @@ -1,9 +1,7 @@ using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.GameObjects.Components.Power; using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Interfaces.GameTicking; -using Content.Server.Utility; using Content.Shared.GameObjects.Components.Command; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.Player; diff --git a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs index 5005046472..1eb9cad50e 100644 --- a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using Content.Server.GameObjects.Components.Interactable; -using Content.Server.GameObjects.Components.Stack; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Interfaces; -using Content.Server.Utility; -using Content.Shared.Construction; +using Content.Shared.Construction; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Damage/DamageOnToolInteractComponent.cs b/Content.Server/GameObjects/Components/Damage/DamageOnToolInteractComponent.cs index 8a50cd06c5..fb3a546d7e 100644 --- a/Content.Server/GameObjects/Components/Damage/DamageOnToolInteractComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/DamageOnToolInteractComponent.cs @@ -1,10 +1,9 @@ using Content.Server.GameObjects.Components.Interactable; -using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Interactable; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using System.Collections.Generic; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Shared.Interfaces.GameObjects.Components; namespace Content.Server.GameObjects.Components.Damage { diff --git a/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs b/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs index ae3fc6dcb2..4a34bc35a0 100644 --- a/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs @@ -8,7 +8,6 @@ using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Map; using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs index 855f127dc7..ade77fb937 100644 --- a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs @@ -3,10 +3,10 @@ using System.Threading; using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.Components.VendingMachines; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces; using Content.Shared.GameObjects.Components.Doors; using Content.Shared.GameObjects.Components.Interactable; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs index 23a2a80ee5..c6d28ffd3f 100644 --- a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs @@ -2,11 +2,9 @@ using System.Linq; using Content.Server.GameObjects.Components.Access; using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Utility; using Content.Shared.GameObjects.Components.Doors; using Content.Shared.GameObjects.Components.Movement; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; diff --git a/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs b/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs index 5dab5960c2..3e493bccf2 100644 --- a/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs +++ b/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs @@ -1,13 +1,9 @@ -using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.GameObjects.Components.Weapon; -using Content.Server.GameObjects.EntitySystems; +using Content.Server.GameObjects.Components.Weapon; using Content.Server.Interfaces.GameObjects.Components.Interaction; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Explosion diff --git a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs b/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs index 12715b6e95..f0e6c07018 100644 --- a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs @@ -1,14 +1,11 @@ -using System; +using System; using Content.Server.GameObjects.Components.Chemistry; -using Content.Server.GameObjects.Components.Sound; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Utility; using Content.Shared.Chemistry; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; 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; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Fluids/MopComponent.cs b/Content.Server/GameObjects/Components/Fluids/MopComponent.cs index 22f08f9ea8..b24b529b43 100644 --- a/Content.Server/GameObjects/Components/Fluids/MopComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/MopComponent.cs @@ -1,14 +1,11 @@ -using System; -using Content.Server.GameObjects.Components.Chemistry; -using Content.Server.GameObjects.Components.Sound; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.Components.Chemistry; using Content.Server.Utility; using Content.Shared.Chemistry; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; 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; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs b/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs index d24c8b8008..4db51104f3 100644 --- a/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs +++ b/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs @@ -1,25 +1,19 @@ using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.GameObjects.Components.Power; using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces; -using Content.Server.Utility; using Content.Shared.GameObjects.Components.Gravity; using Content.Shared.GameObjects.Components.Interactable; -using Microsoft.EntityFrameworkCore.Metadata.Builders; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.Player; 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.Utility; namespace Content.Server.GameObjects.Components.Gravity { diff --git a/Content.Server/GameObjects/Components/Healing/HealingComponent.cs b/Content.Server/GameObjects/Components/Healing/HealingComponent.cs index b0d0b9e2c0..d9beaa3916 100644 --- a/Content.Server/GameObjects/Components/Healing/HealingComponent.cs +++ b/Content.Server/GameObjects/Components/Healing/HealingComponent.cs @@ -1,7 +1,7 @@ using Content.Server.GameObjects.Components.Stack; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Utility; using Content.Shared.GameObjects; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs b/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs index d0017971e5..efefa21221 100644 --- a/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs +++ b/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Linq; using Content.Server.GameObjects.Components.Mobs; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces; using Content.Server.Mobs; using Content.Shared.GameObjects.Components.Instruments; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs index d6923ef8b9..843b397f1b 100644 --- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs @@ -1,6 +1,5 @@ using Content.Server.GameObjects.Components.Power; using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces.GameObjects; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components; @@ -17,7 +16,7 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -using Content.Server.GameObjects.Components.Items.Storage; +using Content.Shared.Interfaces.GameObjects.Components; namespace Content.Server.GameObjects.Components.Interactable { diff --git a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs b/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs index 95973aa1d4..40fde3d0e9 100644 --- a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs @@ -1,14 +1,12 @@ -using System.Collections.Generic; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using System.Collections.Generic; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Interactable; +using Content.Shared.Interfaces.GameObjects.Components; 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.Interfaces.Serialization; -using Robust.Shared.IoC; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Interactable diff --git a/Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs b/Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs index 12f95f4371..2d3d59884b 100644 --- a/Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs @@ -1,14 +1,12 @@ -using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems.Click; using Content.Shared.GameObjects.Components.Interactable; +using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Maps; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Map; -using Robust.Shared.Prototypes; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Interactable diff --git a/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs b/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs index 495fc008b5..1f647ef0e4 100644 --- a/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs @@ -1,13 +1,5 @@ -// Only unused on .NET Core due to KeyValuePair.Deconstruct -// ReSharper disable once RedundantUsingDirective - -using System; +using System; using System.Collections.Generic; -using System.Linq; -using System.Reflection.Metadata.Ecma335; -using Content.Server.GameObjects.Components.Chemistry; -using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.GameObjects.EntitySystems; diff --git a/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs b/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs index f9c67efebd..5171782416 100644 --- a/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs @@ -1,8 +1,6 @@ #nullable enable using System; -using System.Runtime.Remoting; using Content.Server.GameObjects.Components.Chemistry; -using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces; @@ -11,11 +9,10 @@ using Content.Server.Interfaces.GameObjects; using Content.Shared.Chemistry; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Interactable; -using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; 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.Utility; diff --git a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs index 3b0f568c9e..863edfa7d8 100644 --- a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs @@ -1,14 +1,14 @@ -// Only unused on .NET Core due to KeyValuePair.Deconstruct +// Only unused on .NET Core due to KeyValuePair.Deconstruct // ReSharper disable once RedundantUsingDirective using Robust.Shared.Utility; using System; using System.Collections.Generic; using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.Interfaces.GameObjects.Components.Interaction; 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.Serialization; diff --git a/Content.Server/GameObjects/Components/Items/DiceComponent.cs b/Content.Server/GameObjects/Components/Items/DiceComponent.cs index 90f5ab03ce..11d0aadd21 100644 --- a/Content.Server/GameObjects/Components/Items/DiceComponent.cs +++ b/Content.Server/GameObjects/Components/Items/DiceComponent.cs @@ -1,14 +1,11 @@ -using Content.Server.GameObjects.Components.Sound; -using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Utility; +using Content.Server.GameObjects.EntitySystems.Click; using Content.Shared.Audio; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; 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; diff --git a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs index a8a4a8bafa..0d31c6c2f1 100644 --- a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs @@ -1,18 +1,14 @@ using Content.Server.GameObjects.Components.Stack; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Utility; +using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Maps; using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.Audio; using Robust.Shared.GameObjects; 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.Serialization; -using Robust.Shared.Utility; namespace Content.Server.GameObjects.Components.Items { diff --git a/Content.Server/GameObjects/Components/Items/RCDComponent.cs b/Content.Server/GameObjects/Components/Items/RCDComponent.cs index 657addaba8..3eb7d40fe8 100644 --- a/Content.Server/GameObjects/Components/Items/RCDComponent.cs +++ b/Content.Server/GameObjects/Components/Items/RCDComponent.cs @@ -1,14 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; -using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.Interfaces; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Utility; -using Content.Shared.Construction; +using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Maps; -using Microsoft.EntityFrameworkCore.Internal; using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; @@ -18,7 +13,6 @@ using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; -using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs index 9b206fbeeb..db6683ba39 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.GameObjects.Components.Storage; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Physics; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; diff --git a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs index c849aa52bb..992a31ebc5 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs @@ -6,6 +6,7 @@ using Content.Server.Utility; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Containers; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs index e9b83f78b7..b2436cd3d2 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs @@ -1,10 +1,10 @@ -using Content.Server.GameObjects.Components.Access; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +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.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; diff --git a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs index 3c4b9575ab..8a5920f524 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs @@ -7,6 +7,7 @@ using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Utility; using Content.Shared.GameObjects.Components.Storage; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.EntitySystemMessages; diff --git a/Content.Server/GameObjects/Components/Items/ToysComponent.cs b/Content.Server/GameObjects/Components/Items/ToysComponent.cs index d6ad2a8ae8..73d1c06032 100644 --- a/Content.Server/GameObjects/Components/Items/ToysComponent.cs +++ b/Content.Server/GameObjects/Components/Items/ToysComponent.cs @@ -1,21 +1,14 @@ -using Content.Server.GameObjects.Components.Sound; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Utility; -using Content.Shared.Audio; -using Robust.Server.GameObjects; +using Content.Shared.Audio; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.EntitySystems; 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.Prototypes; using Robust.Shared.Random; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Items diff --git a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs index b8a6401a6c..5c1e00d6f2 100644 --- a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs @@ -15,7 +15,6 @@ using Robust.Server.GameObjects; using Content.Shared.GameObjects.Components.Power; using Robust.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.Components.Container; -using Content.Server.GameObjects.Components.Power; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Localization; @@ -24,10 +23,10 @@ using Robust.Shared.Audio; using Content.Server.Interfaces.GameObjects; using Content.Server.Interfaces.Chat; using Content.Server.BodySystem; -using Content.Server.GameObjects.Components.Items.Storage; using Content.Shared.BodySystem; using Robust.Shared.GameObjects.Systems; using Content.Server.GameObjects.Components.Power.ApcNetComponents; +using Content.Shared.Interfaces.GameObjects.Components; namespace Content.Server.GameObjects.Components.Kitchen { diff --git a/Content.Server/GameObjects/Components/MagicMirrorComponent.cs b/Content.Server/GameObjects/Components/MagicMirrorComponent.cs index eec3bea3d3..e14b07384c 100644 --- a/Content.Server/GameObjects/Components/MagicMirrorComponent.cs +++ b/Content.Server/GameObjects/Components/MagicMirrorComponent.cs @@ -1,8 +1,7 @@ -using Content.Server.GameObjects.Components.Mobs; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Utility; +using Content.Server.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Preferences.Appearance; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Markers/WarpPointComponent.cs b/Content.Server/GameObjects/Components/Markers/WarpPointComponent.cs index 232ba77ccf..4003e64a19 100644 --- a/Content.Server/GameObjects/Components/Markers/WarpPointComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/WarpPointComponent.cs @@ -1,5 +1,4 @@ -using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems.Click; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs b/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs index 84bd1b53ba..7f80981f17 100644 --- a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs +++ b/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Medical; -using Content.Server.GameObjects.Components.Power; -using Content.Server.Utility; using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; @@ -15,6 +12,7 @@ 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 { diff --git a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs b/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs index d6df7cca1d..f390604b38 100644 --- a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs +++ b/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs @@ -1,14 +1,11 @@ -using Content.Server.GameObjects.Components.Sound; -using Content.Server.GameObjects.Components.Weapon.Melee; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Utility; +using Content.Server.GameObjects.Components.Weapon.Melee; using Content.Shared.GameObjects; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; 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.Random; diff --git a/Content.Server/GameObjects/Components/Mobs/DamageStates.cs b/Content.Server/GameObjects/Components/Mobs/DamageStates.cs index ad79a7a106..23c24eae1c 100644 --- a/Content.Server/GameObjects/Components/Mobs/DamageStates.cs +++ b/Content.Server/GameObjects/Components/Mobs/DamageStates.cs @@ -1,15 +1,8 @@ using Content.Server.GameObjects.Components.Mobs; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Mobs; -using Content.Shared.Audio; -using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.EntitySystems; -using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; namespace Content.Server.GameObjects { diff --git a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs index 3e15cdceaf..9083ac09af 100644 --- a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs @@ -1,6 +1,5 @@ using Content.Server.GameObjects.Components.Observer; using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces.GameTicking; using Content.Server.Mobs; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs index 95e4398f6e..9fcda39b42 100644 --- a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs @@ -1,9 +1,5 @@ -using System; +using System; using System.Threading; -using Content.Server.GameObjects.Components.Movement; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Interfaces.GameObjects; -using Content.Server.GameObjects.EntitySystems; using Content.Server.Mobs; using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Mobs; @@ -16,6 +12,7 @@ using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using Timer = Robust.Shared.Timers.Timer; using Content.Shared.GameObjects.Components.Movement; +using Content.Shared.Interfaces.GameObjects.Components; using Math = CannyFastMath.Math; using MathF = CannyFastMath.MathF; diff --git a/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs b/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs index f9be2f20de..74170d8ba3 100644 --- a/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs @@ -1,7 +1,7 @@ using System; using System.Linq; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects.Components.Movement; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; @@ -17,7 +17,6 @@ using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.Timers; using Robust.Shared.ViewVariables; -using Robust.Shared.Utility; namespace Content.Server.GameObjects.Components.Movement { diff --git a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs index 2a1097a13b..cdeba574f4 100644 --- a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs @@ -1,11 +1,11 @@ -using System; -using Content.Server.GameObjects.Components.Chemistry; +using Content.Server.GameObjects.Components.Chemistry; using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.Audio; using Content.Shared.Chemistry; using Content.Shared.GameObjects.Components.Nutrition; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs index f7e286aafd..dc2da33143 100644 --- a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs @@ -1,22 +1,18 @@ -using System; +using System; using System.Collections.Generic; using Content.Server.GameObjects.Components.Chemistry; -using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Utensil; -using Content.Server.GameObjects.EntitySystems; using Content.Server.Utility; -using Content.Server.GameObjects.Components.Sound; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.Chemistry; using Content.Shared.GameObjects.Components.Utensil; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Log; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs b/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs index 3c365de9ae..5953616ed2 100644 --- a/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs @@ -1,9 +1,7 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects.Components.Nutrition; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs b/Content.Server/GameObjects/Components/Observer/GhostComponent.cs index ba906a1b78..cb0c938419 100644 --- a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs +++ b/Content.Server/GameObjects/Components/Observer/GhostComponent.cs @@ -1,7 +1,5 @@ -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Players; +using Content.Server.Players; using Content.Shared.GameObjects.Components.Observer; -using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components; using Robust.Server.Interfaces.GameObjects; @@ -10,8 +8,6 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.Players; using Robust.Shared.ViewVariables; -using Timer = Robust.Shared.Timers.Timer; - namespace Content.Server.GameObjects.Components.Observer { diff --git a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs b/Content.Server/GameObjects/Components/PDA/PDAComponent.cs index e91c4fac54..81b32bb5d9 100644 --- a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs +++ b/Content.Server/GameObjects/Components/PDA/PDAComponent.cs @@ -1,16 +1,15 @@ -#nullable enable +#nullable enable using System; using System.Collections; using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Access; -using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.Interfaces.GameObjects.Components.Interaction; 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.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.UserInterface; diff --git a/Content.Server/GameObjects/Components/Paper/PaperComponent.cs b/Content.Server/GameObjects/Components/Paper/PaperComponent.cs index d8d391b483..b025eff162 100644 --- a/Content.Server/GameObjects/Components/Paper/PaperComponent.cs +++ b/Content.Server/GameObjects/Components/Paper/PaperComponent.cs @@ -1,7 +1,6 @@ using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Utility; using Content.Shared.GameObjects.Components; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs b/Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs index 1f193bf5bd..ac9c35784c 100644 --- a/Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs +++ b/Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs @@ -1,6 +1,5 @@ -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Utility; -using Content.Shared.GameObjects.Components; +using Content.Shared.GameObjects.Components; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs b/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs index 249124a5fe..cad93e0261 100644 --- a/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs +++ b/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs @@ -1,8 +1,8 @@ -using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.Interfaces.GameObjects; using Content.Shared.Audio; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs index 12e77904eb..78efb7927c 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs @@ -1,6 +1,5 @@ using Content.Server.GameObjects.Components.Power.PowerNetComponents; using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; -using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Power; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; @@ -11,7 +10,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.ViewVariables; using System; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.IoC; using Robust.Shared.Interfaces.Timing; diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs index 9a8002681d..6866c80277 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs @@ -1,13 +1,11 @@ using System; -using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs index 07aafe6459..d704c5b545 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs @@ -1,11 +1,10 @@ using System; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.Audio; +using Content.Shared.Interfaces.GameObjects.Components; 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.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Maths; @@ -13,7 +12,6 @@ using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using Robust.Shared.Utility; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs index 8e4adfced8..efec4b9ca2 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs @@ -1,5 +1,4 @@ -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs index 3d4a6e615b..6c213f186e 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs @@ -1,12 +1,9 @@ using System; -using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.GameObjects.Components.Sound; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; -using Content.Server.Utility; using Content.Shared.GameObjects; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.EntitySystems; diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs index bbbb29375a..6ca31fef73 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs @@ -1,6 +1,5 @@ using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs index 24270c597e..19ed2c9629 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs @@ -1,9 +1,7 @@ -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.GameObjects.Components.Power; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameTicking; using Content.Shared.GameObjects.Components.Power; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs index 4cb7cde036..04d8982e78 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs @@ -1,19 +1,9 @@ using System; -using Content.Server.GameObjects.Components.Damage; using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.GameObjects.Components.Power.PowerNetComponents; -using Content.Server.GameObjects.EntitySystems; -using Content.Shared.Audio; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.Interfaces.Timing; -using Robust.Shared.IoC; -using Robust.Shared.Maths; -using Robust.Shared.Prototypes; -using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Power/WireComponent.cs b/Content.Server/GameObjects/Components/Power/WireComponent.cs index 70b7d81193..7b551c1727 100644 --- a/Content.Server/GameObjects/Components/Power/WireComponent.cs +++ b/Content.Server/GameObjects/Components/Power/WireComponent.cs @@ -1,8 +1,7 @@ using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Stack; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects.Components.Interactable; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs b/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs index b23a3cbf90..3b009891af 100644 --- a/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs @@ -1,8 +1,4 @@ -using Content.Server.GameObjects.Components.NodeContainer; -using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; -using Content.Server.GameObjects.Components.Stack; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.Components.Stack; using Content.Server.Utility; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; @@ -11,8 +7,7 @@ using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System.Collections.Generic; -using System.Linq; +using Content.Shared.Interfaces.GameObjects.Components; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Research/LatheComponent.cs b/Content.Server/GameObjects/Components/Research/LatheComponent.cs index 639664bdfa..7bd7dd799e 100644 --- a/Content.Server/GameObjects/Components/Research/LatheComponent.cs +++ b/Content.Server/GameObjects/Components/Research/LatheComponent.cs @@ -5,10 +5,7 @@ using System; using Robust.Shared.Utility; using System.Collections.Generic; using System.Linq; -using Content.Server.GameObjects.Components.Power; using Content.Server.GameObjects.Components.Stack; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Utility; using Content.Shared.GameObjects.Components.Materials; using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.Components.Research; @@ -21,6 +18,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.Timers; using Robust.Shared.ViewVariables; using Content.Server.GameObjects.Components.Power.ApcNetComponents; +using Content.Shared.Interfaces.GameObjects.Components; namespace Content.Server.GameObjects.Components.Research { diff --git a/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs index 3f14fe00da..f901b5ae64 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs @@ -1,6 +1,6 @@ using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Utility; using Content.Shared.GameObjects.Components.Research; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.Player; diff --git a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs index 2a2c8ce62c..6d2c3380de 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs @@ -1,9 +1,7 @@ using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.GameObjects.Components.Power; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Utility; using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Research; +using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Research; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.GameObjects.EntitySystems; @@ -12,7 +10,6 @@ using Robust.Server.Interfaces.Player; 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.Prototypes; diff --git a/Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs index c6d60cbd8a..01bb0e7b90 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs @@ -1,6 +1,5 @@ using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.GameObjects.Components.Power; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs index 4060b01368..e636a0d3d2 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs @@ -1,14 +1,10 @@ using System.Collections.Generic; -using Content.Server.GameObjects.Components.Power; using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.Research; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using Robust.Shared.Utility; using Content.Server.GameObjects.Components.Power.ApcNetComponents; namespace Content.Server.GameObjects.Components.Research diff --git a/Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs b/Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs index 25b0f149f5..8442458b57 100644 --- a/Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs +++ b/Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs @@ -1,6 +1,5 @@ -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Shared.Audio; +using Content.Shared.Audio; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs b/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs index ef6f330ffc..f927d093a0 100644 --- a/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs +++ b/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs @@ -1,5 +1,5 @@ -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Shared.Audio; +using Content.Shared.Audio; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Stack/StackComponent.cs b/Content.Server/GameObjects/Components/Stack/StackComponent.cs index 3d6d18d46d..d62efca2c7 100644 --- a/Content.Server/GameObjects/Components/Stack/StackComponent.cs +++ b/Content.Server/GameObjects/Components/Stack/StackComponent.cs @@ -1,9 +1,8 @@ using System; using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Utility; using Content.Shared.GameObjects.Components; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs index f2c8f42a8d..98dd83cc8d 100644 --- a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs +++ b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Buckle; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Strap; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; diff --git a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs b/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs index dcea664899..9987f29093 100644 --- a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs +++ b/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs @@ -1,13 +1,18 @@ using System; -using Content.Server.Interfaces.GameObjects; using Content.Shared.GameObjects; using Content.Shared.Maths; using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects { + public interface ITemperatureComponent : IComponent + { + float CurrentTemperature { get; } + } + /// /// Handles changing temperature, /// informing others of the current temperature, @@ -20,8 +25,7 @@ namespace Content.Server.GameObjects public override string Name => "Temperature"; //TODO: should be programmatic instead of how it currently is - [ViewVariables] - public float CurrentTemperature { get; private set; } = PhysicalConstants.ZERO_CELCIUS; + [ViewVariables] public float CurrentTemperature { get; private set; } = PhysicalConstants.ZERO_CELCIUS; float _fireDamageThreshold = 0; float _fireDamageCoefficient = 1; @@ -39,7 +43,8 @@ namespace Content.Server.GameObjects /// public void OnUpdate(float frameTime) { - int fireDamage = (int)Math.Floor(Math.Max(0, CurrentTemperature - _fireDamageThreshold) / _fireDamageCoefficient); + int fireDamage = + (int) Math.Floor(Math.Max(0, CurrentTemperature - _fireDamageThreshold) / _fireDamageCoefficient); _secondsSinceLastDamageUpdate += frameTime; diff --git a/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs b/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs index 81657b1063..d65a7bdaae 100644 --- a/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs +++ b/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs @@ -1,6 +1,7 @@ using System; using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects.Components.Triggers; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs b/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs index a45cd363ad..9c0a843aa5 100644 --- a/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs +++ b/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Nutrition; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Utility; using Content.Shared.GameObjects.Components.Utensil; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs b/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs index 457aa83139..ca73bd3f5e 100644 --- a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs @@ -2,12 +2,10 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.GameObjects.Components.Power; using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Utility; using Content.Shared.GameObjects.Components.VendingMachines; +using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.VendingMachines; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; @@ -15,7 +13,6 @@ using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs index 1edf8e3ef1..d60085bb80 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs index 41b06f06df..76ad68b7ce 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs @@ -16,6 +16,7 @@ using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using CannyFastMath; +using Content.Shared.Interfaces.GameObjects.Components; using Math = CannyFastMath.Math; using MathF = CannyFastMath.MathF; diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs index aa3f7335b8..2040bbf35b 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs @@ -1,14 +1,13 @@ using System.Collections.Generic; -using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Power; using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces.GameObjects; using Content.Shared.Audio; using Content.Shared.GameObjects; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.EntitySystems; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs index 88cd3ab9f9..2e0d0572cf 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs @@ -1,27 +1,17 @@ -using System; +using System; using System.Collections.Generic; -using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Shared.Audio; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Audio; 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.Maths; -using Robust.Shared.Prototypes; -using Robust.Shared.Random; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs index e1cfe71da7..f9bf026ab1 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs @@ -1,24 +1,15 @@ -using System; +using System; using System.Collections.Generic; -using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Audio; 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.Prototypes; -using Robust.Shared.Random; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs index 2a078a1ce9..b1d7d239b8 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs @@ -1,10 +1,8 @@ -using System.Collections.Generic; -using Content.Server.GameObjects.Components.Items.Storage; +using System.Collections.Generic; using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs index 87d8e24faf..2d584cc840 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs @@ -1,12 +1,10 @@ -using System.Collections.Generic; -using Content.Server.GameObjects.Components.Sound; +using System.Collections.Generic; using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.EntitySystems; @@ -16,7 +14,6 @@ using Robust.Shared.Containers; 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.Map; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs index b7cd964a27..3c4acb1e04 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs @@ -1,10 +1,8 @@ -using System.Collections.Generic; -using Content.Server.GameObjects.Components.Sound; +using System.Collections.Generic; using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.EntitySystems; @@ -13,7 +11,6 @@ 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.Map; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs index d66f0554d7..c873127b11 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs @@ -1,12 +1,10 @@ -using System; -using Content.Server.GameObjects.Components.Sound; +using System; using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.EntitySystems; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs index d357af3bfd..155fa86804 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs @@ -1,13 +1,10 @@ using System; using System.Collections.Generic; -using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Power; using Content.Server.GameObjects.Components.Projectiles; -using Content.Server.GameObjects.Components.Sound; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.EntitySystems; @@ -15,11 +12,9 @@ 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.Map; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using Logger = Robust.Shared.Log.Logger; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels { diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs index e51c75b4df..b792cabae5 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs @@ -1,14 +1,12 @@ -using System; +using System; using System.Collections.Generic; -using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.EntitySystems; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs index 1c191ba133..0adc736da0 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs @@ -4,10 +4,9 @@ using System.Linq; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Projectiles; using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Weapons.Ranged; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; using Robust.Shared.GameObjects.Components; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs index 6ac04ed143..4b62106aa7 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs @@ -1,10 +1,9 @@ -using System; +using System; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; diff --git a/Content.Server/GameObjects/Components/WiresComponent.cs b/Content.Server/GameObjects/Components/WiresComponent.cs index 8af306e51e..47efb6ba21 100644 --- a/Content.Server/GameObjects/Components/WiresComponent.cs +++ b/Content.Server/GameObjects/Components/WiresComponent.cs @@ -11,6 +11,7 @@ using Content.Server.Interfaces.GameObjects; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces.GameObjects.Components; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index ca4e650b70..03f6772ff2 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -3,12 +3,12 @@ using System.Linq; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Timing; using Content.Server.Interfaces.GameObjects; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Utility; using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Input; +using Content.Shared.Interfaces.GameObjects.Components; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Server.Interfaces.Player; diff --git a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs b/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs index e84b867748..43a4e7145f 100644 --- a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs @@ -5,12 +5,12 @@ using Content.Server.GameObjects.Components.Construction; using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces; using Content.Server.Utility; using Content.Shared.Construction; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Interactable; +using Content.Shared.Interfaces.GameObjects.Components; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; diff --git a/Content.Server/Health/BodySystem/BodyManagerComponent.cs b/Content.Server/Health/BodySystem/BodyManagerComponent.cs index c7e299b1f8..90406c4a72 100644 --- a/Content.Server/Health/BodySystem/BodyManagerComponent.cs +++ b/Content.Server/Health/BodySystem/BodyManagerComponent.cs @@ -7,9 +7,7 @@ using System.Collections.Generic; using Content.Shared.BodySystem; using Robust.Shared.ViewVariables; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Map; using System.Linq; -using Content.Server.Interfaces.GameObjects.Components.Interaction; namespace Content.Server.BodySystem { diff --git a/Content.Server/Health/BodySystem/BodyPart/DroppedBodyPartComponent.cs b/Content.Server/Health/BodySystem/BodyPart/DroppedBodyPartComponent.cs index 8fc0ee2724..2f520c4449 100644 --- a/Content.Server/Health/BodySystem/BodyPart/DroppedBodyPartComponent.cs +++ b/Content.Server/Health/BodySystem/BodyPart/DroppedBodyPartComponent.cs @@ -1,21 +1,16 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; -using System; using System.Collections.Generic; using Content.Shared.BodySystem; using Robust.Shared.ViewVariables; using System.Globalization; using Robust.Server.GameObjects; -using Content.Server.GameObjects.EntitySystems; using Robust.Shared.Interfaces.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.Player; using Content.Shared.Interfaces; -using Robust.Shared.Interfaces.Random; using System.Linq; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Localization; namespace Content.Server.BodySystem diff --git a/Content.Server/Health/BodySystem/BodyScanner/BodyScannerComponent.cs b/Content.Server/Health/BodySystem/BodyScanner/BodyScannerComponent.cs index 4fe2a5f309..2274cf790d 100644 --- a/Content.Server/Health/BodySystem/BodyScanner/BodyScannerComponent.cs +++ b/Content.Server/Health/BodySystem/BodyScanner/BodyScannerComponent.cs @@ -1,18 +1,9 @@ -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Robust.Server.GameObjects.Components.UserInterface; +using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Content.Server.Utility; using Content.Shared.BodySystem; - +using Content.Shared.Interfaces.GameObjects.Components; namespace Content.Server.BodySystem { diff --git a/Content.Server/Health/BodySystem/Mechanism/DroppedMechanismComponent.cs b/Content.Server/Health/BodySystem/Mechanism/DroppedMechanismComponent.cs index 32c788d233..4a9faafe83 100644 --- a/Content.Server/Health/BodySystem/Mechanism/DroppedMechanismComponent.cs +++ b/Content.Server/Health/BodySystem/Mechanism/DroppedMechanismComponent.cs @@ -8,15 +8,12 @@ using Content.Shared.BodySystem; using Robust.Shared.ViewVariables; using System.Globalization; using Robust.Server.GameObjects; -using Content.Server.GameObjects.EntitySystems; using Robust.Shared.Log; using Content.Shared.Interfaces; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.Random; using Robust.Shared.Interfaces.GameObjects; -using System.Diagnostics; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Localization; namespace Content.Server.BodySystem { diff --git a/Content.Server/Health/BodySystem/Surgery/Surgeon/SurgeryToolComponent.cs b/Content.Server/Health/BodySystem/Surgery/Surgeon/SurgeryToolComponent.cs index bf2e55624f..f180c5501a 100644 --- a/Content.Server/Health/BodySystem/Surgery/Surgeon/SurgeryToolComponent.cs +++ b/Content.Server/Health/BodySystem/Surgery/Surgeon/SurgeryToolComponent.cs @@ -1,16 +1,14 @@ using System; using System.Collections.Generic; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.BodySystem; using Content.Shared.GameObjects; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.Player; 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; diff --git a/Content.Server/Interfaces/GameObjects/Components/Temperature/ITemperatureComponent.cs b/Content.Server/Interfaces/GameObjects/Components/Temperature/ITemperatureComponent.cs deleted file mode 100644 index 51bc8749cd..0000000000 --- a/Content.Server/Interfaces/GameObjects/Components/Temperature/ITemperatureComponent.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.Interfaces.GameObjects -{ - public interface ITemperatureComponent : IComponent - { - float CurrentTemperature { get; } - } -} diff --git a/Content.Server/Mobs/Mind.cs b/Content.Server/Mobs/Mind.cs index 17a453b0e5..2c5a275bec 100644 --- a/Content.Server/Mobs/Mind.cs +++ b/Content.Server/Mobs/Mind.cs @@ -2,14 +2,12 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Mobs; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Players; using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.Player; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Network; -using Robust.Shared.Utility; using Robust.Shared.ViewVariables; namespace Content.Server.Mobs diff --git a/Content.Server/Mobs/Role.cs b/Content.Server/Mobs/Role.cs index c5dff2391f..56e78dcc44 100644 --- a/Content.Server/Mobs/Role.cs +++ b/Content.Server/Mobs/Role.cs @@ -1,9 +1,6 @@ // Hey look, // Antag Datums. -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Robust.Shared.Utility; - namespace Content.Server.Mobs { /// diff --git a/Content.Server/Observer/Ghost.cs b/Content.Server/Observer/Ghost.cs index 7924d9f704..ce2dda23c3 100644 --- a/Content.Server/Observer/Ghost.cs +++ b/Content.Server/Observer/Ghost.cs @@ -1,6 +1,5 @@ -using Content.Server.GameObjects; +using Content.Server.GameObjects; using Content.Server.GameObjects.Components.Observer; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces.GameTicking; using Content.Server.Players; using Content.Shared.GameObjects; @@ -8,9 +7,6 @@ using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Player; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Log; -using Robust.Shared.Map; -using Robust.Shared.Timers; namespace Content.Server.Observer { diff --git a/Content.Server/Utility/InteractionChecks.cs b/Content.Server/Utility/InteractionChecks.cs index b79952a5bb..eb8dcf6f47 100644 --- a/Content.Server/Utility/InteractionChecks.cs +++ b/Content.Server/Utility/InteractionChecks.cs @@ -1,8 +1,6 @@ -using System; -using Content.Server.GameObjects.EntitySystems; -using Content.Shared.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Physics; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; @@ -10,7 +8,6 @@ using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; -using Robust.Shared.Maths; namespace Content.Server.Utility { diff --git a/Content.Shared/Content.Shared.csproj.DotSettings b/Content.Shared/Content.Shared.csproj.DotSettings new file mode 100644 index 0000000000..de3128543f --- /dev/null +++ b/Content.Shared/Content.Shared.csproj.DotSettings @@ -0,0 +1,2 @@ + + True \ No newline at end of file diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IActivate.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs similarity index 95% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IActivate.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs index 13e8c171ab..07b0b9b2cf 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IActivate.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs @@ -3,7 +3,7 @@ using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components behavior when being activated in the world when the user diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs similarity index 97% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs index 04eeef96fb..99a8e3d3b3 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs @@ -4,7 +4,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components a behavior when clicking on another object and no interaction occurs, diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IAttack.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs similarity index 87% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IAttack.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs index 1df2790bcb..cf2950a519 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IAttack.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs @@ -1,8 +1,8 @@ -using System; +using System; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components behavior when being used to "attack". diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IDragDrop.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDragDrop.cs similarity index 89% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IDragDrop.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IDragDrop.cs index b9d47eef12..004bba19be 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IDragDrop.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDragDrop.cs @@ -1,9 +1,8 @@ -using System; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using System; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface allows the component's entity to be dragged and dropped by mouse onto another entity and gives it diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IDragDropOn.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDragDropOn.cs similarity index 77% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IDragDropOn.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IDragDropOn.cs index 00ac843dda..6175884eb2 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IDragDropOn.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDragDropOn.cs @@ -1,9 +1,4 @@ -using System; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Map; - -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface allows the component's entity to be dragged and dropped onto by another entity and gives it diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IDropped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs similarity index 93% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IDropped.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs index a28c31dfe8..ac27389fe3 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IDropped.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs @@ -1,9 +1,9 @@ -using System; +using System; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components behavior when they're dropped by a mob. diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IEquipped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs similarity index 95% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IEquipped.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs index ce99fed577..f2c0ae0df6 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IEquipped.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs @@ -1,10 +1,10 @@ -using System; +using System; using Content.Shared.GameObjects.Components.Inventory; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components behavior when their owner is put in an inventory slot. diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs similarity index 93% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs index a6e481613d..3abf713e25 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs @@ -1,9 +1,9 @@ -using System; +using System; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components behavior when they're held on a deselected hand. diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs similarity index 93% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs index 846ee64dd0..70257cf553 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs @@ -1,9 +1,9 @@ -using System; +using System; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components behavior when they're held on the selected hand. diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs similarity index 95% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs index b4820980bd..576f013db1 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs @@ -3,7 +3,7 @@ using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components behavior when being clicked on by a user with an empty hand diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs similarity index 96% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs index 466b984fbf..79890756a0 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs @@ -4,7 +4,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components behavior when being clicked on by a user with an object in their hand diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/ILand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs similarity index 94% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/ILand.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs index 1915f5fc69..9b002c85e3 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/ILand.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs @@ -1,10 +1,10 @@ -using System; +using System; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components behavior when landing after being thrown. diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs similarity index 96% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs index d1f188cd4e..77dbf612b5 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs @@ -1,10 +1,10 @@ -using System; +using System; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components behavior when being clicked on by a user with an object diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/ITargetedInteractEventArgs.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/ITargetedInteractEventArgs.cs similarity index 71% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/ITargetedInteractEventArgs.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/ITargetedInteractEventArgs.cs index 028e3d3643..bc6313916e 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/ITargetedInteractEventArgs.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/ITargetedInteractEventArgs.cs @@ -1,6 +1,6 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { public interface ITargetedInteractEventArgs { diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IThrown.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs similarity index 93% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IThrown.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs index ca3a798963..349b2ccd1b 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IThrown.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs @@ -1,9 +1,9 @@ -using System; +using System; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components behavior when thrown. diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs similarity index 95% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs index 32f2efa087..5d9cb951ce 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs @@ -1,10 +1,10 @@ -using System; +using System; using Content.Shared.GameObjects.Components.Inventory; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components behavior when their owner is removed from an inventory slot. diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IUse.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs similarity index 93% rename from Content.Server/Interfaces/GameObjects/Components/Interaction/IUse.cs rename to Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs index 6da5926e6c..ec6422deab 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IUse.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs @@ -1,9 +1,9 @@ -using System; +using System; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Shared.Interfaces.GameObjects.Components { /// /// This interface gives components behavior when using the entity in your hands