diff --git a/Content.Benchmarks/ComponentManagerGetAllComponents.cs b/Content.Benchmarks/ComponentManagerGetAllComponents.cs index ec8ae2f3d9..abdba8c53b 100644 --- a/Content.Benchmarks/ComponentManagerGetAllComponents.cs +++ b/Content.Benchmarks/ComponentManagerGetAllComponents.cs @@ -3,11 +3,9 @@ using BenchmarkDotNet.Attributes; using Moq; using Robust.Shared.Exceptions; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Reflection; namespace Content.Benchmarks { diff --git a/Content.Client/Administration/ClientAdminManager.cs b/Content.Client/Administration/ClientAdminManager.cs index 851da395aa..7ef0f31169 100644 --- a/Content.Client/Administration/ClientAdminManager.cs +++ b/Content.Client/Administration/ClientAdminManager.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using Content.Shared.Administration; using Content.Shared.Network.NetMessages; using Robust.Client.Console; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Network; #nullable enable diff --git a/Content.Client/Animations/ReusableAnimations.cs b/Content.Client/Animations/ReusableAnimations.cs index 5b93efe5ae..24564cef62 100644 --- a/Content.Client/Animations/ReusableAnimations.cs +++ b/Content.Client/Animations/ReusableAnimations.cs @@ -1,13 +1,11 @@ using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; using Robust.Shared.Animations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; using System; +using Robust.Shared.GameObjects; namespace Content.Client.Animations { diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs index 6bba80dae5..d2ae617356 100644 --- a/Content.Client/Arcade/BlockGameMenu.cs +++ b/Content.Client/Arcade/BlockGameMenu.cs @@ -6,8 +6,7 @@ using Content.Client.Utility; using Content.Shared.Arcade; using Content.Shared.Input; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; diff --git a/Content.Client/Atmos/AtmosDebugOverlay.cs b/Content.Client/Atmos/AtmosDebugOverlay.cs index 31ce537e7f..a1794162db 100644 --- a/Content.Client/Atmos/AtmosDebugOverlay.cs +++ b/Content.Client/Atmos/AtmosDebugOverlay.cs @@ -1,14 +1,10 @@ using Content.Client.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.Atmos; using Content.Shared.Atmos; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Map; +using Robust.Client.Graphics; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Maths; namespace Content.Client.Atmos diff --git a/Content.Client/Atmos/GasTileOverlay.cs b/Content.Client/Atmos/GasTileOverlay.cs index 16a55249e4..4d71641ff4 100644 --- a/Content.Client/Atmos/GasTileOverlay.cs +++ b/Content.Client/Atmos/GasTileOverlay.cs @@ -1,12 +1,8 @@ using Content.Client.GameObjects.EntitySystems; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Map; +using Robust.Client.Graphics; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Maths; namespace Content.Client.Atmos diff --git a/Content.Client/Chat/ChatBox.cs b/Content.Client/Chat/ChatBox.cs index 60fcab57c2..0269076663 100644 --- a/Content.Client/Chat/ChatBox.cs +++ b/Content.Client/Chat/ChatBox.cs @@ -1,5 +1,5 @@ using Content.Shared.Chat; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Input; diff --git a/Content.Client/Chat/ChatManager.cs b/Content.Client/Chat/ChatManager.cs index a9b3a12640..040da90864 100644 --- a/Content.Client/Chat/ChatManager.cs +++ b/Content.Client/Chat/ChatManager.cs @@ -5,14 +5,11 @@ using Content.Client.Interfaces.Chat; using Content.Shared.Administration; using Content.Shared.Chat; using Robust.Client.Console; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; diff --git a/Content.Client/Chat/SpeechBubble.cs b/Content.Client/Chat/SpeechBubble.cs index b4357a5736..a237695549 100644 --- a/Content.Client/Chat/SpeechBubble.cs +++ b/Content.Client/Chat/SpeechBubble.cs @@ -1,9 +1,9 @@ using System; using Content.Client.Interfaces.Chat; -using Robust.Client.Interfaces.Graphics.ClientEye; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Timers; using Robust.Shared.Timing; diff --git a/Content.Client/ClickMapManager.cs b/Content.Client/ClickMapManager.cs index b6a25fe5ef..fc10f807cf 100644 --- a/Content.Client/ClickMapManager.cs +++ b/Content.Client/ClickMapManager.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using System.Text; using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; using Robust.Client.Utility; using Robust.Shared.IoC; diff --git a/Content.Client/ClientNotifyManager.cs b/Content.Client/ClientNotifyManager.cs index 818c0829b1..6a647a82f8 100644 --- a/Content.Client/ClientNotifyManager.cs +++ b/Content.Client/ClientNotifyManager.cs @@ -4,17 +4,16 @@ using System.Collections.Generic; using Content.Client.Interfaces; using Content.Client.UserInterface.Stylesheets; using Content.Shared; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Graphics; using Robust.Client.Player; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Content.Client/ClientPreferencesManager.cs b/Content.Client/ClientPreferencesManager.cs index f0f75d09bb..5d01c9705c 100644 --- a/Content.Client/ClientPreferencesManager.cs +++ b/Content.Client/ClientPreferencesManager.cs @@ -4,8 +4,8 @@ using System.Linq; using Content.Client.Interfaces; using Content.Shared.Network.NetMessages; using Content.Shared.Preferences; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; +using Robust.Shared.Network; using Robust.Shared.Utility; namespace Content.Client diff --git a/Content.Client/Commands/AtmosDebugCommands.cs b/Content.Client/Commands/AtmosDebugCommands.cs index 10f6856f01..90627f37bb 100644 --- a/Content.Client/Commands/AtmosDebugCommands.cs +++ b/Content.Client/Commands/AtmosDebugCommands.cs @@ -1,9 +1,9 @@ using JetBrains.Annotations; using Content.Client.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; using Content.Shared.Atmos; using System; using Robust.Shared.Console; +using Robust.Shared.GameObjects; namespace Content.Client.Commands { diff --git a/Content.Client/Commands/DebugAiCommand.cs b/Content.Client/Commands/DebugAiCommand.cs index ddaadc153d..f8a2de1152 100644 --- a/Content.Client/Commands/DebugAiCommand.cs +++ b/Content.Client/Commands/DebugAiCommand.cs @@ -1,7 +1,7 @@ using Content.Client.GameObjects.EntitySystems.AI; using JetBrains.Annotations; using Robust.Shared.Console; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Client.Commands { diff --git a/Content.Client/Commands/DebugCommands.cs b/Content.Client/Commands/DebugCommands.cs index e9bb9bf3c8..0523cfb521 100644 --- a/Content.Client/Commands/DebugCommands.cs +++ b/Content.Client/Commands/DebugCommands.cs @@ -4,13 +4,12 @@ using System; using Content.Client.GameObjects.Components; using Content.Client.GameObjects.EntitySystems; using Content.Client.Interfaces; -using Content.Shared.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.GameObjects; using Robust.Shared.Console; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; +using DrawDepth = Content.Shared.GameObjects.DrawDepth; namespace Content.Client.Commands { diff --git a/Content.Client/Commands/DebugPathfindingCommand.cs b/Content.Client/Commands/DebugPathfindingCommand.cs index 0d6135abbb..8e6f623833 100644 --- a/Content.Client/Commands/DebugPathfindingCommand.cs +++ b/Content.Client/Commands/DebugPathfindingCommand.cs @@ -1,7 +1,7 @@ using Content.Client.GameObjects.EntitySystems.AI; using JetBrains.Annotations; using Robust.Shared.Console; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Client.Commands { diff --git a/Content.Client/Commands/HideMechanismsCommand.cs b/Content.Client/Commands/HideMechanismsCommand.cs index bbe5d9f769..3dd9c0db45 100644 --- a/Content.Client/Commands/HideMechanismsCommand.cs +++ b/Content.Client/Commands/HideMechanismsCommand.cs @@ -3,7 +3,7 @@ using Robust.Client.Console; using Robust.Client.GameObjects; using Robust.Shared.Console; using Robust.Shared.Containers; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Client.Commands diff --git a/Content.Client/Commands/ShowMechanismsCommand.cs b/Content.Client/Commands/ShowMechanismsCommand.cs index 85ab4583a4..b289dbb49d 100644 --- a/Content.Client/Commands/ShowMechanismsCommand.cs +++ b/Content.Client/Commands/ShowMechanismsCommand.cs @@ -2,7 +2,7 @@ using Robust.Client.Console; using Robust.Client.GameObjects; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Client.Commands diff --git a/Content.Client/Commands/ToggleOutlineCommand.cs b/Content.Client/Commands/ToggleOutlineCommand.cs index af7aa9e80e..7f18fdc84a 100644 --- a/Content.Client/Commands/ToggleOutlineCommand.cs +++ b/Content.Client/Commands/ToggleOutlineCommand.cs @@ -1,6 +1,6 @@ using Content.Shared; +using Robust.Shared.Configuration; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Configuration; using Robust.Shared.IoC; namespace Content.Client.Commands diff --git a/Content.Client/Construction/ConstructionMenu.xaml.cs b/Content.Client/Construction/ConstructionMenu.xaml.cs index e2da520180..de94eacb65 100644 --- a/Content.Client/Construction/ConstructionMenu.xaml.cs +++ b/Content.Client/Construction/ConstructionMenu.xaml.cs @@ -9,15 +9,14 @@ using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Interactable; using Robust.Client.AutoGenerated; using Robust.Client.Graphics; -using Robust.Client.Interfaces.Placement; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Placement; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; using Robust.Client.Utility; using Robust.Shared.Enums; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/Construction/ConstructionPlacementHijack.cs b/Content.Client/Construction/ConstructionPlacementHijack.cs index 678b1c0c22..bd08e1a7a4 100644 --- a/Content.Client/Construction/ConstructionPlacementHijack.cs +++ b/Content.Client/Construction/ConstructionPlacementHijack.cs @@ -6,7 +6,7 @@ using Content.Shared.Construction; using Robust.Client.Graphics; using Robust.Client.Placement; using Robust.Client.Utility; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.Client.Construction diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs index a9b1309d5c..e60aafae77 100644 --- a/Content.Client/EntryPoint.cs +++ b/Content.Client/EntryPoint.cs @@ -17,7 +17,6 @@ using Content.Client.Graphics.Overlays; using Content.Shared.Actions; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Cargo; -using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.GameObjects.Components.Chemistry.ChemMaster; using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser; using Content.Shared.GameObjects.Components.Gravity; @@ -28,15 +27,12 @@ using Content.Shared.GameObjects.Components.VendingMachines; using Content.Shared.Kitchen; using Content.Shared.Alert; using Robust.Client; -using Robust.Client.Interfaces; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.State; +using Robust.Client.Graphics; +using Robust.Client.Input; using Robust.Client.Player; +using Robust.Client.State; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Prototypes; diff --git a/Content.Client/EscapeMenuOwner.cs b/Content.Client/EscapeMenuOwner.cs index 1f8de2f5b6..856a3902ef 100644 --- a/Content.Client/EscapeMenuOwner.cs +++ b/Content.Client/EscapeMenuOwner.cs @@ -1,12 +1,11 @@ using Content.Client.State; using Content.Client.UserInterface; using Robust.Client.Console; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.State; +using Robust.Client.Input; +using Robust.Client.State; using Robust.Shared.Input; using Robust.Shared.Input.Binding; using Robust.Shared.IoC; -using Robust.Shared.Localization; namespace Content.Client { diff --git a/Content.Client/Eui/BaseEui.cs b/Content.Client/Eui/BaseEui.cs index ee5ad3c974..e3224ae710 100644 --- a/Content.Client/Eui/BaseEui.cs +++ b/Content.Client/Eui/BaseEui.cs @@ -1,7 +1,7 @@ using Content.Shared.Eui; using Content.Shared.Network.NetMessages; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; +using Robust.Shared.Network; #nullable enable diff --git a/Content.Client/Eui/EuiManager.cs b/Content.Client/Eui/EuiManager.cs index 8dffbc9d16..ae7dc24fbb 100644 --- a/Content.Client/Eui/EuiManager.cs +++ b/Content.Client/Eui/EuiManager.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using Content.Shared.Network.NetMessages; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; +using Robust.Shared.Network; +using Robust.Shared.Reflection; #nullable enable diff --git a/Content.Client/GameObjects/Components/Access/IdCardConsoleBoundUserInterface.cs b/Content.Client/GameObjects/Components/Access/IdCardConsoleBoundUserInterface.cs index cb202bd2f2..435c7da488 100644 --- a/Content.Client/GameObjects/Components/Access/IdCardConsoleBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Access/IdCardConsoleBoundUserInterface.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Localization; using Robust.Shared.Prototypes; using static Content.Shared.GameObjects.Components.Access.SharedIdCardConsoleComponent; diff --git a/Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs b/Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs index a257e59b93..6e2e34545a 100644 --- a/Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs +++ b/Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs @@ -3,9 +3,7 @@ using Content.Shared.GameObjects.Components.ActionBlocking; using Content.Shared.Preferences.Appearance; using Robust.Client.GameObjects; using Robust.Client.Graphics; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs b/Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs index 86f0e15700..b0cc06b9aa 100644 --- a/Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs +++ b/Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs @@ -3,16 +3,16 @@ using Content.Client.GameObjects.Components.Mobs; using Content.Client.UserInterface; using Content.Client.UserInterface.Stylesheets; using Content.Shared.GameObjects.Components.Actor; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.GameObjects; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.Utility; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Players; namespace Content.Client.GameObjects.Components.Actor diff --git a/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs b/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs index d96fef4f6c..d00d8cf6b7 100644 --- a/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs +++ b/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs @@ -4,11 +4,10 @@ using Content.Client.GameObjects.Components.Mobs; using Content.Client.UserInterface; using Content.Shared.Input; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.Input; +using Robust.Client.Input; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Client.GameObjects.Components.Actor diff --git a/Content.Client/GameObjects/Components/Actor/ProgressTextureRect.cs b/Content.Client/GameObjects/Components/Actor/ProgressTextureRect.cs index 40f95f717b..42dc00a236 100644 --- a/Content.Client/GameObjects/Components/Actor/ProgressTextureRect.cs +++ b/Content.Client/GameObjects/Components/Actor/ProgressTextureRect.cs @@ -1,6 +1,6 @@ using System; using Content.Client.GameObjects.EntitySystems.DoAfter; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/AnimationsTestComponent.cs b/Content.Client/GameObjects/Components/AnimationsTestComponent.cs index 13cf7280eb..492fec6ad4 100644 --- a/Content.Client/GameObjects/Components/AnimationsTestComponent.cs +++ b/Content.Client/GameObjects/Components/AnimationsTestComponent.cs @@ -1,10 +1,8 @@ using System; using Robust.Client.Animations; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.GameObjects; using Robust.Shared.Animations; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Maths; namespace Content.Client.GameObjects.Components diff --git a/Content.Client/GameObjects/Components/Arcade/BlockGameBoundUserInterface.cs b/Content.Client/GameObjects/Components/Arcade/BlockGameBoundUserInterface.cs index b43a1c763a..1cbf2b1c7e 100644 --- a/Content.Client/GameObjects/Components/Arcade/BlockGameBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Arcade/BlockGameBoundUserInterface.cs @@ -1,10 +1,8 @@ -using System; -using Content.Client.Arcade; +using Content.Client.Arcade; using Content.Shared.Arcade; -using Content.Shared.GameObjects.Components.Arcade; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Arcade { diff --git a/Content.Client/GameObjects/Components/Arcade/SpaceVillainArcadeBoundUserInterface.cs b/Content.Client/GameObjects/Components/Arcade/SpaceVillainArcadeBoundUserInterface.cs index fb317f69e7..48ca2f4f7c 100644 --- a/Content.Client/GameObjects/Components/Arcade/SpaceVillainArcadeBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Arcade/SpaceVillainArcadeBoundUserInterface.cs @@ -1,8 +1,8 @@ using Content.Client.Arcade; using Content.Shared.GameObjects.Components.Arcade; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; namespace Content.Client.GameObjects.Components.Arcade diff --git a/Content.Client/GameObjects/Components/Atmos/FireVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/FireVisualizer.cs index 16348a3422..0b837aad98 100644 --- a/Content.Client/GameObjects/Components/Atmos/FireVisualizer.cs +++ b/Content.Client/GameObjects/Components/Atmos/FireVisualizer.cs @@ -1,9 +1,7 @@ -using System; -using Content.Shared.GameObjects.Components.Atmos; +using Content.Shared.GameObjects.Components.Atmos; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerBoundUserInterface.cs b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerBoundUserInterface.cs index 6745fc610d..3214e07971 100644 --- a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerBoundUserInterface.cs @@ -1,5 +1,5 @@ -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using static Content.Shared.GameObjects.Components.SharedGasAnalyzerComponent; namespace Content.Client.GameObjects.Components.Atmos diff --git a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerMenu.cs b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerMenu.cs index b7f7bbb39e..5afb77f1c7 100644 --- a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerMenu.cs +++ b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerMenu.cs @@ -1,8 +1,8 @@ using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; using Content.Shared.Utility; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Graphics; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; diff --git a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerVisualizer.cs index b569bd160a..dbad8ac1be 100644 --- a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerVisualizer.cs +++ b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerVisualizer.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.Components.Atmos; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Atmos/GasCanisterBoundUserInterface.cs b/Content.Client/GameObjects/Components/Atmos/GasCanisterBoundUserInterface.cs index b4c1a1a436..ac13290e9e 100644 --- a/Content.Client/GameObjects/Components/Atmos/GasCanisterBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Atmos/GasCanisterBoundUserInterface.cs @@ -1,11 +1,8 @@ #nullable enable -using System; -using System.Diagnostics; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; -using Content.Client.GameObjects.Components.Atmos; using Content.Shared.GameObjects.Components.Atmos; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; namespace Content.Client.GameObjects.Components.Atmos diff --git a/Content.Client/GameObjects/Components/Atmos/GasCanisterVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/GasCanisterVisualizer.cs index 45cded0ab0..7d34455ce1 100644 --- a/Content.Client/GameObjects/Components/Atmos/GasCanisterVisualizer.cs +++ b/Content.Client/GameObjects/Components/Atmos/GasCanisterVisualizer.cs @@ -1,10 +1,6 @@ using Content.Shared.GameObjects.Components.Atmos; using Robust.Client.GameObjects; -using Robust.Client.Graphics; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Maths; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Atmos/GasCanisterWindow.cs b/Content.Client/GameObjects/Components/Atmos/GasCanisterWindow.cs index 6e5940fa94..c18ae2de0d 100644 --- a/Content.Client/GameObjects/Components/Atmos/GasCanisterWindow.cs +++ b/Content.Client/GameObjects/Components/Atmos/GasCanisterWindow.cs @@ -1,14 +1,9 @@ -using System; using System.Collections.Generic; using System.Linq; -using Content.Shared.GameObjects.Components.Disposal; -using Robust.Client.Graphics.Drawing; -using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Localization; using Robust.Shared.Maths; -using Content.Client.GameObjects.Components.Atmos; using Content.Shared.GameObjects.Components.Atmos; namespace Content.Client.GameObjects.Components.Atmos diff --git a/Content.Client/GameObjects/Components/Atmos/Piping/GasFilterVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/Piping/GasFilterVisualizer.cs index cc99c6c827..18679ceff1 100644 --- a/Content.Client/GameObjects/Components/Atmos/Piping/GasFilterVisualizer.cs +++ b/Content.Client/GameObjects/Components/Atmos/Piping/GasFilterVisualizer.cs @@ -2,8 +2,7 @@ using Content.Shared.GameObjects.Components.Atmos; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Atmos/Piping/PipeVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/Piping/PipeVisualizer.cs index b0f3de2c2a..2ac90e484d 100644 --- a/Content.Client/GameObjects/Components/Atmos/Piping/PipeVisualizer.cs +++ b/Content.Client/GameObjects/Components/Atmos/Piping/PipeVisualizer.cs @@ -3,15 +3,11 @@ using Content.Shared.GameObjects.Components.Atmos; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Client.Graphics; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; -using Robust.Shared.GameObjects.Components.Renderable; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Atmos diff --git a/Content.Client/GameObjects/Components/Atmos/Piping/PumpVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/Piping/PumpVisualizer.cs index e3ce6d930a..6693626f5b 100644 --- a/Content.Client/GameObjects/Components/Atmos/Piping/PumpVisualizer.cs +++ b/Content.Client/GameObjects/Components/Atmos/Piping/PumpVisualizer.cs @@ -1,8 +1,7 @@ using Content.Shared.GameObjects.Components.Atmos; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Atmos/Piping/SiphonVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/Piping/SiphonVisualizer.cs index 965810bf59..151ddf06ef 100644 --- a/Content.Client/GameObjects/Components/Atmos/Piping/SiphonVisualizer.cs +++ b/Content.Client/GameObjects/Components/Atmos/Piping/SiphonVisualizer.cs @@ -1,9 +1,8 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Content.Shared.GameObjects.Components.Atmos; +using Robust.Shared.GameObjects; using YamlDotNet.RepresentationModel; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; namespace Content.Client.GameObjects.Components.Atmos diff --git a/Content.Client/GameObjects/Components/Atmos/Piping/VentVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/Piping/VentVisualizer.cs index 7a9cc36e10..57323f447d 100644 --- a/Content.Client/GameObjects/Components/Atmos/Piping/VentVisualizer.cs +++ b/Content.Client/GameObjects/Components/Atmos/Piping/VentVisualizer.cs @@ -1,9 +1,8 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Content.Shared.GameObjects.Components.Atmos; +using Robust.Shared.GameObjects; using YamlDotNet.RepresentationModel; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; namespace Content.Client.GameObjects.Components.Atmos diff --git a/Content.Client/GameObjects/Components/Atmos/VaporVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/VaporVisualizer.cs index 1ada0e195d..1341a7b9d4 100644 --- a/Content.Client/GameObjects/Components/Atmos/VaporVisualizer.cs +++ b/Content.Client/GameObjects/Components/Atmos/VaporVisualizer.cs @@ -3,9 +3,6 @@ using Content.Shared.GameObjects.Components; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Animations; using Robust.Shared.Maths; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerBoundUserInterface.cs b/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerBoundUserInterface.cs index 3945e6c9a6..269750561a 100644 --- a/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerBoundUserInterface.cs @@ -1,9 +1,8 @@ using System; using Content.Shared.GameObjects.Components.Body.Scanner; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; namespace Content.Client.GameObjects.Components.Body.Scanner diff --git a/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs b/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs index f4b8cd11ca..823fb8da7b 100644 --- a/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs +++ b/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs @@ -6,7 +6,7 @@ using Content.Shared.GameObjects.Components.Body.Part; using Content.Shared.GameObjects.Components.Damage; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Body/Surgery/SurgeryBoundUserInterface.cs b/Content.Client/GameObjects/Components/Body/Surgery/SurgeryBoundUserInterface.cs index 7ff39ec0f7..44d6162343 100644 --- a/Content.Client/GameObjects/Components/Body/Surgery/SurgeryBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Body/Surgery/SurgeryBoundUserInterface.cs @@ -1,8 +1,8 @@ #nullable enable using Content.Shared.GameObjects.Components.Body.Surgery; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Body.Surgery { diff --git a/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs b/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs index a5a99f6b09..cf0b2da7d7 100644 --- a/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs +++ b/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs @@ -1,8 +1,7 @@ using Content.Shared.GameObjects.Components.Botany; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; namespace Content.Client.GameObjects.Components.Botany diff --git a/Content.Client/GameObjects/Components/Buckle/BuckleComponent.cs b/Content.Client/GameObjects/Components/Buckle/BuckleComponent.cs index 660d5517a8..1426d13ae7 100644 --- a/Content.Client/GameObjects/Components/Buckle/BuckleComponent.cs +++ b/Content.Client/GameObjects/Components/Buckle/BuckleComponent.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.Components.Buckle; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Client.GameObjects.Components.Buckle { diff --git a/Content.Client/GameObjects/Components/Buckle/BuckleVisualizer.cs b/Content.Client/GameObjects/Components/Buckle/BuckleVisualizer.cs index d460843dac..6f10052a65 100644 --- a/Content.Client/GameObjects/Components/Buckle/BuckleVisualizer.cs +++ b/Content.Client/GameObjects/Components/Buckle/BuckleVisualizer.cs @@ -4,8 +4,6 @@ using Content.Shared.GameObjects.Components.Strap; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Animations; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Cargo/CargoConsoleBoundUserInterface.cs b/Content.Client/GameObjects/Components/Cargo/CargoConsoleBoundUserInterface.cs index 280b278b27..14f7295bbf 100644 --- a/Content.Client/GameObjects/Components/Cargo/CargoConsoleBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Cargo/CargoConsoleBoundUserInterface.cs @@ -1,9 +1,9 @@ using Content.Client.UserInterface.Cargo; using Content.Shared.GameObjects.Components.Cargo; using Content.Shared.Prototypes.Cargo; -using Robust.Client.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; using Robust.Client.UserInterface.Controls; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; namespace Content.Client.GameObjects.Components.Cargo diff --git a/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterBoundUserInterface.cs b/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterBoundUserInterface.cs index 1af6a39bb5..c3ef2f0855 100644 --- a/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterBoundUserInterface.cs @@ -1,8 +1,8 @@ #nullable enable using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; using static Content.Shared.GameObjects.Components.Chemistry.ChemMaster.SharedChemMasterComponent; diff --git a/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs b/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs index 2e6fd8d51c..1c283a4aa7 100644 --- a/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs +++ b/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs @@ -3,11 +3,11 @@ using System.Linq; using Content.Client.UserInterface.Stylesheets; using Content.Shared.Chemistry; using Content.Shared.GameObjects.Components.Chemistry.ChemMaster; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Chemistry/FoamVisualizer.cs b/Content.Client/GameObjects/Components/Chemistry/FoamVisualizer.cs index 79fb64a230..47a1ba1825 100644 --- a/Content.Client/GameObjects/Components/Chemistry/FoamVisualizer.cs +++ b/Content.Client/GameObjects/Components/Chemistry/FoamVisualizer.cs @@ -4,8 +4,6 @@ using Content.Shared.GameObjects.Components.Chemistry; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Maths; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs index e6675df4c4..1131010509 100644 --- a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs @@ -2,9 +2,9 @@ using System.Linq; using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; using Robust.Client.UserInterface.Controls; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; using static Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser.SharedReagentDispenserComponent; diff --git a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs index 699df5e956..8f8c35c5d6 100644 --- a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs +++ b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs @@ -2,11 +2,11 @@ using Content.Client.UserInterface.Stylesheets; using Content.Shared.Chemistry; using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Chemistry/SmokeVisualizer.cs b/Content.Client/GameObjects/Components/Chemistry/SmokeVisualizer.cs index 91f68b6f71..c6b45de4e0 100644 --- a/Content.Client/GameObjects/Components/Chemistry/SmokeVisualizer.cs +++ b/Content.Client/GameObjects/Components/Chemistry/SmokeVisualizer.cs @@ -2,7 +2,6 @@ using Content.Shared.GameObjects.Components.Chemistry; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Maths; namespace Content.Client.GameObjects.Components.Chemistry diff --git a/Content.Client/GameObjects/Components/ClickableComponent.cs b/Content.Client/GameObjects/Components/ClickableComponent.cs index 8a3c3b6adf..33ea2e3fd5 100644 --- a/Content.Client/GameObjects/Components/ClickableComponent.cs +++ b/Content.Client/GameObjects/Components/ClickableComponent.cs @@ -1,9 +1,8 @@ #nullable enable using System; -using Robust.Client.Graphics.ClientEye; -using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Client/GameObjects/Components/ClientEntitySpawnerComponent.cs b/Content.Client/GameObjects/Components/ClientEntitySpawnerComponent.cs index 3ba2796272..0bf9d0ea6f 100644 --- a/Content.Client/GameObjects/Components/ClientEntitySpawnerComponent.cs +++ b/Content.Client/GameObjects/Components/ClientEntitySpawnerComponent.cs @@ -1,6 +1,5 @@ #nullable enable using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using System.Collections.Generic; diff --git a/Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs b/Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs index 87565de6a2..6efcbf6936 100644 --- a/Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent; namespace Content.Client.GameObjects.Components.CloningPod diff --git a/Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs b/Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs index 2c7dfd1484..4db0cc6836 100644 --- a/Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs +++ b/Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs @@ -1,7 +1,6 @@ using System; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent; using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent.CloningPodStatus; diff --git a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs index 62e0b5abca..306bb56e79 100644 --- a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs +++ b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs @@ -7,7 +7,6 @@ using Content.Shared.GameObjects.Components.Items; using Robust.Client.Graphics; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Client/GameObjects/Components/Command/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/GameObjects/Components/Command/CommunicationsConsoleBoundUserInterface.cs index 0d4f0afc1f..09aba9276c 100644 --- a/Content.Client/GameObjects/Components/Command/CommunicationsConsoleBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Command/CommunicationsConsoleBoundUserInterface.cs @@ -1,10 +1,10 @@ using System; using Content.Client.Command; using Content.Shared.GameObjects.Components.Command; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.Interfaces.Timing; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Client.GameObjects.Components.Command diff --git a/Content.Client/GameObjects/Components/ComputerVisualizer.cs b/Content.Client/GameObjects/Components/ComputerVisualizer.cs index b0833f9252..e1f48d51a5 100644 --- a/Content.Client/GameObjects/Components/ComputerVisualizer.cs +++ b/Content.Client/GameObjects/Components/ComputerVisualizer.cs @@ -1,8 +1,7 @@ using Content.Shared.GameObjects.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Configuration/ConfigurationBoundUserInterface.cs b/Content.Client/GameObjects/Components/Configuration/ConfigurationBoundUserInterface.cs index 97bcdf20b6..d5c15f6c36 100644 --- a/Content.Client/GameObjects/Components/Configuration/ConfigurationBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Configuration/ConfigurationBoundUserInterface.cs @@ -1,7 +1,7 @@ -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text.RegularExpressions; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using static Content.Shared.GameObjects.Components.SharedConfigurationComponent; namespace Content.Client.GameObjects.Components.Wires diff --git a/Content.Client/GameObjects/Components/Construction/MachineFrameVisualizer.cs b/Content.Client/GameObjects/Components/Construction/MachineFrameVisualizer.cs index 141d679ebf..ca78c9d66f 100644 --- a/Content.Client/GameObjects/Components/Construction/MachineFrameVisualizer.cs +++ b/Content.Client/GameObjects/Components/Construction/MachineFrameVisualizer.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.Components.Construction; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; namespace Content.Client.GameObjects.Components.Construction { diff --git a/Content.Client/GameObjects/Components/Conveyor/ConveyorVisualizer.cs b/Content.Client/GameObjects/Components/Conveyor/ConveyorVisualizer.cs index 8dbbca9ed4..84cac3b021 100644 --- a/Content.Client/GameObjects/Components/Conveyor/ConveyorVisualizer.cs +++ b/Content.Client/GameObjects/Components/Conveyor/ConveyorVisualizer.cs @@ -2,9 +2,7 @@ using Content.Shared.GameObjects.Components.Conveyor; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Conveyor/TwoWayLeverVisualizer.cs b/Content.Client/GameObjects/Components/Conveyor/TwoWayLeverVisualizer.cs index 0ed1ec4f72..c4880a4e44 100644 --- a/Content.Client/GameObjects/Components/Conveyor/TwoWayLeverVisualizer.cs +++ b/Content.Client/GameObjects/Components/Conveyor/TwoWayLeverVisualizer.cs @@ -1,11 +1,7 @@ -using System; -using Content.Shared.GameObjects.Components.Conveyor; -using Content.Shared.GameObjects.Components.MachineLinking; +using Content.Shared.GameObjects.Components.MachineLinking; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Crayon/CrayonBoundUserInterface.cs b/Content.Client/GameObjects/Components/Crayon/CrayonBoundUserInterface.cs index 0a31204903..131d556752 100644 --- a/Content.Client/GameObjects/Components/Crayon/CrayonBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Crayon/CrayonBoundUserInterface.cs @@ -1,9 +1,9 @@ using Content.Shared.GameObjects.Components; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using System.Linq; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Crayon { diff --git a/Content.Client/GameObjects/Components/Crayon/CrayonDecalVisualizer.cs b/Content.Client/GameObjects/Components/Crayon/CrayonDecalVisualizer.cs index df2f2b49dd..ae48115e74 100644 --- a/Content.Client/GameObjects/Components/Crayon/CrayonDecalVisualizer.cs +++ b/Content.Client/GameObjects/Components/Crayon/CrayonDecalVisualizer.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Maths; namespace Content.Client.GameObjects.Components.Crayon diff --git a/Content.Client/GameObjects/Components/Crayon/CrayonWindow.cs b/Content.Client/GameObjects/Components/Crayon/CrayonWindow.cs index 598c939cc7..347c93cd3e 100644 --- a/Content.Client/GameObjects/Components/Crayon/CrayonWindow.cs +++ b/Content.Client/GameObjects/Components/Crayon/CrayonWindow.cs @@ -1,7 +1,6 @@ using Content.Client.UserInterface.Stylesheets; using Content.Shared.GameObjects.Components; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.Utility; diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitBoundUserInterface.cs b/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitBoundUserInterface.cs index 398e523d29..b93fa1f5b5 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitBoundUserInterface.cs @@ -1,8 +1,8 @@ #nullable enable using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; using Robust.Client.UserInterface.Controls; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalMailingUnitComponent; namespace Content.Client.GameObjects.Components.Disposal diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitWindow.cs b/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitWindow.cs index 1849a33722..41b528ad10 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitWindow.cs +++ b/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitWindow.cs @@ -1,11 +1,11 @@ using Content.Shared.GameObjects.Components.Disposal; -using Robust.Client.Graphics.Drawing; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Localization; using Robust.Shared.Maths; using System.Collections.Generic; +using Robust.Client.Graphics; using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalMailingUnitComponent; namespace Content.Client.GameObjects.Components.Disposal diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalRouterBoundUserInterface.cs b/Content.Client/GameObjects/Components/Disposal/DisposalRouterBoundUserInterface.cs index 6e462bb0a6..0e53a88ba5 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalRouterBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Disposal/DisposalRouterBoundUserInterface.cs @@ -1,7 +1,7 @@ #nullable enable using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalRouterComponent; namespace Content.Client.GameObjects.Components.Disposal diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalTaggerBoundUserInterface.cs b/Content.Client/GameObjects/Components/Disposal/DisposalTaggerBoundUserInterface.cs index b2aec5b8a5..174957f16f 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalTaggerBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Disposal/DisposalTaggerBoundUserInterface.cs @@ -1,7 +1,7 @@ #nullable enable using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalTaggerComponent; namespace Content.Client.GameObjects.Components.Disposal diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs b/Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs index 9f47302503..bd18504c77 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs @@ -1,7 +1,7 @@ #nullable enable using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalUnitComponent; namespace Content.Client.GameObjects.Components.Disposal diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs b/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs index f4132a174a..9a82dd94c6 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs +++ b/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs @@ -2,10 +2,7 @@ using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalUnitComponent; diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs b/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs index 98bf7af37c..ca2c97edc3 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs +++ b/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs @@ -1,5 +1,5 @@ using Content.Shared.GameObjects.Components.Disposal; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalVisualizer.cs b/Content.Client/GameObjects/Components/Disposal/DisposalVisualizer.cs index fae26efa81..a4c691a5c2 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalVisualizer.cs +++ b/Content.Client/GameObjects/Components/Disposal/DisposalVisualizer.cs @@ -2,9 +2,7 @@ using Content.Shared.GameObjects.Components.Disposal; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/DoAfterComponent.cs b/Content.Client/GameObjects/Components/DoAfterComponent.cs index bb02da949d..14a15cf249 100644 --- a/Content.Client/GameObjects/Components/DoAfterComponent.cs +++ b/Content.Client/GameObjects/Components/DoAfterComponent.cs @@ -4,10 +4,10 @@ using System.Collections.Generic; using Content.Client.GameObjects.EntitySystems.DoAfter; using Content.Shared.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; +using Robust.Shared.Network; using Robust.Shared.Players; +using Robust.Shared.Timing; namespace Content.Client.GameObjects.Components { diff --git a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs index 4cdc6cff2c..65450c9e68 100644 --- a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs +++ b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs @@ -5,9 +5,7 @@ using Content.Shared.GameObjects.Components.Doors; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/EmergencyLightComponent.cs b/Content.Client/GameObjects/Components/EmergencyLightComponent.cs index 3d893332f1..3fbf846264 100644 --- a/Content.Client/GameObjects/Components/EmergencyLightComponent.cs +++ b/Content.Client/GameObjects/Components/EmergencyLightComponent.cs @@ -1,7 +1,6 @@ using System; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; using Robust.Shared.Animations; using Robust.Shared.GameObjects; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Explosion/ClusterFlashVisualizer.cs b/Content.Client/GameObjects/Components/Explosion/ClusterFlashVisualizer.cs index b366a11fd8..74112131a6 100644 --- a/Content.Client/GameObjects/Components/Explosion/ClusterFlashVisualizer.cs +++ b/Content.Client/GameObjects/Components/Explosion/ClusterFlashVisualizer.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.Components.Explosion; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/ExtinguisherCabinetVisualizer.cs b/Content.Client/GameObjects/Components/ExtinguisherCabinetVisualizer.cs index 04ceda7aac..a805fa0d60 100644 --- a/Content.Client/GameObjects/Components/ExtinguisherCabinetVisualizer.cs +++ b/Content.Client/GameObjects/Components/ExtinguisherCabinetVisualizer.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; namespace Content.Client.GameObjects.Components { diff --git a/Content.Client/GameObjects/Components/FlashLightVisualizer.cs b/Content.Client/GameObjects/Components/FlashLightVisualizer.cs index 74d1dc3a41..fe83d50377 100644 --- a/Content.Client/GameObjects/Components/FlashLightVisualizer.cs +++ b/Content.Client/GameObjects/Components/FlashLightVisualizer.cs @@ -3,7 +3,6 @@ using Content.Shared.GameObjects.Components; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; using Robust.Shared.Animations; using Robust.Shared.GameObjects; diff --git a/Content.Client/GameObjects/Components/Fluids/SprayVisualizer.cs b/Content.Client/GameObjects/Components/Fluids/SprayVisualizer.cs index 205f7bc761..fcea1c5257 100644 --- a/Content.Client/GameObjects/Components/Fluids/SprayVisualizer.cs +++ b/Content.Client/GameObjects/Components/Fluids/SprayVisualizer.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.Components.Fluids; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs b/Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs index 0ed0ad0a68..e921ae792d 100644 --- a/Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs @@ -1,8 +1,8 @@ using Content.Shared.GameObjects.Components.Gravity; -using Robust.Client.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Gravity/GravityGeneratorVisualizer.cs b/Content.Client/GameObjects/Components/Gravity/GravityGeneratorVisualizer.cs index 0c23b57f05..1b3f277f4b 100644 --- a/Content.Client/GameObjects/Components/Gravity/GravityGeneratorVisualizer.cs +++ b/Content.Client/GameObjects/Components/Gravity/GravityGeneratorVisualizer.cs @@ -1,11 +1,11 @@ #nullable enable using Content.Shared.GameObjects.Components.Gravity; using Robust.Client.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Utility; using System; using System.Collections.Generic; using JetBrains.Annotations; +using Robust.Shared.GameObjects; using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Gravity diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs index a7ac7c22ad..d7c4076a89 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs @@ -7,9 +7,7 @@ using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.Preferences.Appearance; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs b/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs index ecacae0d2b..991abd84ed 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs @@ -3,11 +3,11 @@ using System.Linq; using Content.Client.UserInterface; using Content.Client.Utility; using JetBrains.Annotations; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs b/Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs index 789d303c30..cecafb262d 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs @@ -5,8 +5,8 @@ using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.Input; using Robust.Client.UserInterface; using Robust.Client.UserInterface.CustomControls; +using Robust.Shared.GameObjects; using Robust.Shared.Input; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Client.GameObjects.Components.HUD.Inventory diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs b/Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs index e71f50336f..e6f3987c33 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs @@ -1,11 +1,9 @@ using System.Collections.Generic; using Content.Client.UserInterface; using Content.Shared.GameObjects.Components.GUI; -using Content.Shared.GameObjects.Components.Inventory; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Localization; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.Client/GameObjects/Components/HandheldLightComponent.cs b/Content.Client/GameObjects/Components/HandheldLightComponent.cs index 8f52d23fae..6566984e07 100644 --- a/Content.Client/GameObjects/Components/HandheldLightComponent.cs +++ b/Content.Client/GameObjects/Components/HandheldLightComponent.cs @@ -1,7 +1,5 @@ -using System; -using Content.Shared.GameObjects.Components; -using Content.Shared.Utility; -using Robust.Client.Graphics.Drawing; +using Content.Shared.GameObjects.Components; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; diff --git a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs index 087cb504db..5f8b165169 100644 --- a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs +++ b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs @@ -2,10 +2,8 @@ using System.Collections.Generic; using Content.Client.GameObjects.EntitySystems; using JetBrains.Annotations; -using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Client/GameObjects/Components/Instruments/InstrumentBoundUserInterface.cs b/Content.Client/GameObjects/Components/Instruments/InstrumentBoundUserInterface.cs index bf5ab69d58..7eb3ef5c00 100644 --- a/Content.Client/GameObjects/Components/Instruments/InstrumentBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Instruments/InstrumentBoundUserInterface.cs @@ -1,5 +1,5 @@ using Content.Client.Instruments; -using Robust.Client.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; using Robust.Shared.ViewVariables; namespace Content.Client.GameObjects.Components.Instruments diff --git a/Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs b/Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs index e24e60cf4e..003518394b 100644 --- a/Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs +++ b/Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs @@ -8,13 +8,11 @@ using Content.Shared.Physics; using Robust.Client.Audio.Midi; using Robust.Shared.Audio.Midi; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; +using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Client.GameObjects.Components.Instruments diff --git a/Content.Client/GameObjects/Components/InteractionOutlineComponent.cs b/Content.Client/GameObjects/Components/InteractionOutlineComponent.cs index b04aa0afb9..8a4463dd55 100644 --- a/Content.Client/GameObjects/Components/InteractionOutlineComponent.cs +++ b/Content.Client/GameObjects/Components/InteractionOutlineComponent.cs @@ -1,5 +1,5 @@ -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Client/GameObjects/Components/Items/HandsComponent.cs b/Content.Client/GameObjects/Components/Items/HandsComponent.cs index a59f0333f9..546f5170c0 100644 --- a/Content.Client/GameObjects/Components/Items/HandsComponent.cs +++ b/Content.Client/GameObjects/Components/Items/HandsComponent.cs @@ -1,22 +1,14 @@ #nullable enable -using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Client.Animations; using Content.Client.UserInterface; using Content.Shared.GameObjects.Components.Items; -using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Animations; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; -using Robust.Shared.Log; +using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.ViewVariables; diff --git a/Content.Client/GameObjects/Components/Items/ItemComponent.cs b/Content.Client/GameObjects/Components/Items/ItemComponent.cs index a759f4b589..84479cc19a 100644 --- a/Content.Client/GameObjects/Components/Items/ItemComponent.cs +++ b/Content.Client/GameObjects/Components/Items/ItemComponent.cs @@ -3,12 +3,9 @@ using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Items; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Renderable; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs b/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs index 183ae124fa..6df5a5d77d 100644 --- a/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs @@ -4,15 +4,11 @@ using Content.Shared.Chemistry; using Content.Shared.Kitchen; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs b/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs index 409f890733..92a30d8795 100644 --- a/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs +++ b/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs @@ -5,7 +5,6 @@ using Content.Shared.GameObjects.Components.Sound; using Content.Shared.Kitchen; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Audio; using Robust.Shared.Log; diff --git a/Content.Client/GameObjects/Components/Kitchen/ReagentGrinderBoundUserInterface.cs b/Content.Client/GameObjects/Components/Kitchen/ReagentGrinderBoundUserInterface.cs index d52359a31e..f59bc077fc 100644 --- a/Content.Client/GameObjects/Components/Kitchen/ReagentGrinderBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Kitchen/ReagentGrinderBoundUserInterface.cs @@ -1,16 +1,13 @@ using System.Collections.Generic; -using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Localization; using Robust.Shared.Maths; using Content.Shared.Kitchen; using Robust.Shared.GameObjects; using Content.Shared.Chemistry; using Robust.Shared.IoC; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Prototypes; using Robust.Client.GameObjects; diff --git a/Content.Client/GameObjects/Components/Kitchen/ReagentGrinderVisualizer.cs b/Content.Client/GameObjects/Components/Kitchen/ReagentGrinderVisualizer.cs index aed64cad27..a41d74f18b 100644 --- a/Content.Client/GameObjects/Components/Kitchen/ReagentGrinderVisualizer.cs +++ b/Content.Client/GameObjects/Components/Kitchen/ReagentGrinderVisualizer.cs @@ -1,5 +1,4 @@ using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using static Content.Shared.Kitchen.SharedReagentGrinderComponent; namespace Content.Client.GameObjects.Components.Kitchen diff --git a/Content.Client/GameObjects/Components/LanternVisualizer.cs b/Content.Client/GameObjects/Components/LanternVisualizer.cs index 7b0fde650f..42d2b65642 100644 --- a/Content.Client/GameObjects/Components/LanternVisualizer.cs +++ b/Content.Client/GameObjects/Components/LanternVisualizer.cs @@ -2,7 +2,6 @@ using System; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; using Robust.Shared.Animations; using Robust.Shared.GameObjects; diff --git a/Content.Client/GameObjects/Components/LightBehaviourComponent.cs b/Content.Client/GameObjects/Components/LightBehaviourComponent.cs index 8ba96da12b..deaad269ed 100644 --- a/Content.Client/GameObjects/Components/LightBehaviourComponent.cs +++ b/Content.Client/GameObjects/Components/LightBehaviourComponent.cs @@ -5,14 +5,12 @@ using Content.Shared.GameObjects.Components; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; using Robust.Shared.Animations; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; +using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Client/GameObjects/Components/LowWallComponent.cs b/Content.Client/GameObjects/Components/LowWallComponent.cs index 9f3a7d00ad..7a292c7a49 100644 --- a/Content.Client/GameObjects/Components/LowWallComponent.cs +++ b/Content.Client/GameObjects/Components/LowWallComponent.cs @@ -2,9 +2,8 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Contracts; using Content.Client.GameObjects.Components.IconSmoothing; -using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Maths; using Robust.Shared.ViewVariables; using static Robust.Client.GameObjects.SpriteComponent; diff --git a/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs b/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs index 440b9f1d2d..486845334b 100644 --- a/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs @@ -3,13 +3,12 @@ using System.Linq; using Content.Client.UserInterface.Stylesheets; using Content.Shared.Preferences.Appearance; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.GameObjects.Components.Renderable; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Maths; using static Content.Shared.GameObjects.Components.SharedMagicMirrorComponent; diff --git a/Content.Client/GameObjects/Components/Markers/MarkerComponent.cs b/Content.Client/GameObjects/Components/Markers/MarkerComponent.cs index 7b97d6f367..e9849aca4d 100644 --- a/Content.Client/GameObjects/Components/Markers/MarkerComponent.cs +++ b/Content.Client/GameObjects/Components/Markers/MarkerComponent.cs @@ -1,7 +1,6 @@ using Content.Client.GameObjects.EntitySystems; -using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; namespace Content.Client.GameObjects.Components.Markers { diff --git a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerBoundUserInterface.cs b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerBoundUserInterface.cs index ec666d4b17..7f33d106a9 100644 --- a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerBoundUserInterface.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using static Content.Shared.GameObjects.Components.Medical.SharedMedicalScannerComponent; namespace Content.Client.GameObjects.Components.MedicalScanner diff --git a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs index 2f3bf92fda..8291858ac0 100644 --- a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs +++ b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs @@ -1,7 +1,6 @@ using System; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using static Content.Shared.GameObjects.Components.Medical.SharedMedicalScannerComponent; using static Content.Shared.GameObjects.Components.Medical.SharedMedicalScannerComponent.MedicalScannerStatus; diff --git a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs index 59edf052f3..853d00b43b 100644 --- a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs +++ b/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs @@ -2,7 +2,7 @@ using System.Text; using Content.Shared.Damage; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs b/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs index 009f0c98bc..59864826c6 100644 --- a/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs +++ b/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs @@ -3,10 +3,9 @@ using System; using Content.Shared.GameObjects.Components.Mobs; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Log; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Players; namespace Content.Client.GameObjects.Components.Mobs diff --git a/Content.Client/GameObjects/Components/Mobs/ClientActionsComponent.cs b/Content.Client/GameObjects/Components/Mobs/ClientActionsComponent.cs index 0ccaf31299..d76b101988 100644 --- a/Content.Client/GameObjects/Components/Mobs/ClientActionsComponent.cs +++ b/Content.Client/GameObjects/Components/Mobs/ClientActionsComponent.cs @@ -8,14 +8,10 @@ using Content.Client.UserInterface.Controls; using Content.Shared.Actions; using Content.Shared.GameObjects.Components.Mobs; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.EntitySystems; -using Robust.Client.Interfaces.UserInterface; using Robust.Client.Player; +using Robust.Client.UserInterface; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.ViewVariables; diff --git a/Content.Client/GameObjects/Components/Mobs/ClientAlertsComponent.cs b/Content.Client/GameObjects/Components/Mobs/ClientAlertsComponent.cs index 603c5a5396..ca35988130 100644 --- a/Content.Client/GameObjects/Components/Mobs/ClientAlertsComponent.cs +++ b/Content.Client/GameObjects/Components/Mobs/ClientAlertsComponent.cs @@ -5,13 +5,11 @@ using Content.Client.UserInterface.Controls; using Content.Shared.Alert; using Content.Shared.GameObjects.Components.Mobs; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.Interfaces.UserInterface; using Robust.Client.Player; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; using Robust.Shared.Input; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Prototypes; diff --git a/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs b/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs index 1612c10960..f24a42878d 100644 --- a/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs +++ b/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs @@ -3,7 +3,6 @@ using Content.Shared.GameObjects.Components.Mobs; using Robust.Client.GameObjects; using Robust.Client.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Client.GameObjects.Components.Mobs diff --git a/Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs b/Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs index 586f28ac85..edf95601b4 100644 --- a/Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs +++ b/Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs @@ -1,10 +1,8 @@ using System.Collections.Generic; using Content.Shared.GameObjects; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Mobs/MeleeLungeComponent.cs b/Content.Client/GameObjects/Components/Mobs/MeleeLungeComponent.cs index 88fe6e7eb2..ded0d2509d 100644 --- a/Content.Client/GameObjects/Components/Mobs/MeleeLungeComponent.cs +++ b/Content.Client/GameObjects/Components/Mobs/MeleeLungeComponent.cs @@ -1,5 +1,4 @@ using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Mobs/State/DeadMobState.cs b/Content.Client/GameObjects/Components/Mobs/State/DeadMobState.cs index f3345be4c2..46745575a5 100644 --- a/Content.Client/GameObjects/Components/Mobs/State/DeadMobState.cs +++ b/Content.Client/GameObjects/Components/Mobs/State/DeadMobState.cs @@ -2,9 +2,7 @@ using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs.State; using Robust.Client.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Mobs.State { diff --git a/Content.Client/GameObjects/Components/Mobs/State/NormalMobState.cs b/Content.Client/GameObjects/Components/Mobs/State/NormalMobState.cs index d4cb18b30a..56e2fe7626 100644 --- a/Content.Client/GameObjects/Components/Mobs/State/NormalMobState.cs +++ b/Content.Client/GameObjects/Components/Mobs/State/NormalMobState.cs @@ -1,7 +1,7 @@ using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs.State; using Robust.Client.GameObjects; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Mobs.State { diff --git a/Content.Client/GameObjects/Components/Mobs/StunnableComponent.cs b/Content.Client/GameObjects/Components/Mobs/StunnableComponent.cs index 11d38ccd70..8ad4ee5451 100644 --- a/Content.Client/GameObjects/Components/Mobs/StunnableComponent.cs +++ b/Content.Client/GameObjects/Components/Mobs/StunnableComponent.cs @@ -1,10 +1,7 @@ #nullable enable -using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Movement; -using Robust.Client.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; namespace Content.Client.GameObjects.Components.Mobs { diff --git a/Content.Client/GameObjects/Components/Morgue/BodyBagVisualizer.cs b/Content.Client/GameObjects/Components/Morgue/BodyBagVisualizer.cs index f13aa2aa02..dd449e06c4 100644 --- a/Content.Client/GameObjects/Components/Morgue/BodyBagVisualizer.cs +++ b/Content.Client/GameObjects/Components/Morgue/BodyBagVisualizer.cs @@ -2,7 +2,6 @@ using Content.Shared.GameObjects.Components.Morgue; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; namespace Content.Client.GameObjects.Components.Morgue { diff --git a/Content.Client/GameObjects/Components/Morgue/CrematoriumVisualizer.cs b/Content.Client/GameObjects/Components/Morgue/CrematoriumVisualizer.cs index f894558982..c0d364e0fb 100644 --- a/Content.Client/GameObjects/Components/Morgue/CrematoriumVisualizer.cs +++ b/Content.Client/GameObjects/Components/Morgue/CrematoriumVisualizer.cs @@ -2,7 +2,6 @@ using Content.Shared.GameObjects.Components.Morgue; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Morgue/MorgueVisualizer.cs b/Content.Client/GameObjects/Components/Morgue/MorgueVisualizer.cs index 5d29d243ee..ad66bd65e1 100644 --- a/Content.Client/GameObjects/Components/Morgue/MorgueVisualizer.cs +++ b/Content.Client/GameObjects/Components/Morgue/MorgueVisualizer.cs @@ -1,7 +1,6 @@ #nullable enable using Content.Shared.GameObjects.Components.Morgue; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Movement/ClimbableComponent.cs b/Content.Client/GameObjects/Components/Movement/ClimbableComponent.cs index 311da1407e..9b00b30bae 100644 --- a/Content.Client/GameObjects/Components/Movement/ClimbableComponent.cs +++ b/Content.Client/GameObjects/Components/Movement/ClimbableComponent.cs @@ -2,7 +2,6 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Client.GameObjects.Components.Movement { diff --git a/Content.Client/GameObjects/Components/Movement/HandTeleporterVisualizer.cs b/Content.Client/GameObjects/Components/Movement/HandTeleporterVisualizer.cs index 1be4f0ac86..7229620921 100644 --- a/Content.Client/GameObjects/Components/Movement/HandTeleporterVisualizer.cs +++ b/Content.Client/GameObjects/Components/Movement/HandTeleporterVisualizer.cs @@ -1,9 +1,7 @@ using System; -using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Portal; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; namespace Content.Client.GameObjects.Components.Movement { diff --git a/Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs b/Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs index 37894446aa..eec1bfe51f 100644 --- a/Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs +++ b/Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs @@ -1,9 +1,7 @@ -using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Portal; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Movement { diff --git a/Content.Client/GameObjects/Components/Nutrition/BurnStateVisualizer.cs b/Content.Client/GameObjects/Components/Nutrition/BurnStateVisualizer.cs index d70adb82d6..fa823240a2 100644 --- a/Content.Client/GameObjects/Components/Nutrition/BurnStateVisualizer.cs +++ b/Content.Client/GameObjects/Components/Nutrition/BurnStateVisualizer.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Nutrition/CreamPiedVisualizer.cs b/Content.Client/GameObjects/Components/Nutrition/CreamPiedVisualizer.cs index 7b91020906..465d5d76f6 100644 --- a/Content.Client/GameObjects/Components/Nutrition/CreamPiedVisualizer.cs +++ b/Content.Client/GameObjects/Components/Nutrition/CreamPiedVisualizer.cs @@ -1,8 +1,7 @@ using Content.Shared.GameObjects.Components.Nutrition; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodContainerVisualizer2D.cs b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodContainerVisualizer2D.cs index 2e84fc415e..919a50bc63 100644 --- a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodContainerVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodContainerVisualizer2D.cs @@ -4,7 +4,6 @@ using Content.Shared.GameObjects.Components.Nutrition; using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs index 11a68a39db..f2fe48aba7 100644 --- a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs +++ b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs @@ -2,7 +2,6 @@ using Content.Shared.GameObjects.Components.Nutrition; using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Observer/AcceptCloningEui.cs b/Content.Client/GameObjects/Components/Observer/AcceptCloningEui.cs index f274871f46..a566abda0e 100644 --- a/Content.Client/GameObjects/Components/Observer/AcceptCloningEui.cs +++ b/Content.Client/GameObjects/Components/Observer/AcceptCloningEui.cs @@ -1,5 +1,4 @@ using Content.Client.Eui; -using Content.Shared.GameObjects.Components.Medical; using Content.Shared.GameObjects.Components.Observer; using JetBrains.Annotations; diff --git a/Content.Client/GameObjects/Components/Observer/GhostComponent.cs b/Content.Client/GameObjects/Components/Observer/GhostComponent.cs index b42f8439e0..75ffbf78ca 100644 --- a/Content.Client/GameObjects/Components/Observer/GhostComponent.cs +++ b/Content.Client/GameObjects/Components/Observer/GhostComponent.cs @@ -5,9 +5,8 @@ using Content.Shared.GameObjects.Components.Observer; using Robust.Client.GameObjects; using Robust.Client.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; +using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.ViewVariables; diff --git a/Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs b/Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs index 6a43ddd244..6f3ad685b6 100644 --- a/Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs @@ -3,13 +3,12 @@ using Content.Client.GameObjects.EntitySystems; using Content.Client.Utility; using Content.Shared.GameObjects.Components.PDA; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/PDA/PDAComponent.cs b/Content.Client/GameObjects/Components/PDA/PDAComponent.cs index fc134497d6..799c323a01 100644 --- a/Content.Client/GameObjects/Components/PDA/PDAComponent.cs +++ b/Content.Client/GameObjects/Components/PDA/PDAComponent.cs @@ -1,9 +1,8 @@ using Content.Shared.GameObjects.Components.PDA; -using Robust.Client.GameObjects.EntitySystems; +using Robust.Client.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Network; using Robust.Shared.Players; namespace Content.Client.GameObjects.Components.PDA diff --git a/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs b/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs index 48c80de34b..c52b62359a 100644 --- a/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs +++ b/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs @@ -1,8 +1,7 @@ using Content.Shared.GameObjects.Components.PDA; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Paper/PaperBoundUserInterface.cs b/Content.Client/GameObjects/Components/Paper/PaperBoundUserInterface.cs index 3dc4b2fbac..88d8a23e69 100644 --- a/Content.Client/GameObjects/Components/Paper/PaperBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Paper/PaperBoundUserInterface.cs @@ -1,8 +1,8 @@ using Content.Shared.GameObjects.Components; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; using Robust.Client.UserInterface.Controls; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Paper { diff --git a/Content.Client/GameObjects/Components/ParticleAcceleratorPartVisualizer.cs b/Content.Client/GameObjects/Components/ParticleAcceleratorPartVisualizer.cs index 9a8adf613e..19e974cc1d 100644 --- a/Content.Client/GameObjects/Components/ParticleAcceleratorPartVisualizer.cs +++ b/Content.Client/GameObjects/Components/ParticleAcceleratorPartVisualizer.cs @@ -3,9 +3,7 @@ using System.Linq; using Content.Shared.GameObjects.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Pointing/RoguePointingArrowVisualizer.cs b/Content.Client/GameObjects/Components/Pointing/RoguePointingArrowVisualizer.cs index 325147b76a..4e5be3ac4d 100644 --- a/Content.Client/GameObjects/Components/Pointing/RoguePointingArrowVisualizer.cs +++ b/Content.Client/GameObjects/Components/Pointing/RoguePointingArrowVisualizer.cs @@ -3,8 +3,6 @@ using Content.Shared.GameObjects.Components.Pointing; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Animations; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEControllerBoundUserInterface.cs b/Content.Client/GameObjects/Components/Power/AME/AMEControllerBoundUserInterface.cs index 260403b063..20ca74fe12 100644 --- a/Content.Client/GameObjects/Components/Power/AME/AMEControllerBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Power/AME/AMEControllerBoundUserInterface.cs @@ -1,7 +1,7 @@ using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEControllerComponent; namespace Content.Client.GameObjects.Components.Power.AME diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs b/Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs index 26d08b8ab4..cda56f1084 100644 --- a/Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs +++ b/Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs @@ -1,7 +1,6 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEControllerComponent; namespace Content.Client.GameObjects.Components.Power.AME diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs b/Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs index 002f0440ce..59b0cb0c28 100644 --- a/Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs +++ b/Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs @@ -1,7 +1,6 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEShieldComponent; namespace Content.Client.GameObjects.Components.Power.AME diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs b/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs index c042953269..6c2bc44fbb 100644 --- a/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs +++ b/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs @@ -2,7 +2,7 @@ using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEControllerComponent; diff --git a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs index fa779e163f..9a4fe31049 100644 --- a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs @@ -2,11 +2,11 @@ using Content.Client.UserInterface.Stylesheets; using Content.Shared.GameObjects.Components.Power; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Client.Graphics.Drawing; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; namespace Content.Client.GameObjects.Components.Power diff --git a/Content.Client/GameObjects/Components/Power/ApcVisualizer.cs b/Content.Client/GameObjects/Components/Power/ApcVisualizer.cs index b6d3de1be5..ce5144a611 100644 --- a/Content.Client/GameObjects/Components/Power/ApcVisualizer.cs +++ b/Content.Client/GameObjects/Components/Power/ApcVisualizer.cs @@ -1,8 +1,7 @@ using Content.Shared.GameObjects.Components.Power; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Power { diff --git a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs index edb4f3c1c1..4349faff80 100644 --- a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs +++ b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs @@ -3,9 +3,7 @@ using Content.Shared.GameObjects.Components.Power; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Power diff --git a/Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs b/Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs index 69649b6952..bfc856bdbb 100644 --- a/Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs +++ b/Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs @@ -1,9 +1,7 @@ using Content.Shared.GameObjects.Components.Power; -using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs b/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs index 8f7813be7a..8a3fe972dc 100644 --- a/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs +++ b/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs @@ -1,8 +1,7 @@ using Content.Shared.GameObjects.Components.Power; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Power { diff --git a/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs b/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs index 5235d2a8d4..99d3dcaab0 100644 --- a/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs +++ b/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.Components.Power; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; namespace Content.Client.GameObjects.Components.Power { diff --git a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs index 46b55dfade..1f0077ae68 100644 --- a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs +++ b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs @@ -3,9 +3,7 @@ using Content.Shared.GameObjects.Components.Power; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components.Power diff --git a/Content.Client/GameObjects/Components/Power/SmesVisualizer.cs b/Content.Client/GameObjects/Components/Power/SmesVisualizer.cs index 0dde132dfc..85d30e3d15 100644 --- a/Content.Client/GameObjects/Components/Power/SmesVisualizer.cs +++ b/Content.Client/GameObjects/Components/Power/SmesVisualizer.cs @@ -1,8 +1,7 @@ using Content.Shared.GameObjects.Components.Power; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Power { diff --git a/Content.Client/GameObjects/Components/Power/SolarControlConsoleBoundUserInterface.cs b/Content.Client/GameObjects/Components/Power/SolarControlConsoleBoundUserInterface.cs index d2b426ea5a..0a005e6598 100644 --- a/Content.Client/GameObjects/Components/Power/SolarControlConsoleBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Power/SolarControlConsoleBoundUserInterface.cs @@ -1,15 +1,15 @@ using System; using Content.Shared.GameObjects.Components.Power; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Client.Graphics.Drawing; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; +using Robust.Shared.Timing; namespace Content.Client.GameObjects.Components.Power { diff --git a/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs b/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs index c365f617e2..dc502b4a98 100644 --- a/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs +++ b/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs @@ -3,9 +3,7 @@ using Content.Shared.GameObjects.Components.Singularity; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using YamlDotNet.RepresentationModel; namespace Content.Client.GameObjects.Components diff --git a/Content.Client/GameObjects/Components/Recycling/RecyclerVisualizer.cs b/Content.Client/GameObjects/Components/Recycling/RecyclerVisualizer.cs index 3745982465..3a1dbac61f 100644 --- a/Content.Client/GameObjects/Components/Recycling/RecyclerVisualizer.cs +++ b/Content.Client/GameObjects/Components/Recycling/RecyclerVisualizer.cs @@ -1,8 +1,7 @@ using Content.Shared.GameObjects.Components.Recycling; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/ReinforcedWallComponent.cs b/Content.Client/GameObjects/Components/ReinforcedWallComponent.cs index f60702ca9f..9bbec1b026 100644 --- a/Content.Client/GameObjects/Components/ReinforcedWallComponent.cs +++ b/Content.Client/GameObjects/Components/ReinforcedWallComponent.cs @@ -1,5 +1,4 @@ using Content.Client.GameObjects.Components.IconSmoothing; -using Content.Shared.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Client/GameObjects/Components/ReinforcedWallVisualizer.cs b/Content.Client/GameObjects/Components/ReinforcedWallVisualizer.cs index 0f87118d8b..d4a5ba4def 100644 --- a/Content.Client/GameObjects/Components/ReinforcedWallVisualizer.cs +++ b/Content.Client/GameObjects/Components/ReinforcedWallVisualizer.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; namespace Content.Client.GameObjects.Components { diff --git a/Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs b/Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs index da82ffeaec..668021a306 100644 --- a/Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using Content.Client.Research; using Content.Shared.GameObjects.Components.Research; using Content.Shared.Research; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.ViewVariables; diff --git a/Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs b/Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs index cde830251b..e84b0241fe 100644 --- a/Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs @@ -1,6 +1,6 @@ using Content.Shared.GameObjects.Components.Research; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Research { diff --git a/Content.Client/GameObjects/Components/Research/ResearchConsoleBoundUserInterface.cs b/Content.Client/GameObjects/Components/Research/ResearchConsoleBoundUserInterface.cs index 77741e1c94..9e018b40af 100644 --- a/Content.Client/GameObjects/Components/Research/ResearchConsoleBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Research/ResearchConsoleBoundUserInterface.cs @@ -1,8 +1,8 @@ using Content.Client.Research; using Content.Shared.GameObjects.Components.Research; using Content.Shared.Research; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Research { diff --git a/Content.Client/GameObjects/Components/Rotation/RotationVisualizer.cs b/Content.Client/GameObjects/Components/Rotation/RotationVisualizer.cs index d78cf08a33..5295c3bb4e 100644 --- a/Content.Client/GameObjects/Components/Rotation/RotationVisualizer.cs +++ b/Content.Client/GameObjects/Components/Rotation/RotationVisualizer.cs @@ -3,8 +3,6 @@ using Content.Shared.GameObjects.Components.Rotation; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Animations; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Singularity/ContainmentFieldComponent.cs b/Content.Client/GameObjects/Components/Singularity/ContainmentFieldComponent.cs index b5e163fcf3..db6486117e 100644 --- a/Content.Client/GameObjects/Components/Singularity/ContainmentFieldComponent.cs +++ b/Content.Client/GameObjects/Components/Singularity/ContainmentFieldComponent.cs @@ -1,6 +1,5 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Log; diff --git a/Content.Client/GameObjects/Components/Singularity/EmitterVisualizer.cs b/Content.Client/GameObjects/Components/Singularity/EmitterVisualizer.cs index 16c8d964be..25e10e341a 100644 --- a/Content.Client/GameObjects/Components/Singularity/EmitterVisualizer.cs +++ b/Content.Client/GameObjects/Components/Singularity/EmitterVisualizer.cs @@ -2,7 +2,6 @@ using Content.Shared.GameObjects.Components.Singularity; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; namespace Content.Client.GameObjects.Components.Singularity { diff --git a/Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs b/Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs index 7c8b76b343..ad52eb4dce 100644 --- a/Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs +++ b/Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs @@ -1,18 +1,13 @@ -using System; using System.Collections.Generic; -using System.Linq; using Content.Shared.GameObjects.Components.Sound; using Content.Shared.Physics; -using Robust.Client.GameObjects.EntitySystems; +using Robust.Client.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; +using Robust.Shared.Network; using Robust.Shared.Players; +using Robust.Shared.Random; using Robust.Shared.Serialization; -using Robust.Shared.Timers; namespace Content.Client.GameObjects.Components.Sound { diff --git a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs index c97b1e2f91..c00aee4f6f 100644 --- a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs +++ b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs @@ -5,22 +5,16 @@ using Content.Client.Animations; using Content.Client.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Storage; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.Animations; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Players; namespace Content.Client.GameObjects.Components.Storage diff --git a/Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs b/Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs index e8f39347f3..0c5f1e58ca 100644 --- a/Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs +++ b/Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs @@ -1,9 +1,7 @@ using Content.Shared.GameObjects.Components.Storage; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Log; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/SubFloorHideComponent.cs b/Content.Client/GameObjects/Components/SubFloorHideComponent.cs index bed55a84be..5f2318bc75 100644 --- a/Content.Client/GameObjects/Components/SubFloorHideComponent.cs +++ b/Content.Client/GameObjects/Components/SubFloorHideComponent.cs @@ -1,7 +1,5 @@ -using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Client.GameObjects.Components { diff --git a/Content.Client/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs b/Content.Client/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs index c3753d94bc..949ef207df 100644 --- a/Content.Client/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs +++ b/Content.Client/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs @@ -4,11 +4,9 @@ using Content.Client.UserInterface; using Content.Client.UserInterface.Suspicion; using Content.Shared.GameObjects.Components.Suspicion; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Graphics; +using Robust.Client.ResourceManagement; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.ViewVariables; diff --git a/Content.Client/GameObjects/Components/Suspicion/TraitorOverlay.cs b/Content.Client/GameObjects/Components/Suspicion/TraitorOverlay.cs index 414582fdc9..27e60e6853 100644 --- a/Content.Client/GameObjects/Components/Suspicion/TraitorOverlay.cs +++ b/Content.Client/GameObjects/Components/Suspicion/TraitorOverlay.cs @@ -1,13 +1,8 @@ using Content.Shared.GameObjects.EntitySystems; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Player; using Robust.Client.ResourceManagement; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs b/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs index b45c9ef4bb..65d541521d 100644 --- a/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs +++ b/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs @@ -3,9 +3,7 @@ using Content.Shared.GameObjects.Components.Trigger; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineBoundUserInterface.cs index 805c3c932d..42b215d2b9 100644 --- a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineBoundUserInterface.cs @@ -1,7 +1,7 @@ using Content.Client.VendingMachines; using Content.Shared.GameObjects.Components.VendingMachines; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; namespace Content.Client.GameObjects.Components.VendingMachines diff --git a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs index 95f8ecd0af..2e8a731f30 100644 --- a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs +++ b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs @@ -3,9 +3,7 @@ using System.Collections.Generic; using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.Components.Animations; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; using static Content.Shared.GameObjects.Components.VendingMachines.SharedVendingMachineComponent; diff --git a/Content.Client/GameObjects/Components/Watercloset/ToiletVisualizer.cs b/Content.Client/GameObjects/Components/Watercloset/ToiletVisualizer.cs index f776b68e75..8daace7ad2 100644 --- a/Content.Client/GameObjects/Components/Watercloset/ToiletVisualizer.cs +++ b/Content.Client/GameObjects/Components/Watercloset/ToiletVisualizer.cs @@ -1,7 +1,6 @@ #nullable enable using Content.Shared.GameObjects.Components.Watercloset; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; namespace Content.Client.GameObjects.Components.Watercloset { diff --git a/Content.Client/GameObjects/Components/Weapons/FlashableComponent.cs b/Content.Client/GameObjects/Components/Weapons/FlashableComponent.cs index f4cc9eddf8..d1e932d0c4 100644 --- a/Content.Client/GameObjects/Components/Weapons/FlashableComponent.cs +++ b/Content.Client/GameObjects/Components/Weapons/FlashableComponent.cs @@ -1,19 +1,11 @@ using System; -using System.Threading; using Content.Client.Graphics.Overlays; using Content.Shared.GameObjects.Components.Weapons; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.Overlays; +using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; -using Robust.Shared.Maths; -using Robust.Shared.Utility; -using Timer = Robust.Shared.Timers.Timer; +using Robust.Shared.Timing; namespace Content.Client.GameObjects.Components.Weapons { diff --git a/Content.Client/GameObjects/Components/Weapons/Melee/MeleeWeaponArcAnimationComponent.cs b/Content.Client/GameObjects/Components/Weapons/Melee/MeleeWeaponArcAnimationComponent.cs index 4536701926..c15bb84c6c 100644 --- a/Content.Client/GameObjects/Components/Weapons/Melee/MeleeWeaponArcAnimationComponent.cs +++ b/Content.Client/GameObjects/Components/Weapons/Melee/MeleeWeaponArcAnimationComponent.cs @@ -2,7 +2,6 @@ using Content.Shared.GameObjects.Components.Weapons.Melee; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Maths; namespace Content.Client.GameObjects.Components.Weapons.Melee diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBatteryBarrelComponent.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBatteryBarrelComponent.cs index 4082f3496d..dd1c77c895 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBatteryBarrelComponent.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBatteryBarrelComponent.cs @@ -2,7 +2,7 @@ using Content.Client.UserInterface.Stylesheets; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs index 69a3980dee..019b63fca0 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs @@ -1,5 +1,4 @@ using System; -using Content.Client.Animations; using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; using Content.Shared.GameObjects; @@ -11,8 +10,8 @@ using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Animations; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs index afaae20e35..05562565b3 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs @@ -1,8 +1,7 @@ using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers { diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs index 30b5be0caa..3024d631db 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs @@ -2,8 +2,7 @@ using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs index d52e6fa630..cf763d52c6 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers { diff --git a/Content.Client/GameObjects/Components/WindowComponent.cs b/Content.Client/GameObjects/Components/WindowComponent.cs index 14be884b07..ce356ce52b 100644 --- a/Content.Client/GameObjects/Components/WindowComponent.cs +++ b/Content.Client/GameObjects/Components/WindowComponent.cs @@ -2,9 +2,7 @@ using Content.Client.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.Serialization; using static Content.Client.GameObjects.Components.IconSmoothing.IconSmoothComponent; diff --git a/Content.Client/GameObjects/Components/WindowVisualizer.cs b/Content.Client/GameObjects/Components/WindowVisualizer.cs index 87f6e6339c..bf8ce5c52f 100644 --- a/Content.Client/GameObjects/Components/WindowVisualizer.cs +++ b/Content.Client/GameObjects/Components/WindowVisualizer.cs @@ -4,8 +4,7 @@ using Content.Shared.GameObjects.Components; using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Transform; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components { diff --git a/Content.Client/GameObjects/Components/Wires/WiresBoundUserInterface.cs b/Content.Client/GameObjects/Components/Wires/WiresBoundUserInterface.cs index b46020a8bb..248d00c4b0 100644 --- a/Content.Client/GameObjects/Components/Wires/WiresBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Wires/WiresBoundUserInterface.cs @@ -1,5 +1,5 @@ -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using static Content.Shared.GameObjects.Components.SharedWiresComponent; namespace Content.Client.GameObjects.Components.Wires diff --git a/Content.Client/GameObjects/Components/Wires/WiresMenu.cs b/Content.Client/GameObjects/Components/Wires/WiresMenu.cs index a845ee3522..076de4173f 100644 --- a/Content.Client/GameObjects/Components/Wires/WiresMenu.cs +++ b/Content.Client/GameObjects/Components/Wires/WiresMenu.cs @@ -1,12 +1,11 @@ using System; -using Content.Client.Animations; using Content.Client.GameObjects.EntitySystems; using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; using Content.Shared.GameObjects.Components; using Robust.Client.Animations; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Graphics; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; diff --git a/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs b/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs index 9b73d10d2f..3e44082e32 100644 --- a/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs +++ b/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs @@ -1,5 +1,4 @@ using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using static Content.Shared.GameObjects.Components.SharedWiresComponent; namespace Content.Client.GameObjects.Components.Wires diff --git a/Content.Client/GameObjects/EntitySystems/AI/ClientAiDebugSystem.cs b/Content.Client/GameObjects/EntitySystems/AI/ClientAiDebugSystem.cs index cf04926122..1085267530 100644 --- a/Content.Client/GameObjects/EntitySystems/AI/ClientAiDebugSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/AI/ClientAiDebugSystem.cs @@ -2,12 +2,10 @@ using System; using System.Collections.Generic; using Content.Client.UserInterface.Stylesheets; using Content.Shared.AI; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs b/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs index b2cae9a813..65ca72c02b 100644 --- a/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs @@ -2,14 +2,9 @@ using System.Collections.Generic; using System.Linq; using Content.Shared.AI; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Graphics.Overlays; +using Robust.Client.Graphics; using Robust.Client.Player; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Random; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/EntitySystems/ActionsSystem.cs b/Content.Client/GameObjects/EntitySystems/ActionsSystem.cs index 3a37dd009c..8078dc8ca8 100644 --- a/Content.Client/GameObjects/EntitySystems/ActionsSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/ActionsSystem.cs @@ -2,7 +2,7 @@ using Content.Shared.Input; using JetBrains.Annotations; using Robust.Client.Player; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.Input; using Robust.Shared.Input.Binding; using Robust.Shared.IoC; diff --git a/Content.Client/GameObjects/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Client/GameObjects/EntitySystems/AtmosDebugOverlaySystem.cs index 7a7e982b8b..9c219c6600 100644 --- a/Content.Client/GameObjects/EntitySystems/AtmosDebugOverlaySystem.cs +++ b/Content.Client/GameObjects/EntitySystems/AtmosDebugOverlaySystem.cs @@ -5,8 +5,7 @@ using Content.Shared.GameObjects.EntitySystems.Atmos; using Content.Shared.Atmos; using Content.Shared.GameTicking; using JetBrains.Annotations; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Shared.Interfaces.Map; +using Robust.Client.Graphics; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs b/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs index 6f6f598b4c..606a438f5e 100644 --- a/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs @@ -1,6 +1,6 @@ using Content.Client.GameObjects.Components.Mobs; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs b/Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs index 41585c189c..5c6b4abbaf 100644 --- a/Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.Input; using JetBrains.Annotations; using Robust.Client.Player; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.Input.Binding; using Robust.Shared.IoC; diff --git a/Content.Client/GameObjects/EntitySystems/ClientInventorySystem.cs b/Content.Client/GameObjects/EntitySystems/ClientInventorySystem.cs index 6917d1e5c2..907a977987 100644 --- a/Content.Client/GameObjects/EntitySystems/ClientInventorySystem.cs +++ b/Content.Client/GameObjects/EntitySystems/ClientInventorySystem.cs @@ -4,7 +4,7 @@ using Content.Shared.Input; using JetBrains.Annotations; using Robust.Client.Player; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.Input.Binding; using Robust.Shared.IoC; diff --git a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs b/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs index c68f1d8134..f71e48a924 100644 --- a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs @@ -8,9 +8,9 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Client.Player; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Players; +using Robust.Shared.Timing; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs b/Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs index b92276b59b..b4b688a3f4 100644 --- a/Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs @@ -8,11 +8,9 @@ using Content.Shared.Input; using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.EntitySystems; using Robust.Client.Player; using Robust.Shared.Input; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterBar.cs b/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterBar.cs index a53e39e510..3bd96e5e97 100644 --- a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterBar.cs +++ b/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterBar.cs @@ -1,9 +1,7 @@ #nullable enable using System; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Shaders; +using Robust.Client.Graphics; using Robust.Client.UserInterface; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterGui.cs b/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterGui.cs index ec1bd55d96..b7fb691d59 100644 --- a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterGui.cs +++ b/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterGui.cs @@ -4,11 +4,10 @@ using System.Collections.Generic; using Content.Client.GameObjects.Components; using Content.Client.Utility; using Content.Shared.GameObjects.Components; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Graphics; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs b/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs index c93905ded1..a2f35bdddb 100644 --- a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs @@ -4,11 +4,10 @@ using System.Linq; using Content.Client.GameObjects.Components; using Content.Shared.GameObjects.EntitySystems; using JetBrains.Annotations; -using Robust.Client.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Timing; namespace Content.Client.GameObjects.EntitySystems.DoAfter { diff --git a/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs b/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs index f4ef1b72a3..787a506322 100644 --- a/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs @@ -9,18 +9,13 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.EntitySystems; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.State; +using Robust.Client.Graphics; +using Robust.Client.Input; using Robust.Client.Player; +using Robust.Client.State; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Input; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; diff --git a/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs b/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs index 42e61f6bcb..a0513e5788 100644 --- a/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs @@ -5,15 +5,12 @@ using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Input; using JetBrains.Annotations; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.GameObjects; using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs b/Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs index 2af2cfcb84..608a446a9d 100644 --- a/Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs +++ b/Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs @@ -6,11 +6,8 @@ using Content.Shared.Atmos; using Content.Shared.GameObjects.EntitySystems.Atmos; using JetBrains.Annotations; using Robust.Client.Graphics; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; using Robust.Client.Utility; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs b/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs index 3e40056e9d..fc6d599739 100644 --- a/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs @@ -3,10 +3,6 @@ using System.Linq; using Content.Client.GameObjects.Components.IconSmoothing; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/EntitySystems/InstrumentSystem.cs b/Content.Client/GameObjects/EntitySystems/InstrumentSystem.cs index 4d4e7c907a..221d236d82 100644 --- a/Content.Client/GameObjects/EntitySystems/InstrumentSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/InstrumentSystem.cs @@ -1,10 +1,10 @@ using Content.Client.GameObjects.Components.Instruments; using Content.Shared; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.Configuration; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Timing; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/MarkerSystem.cs b/Content.Client/GameObjects/EntitySystems/MarkerSystem.cs index f6acf68b4f..ea57233c86 100644 --- a/Content.Client/GameObjects/EntitySystems/MarkerSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/MarkerSystem.cs @@ -1,5 +1,5 @@ using Content.Client.GameObjects.Components.Markers; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/MeleeLungeSystem.cs b/Content.Client/GameObjects/EntitySystems/MeleeLungeSystem.cs index f61ae4506f..6ada71ff0a 100644 --- a/Content.Client/GameObjects/EntitySystems/MeleeLungeSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/MeleeLungeSystem.cs @@ -1,6 +1,6 @@ using Content.Client.GameObjects.Components.Mobs; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs b/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs index f3d7883d8d..0f5ba1baa7 100644 --- a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs @@ -4,16 +4,12 @@ using Content.Client.GameObjects.Components.Weapons.Melee; using Content.Shared.GameObjects.Components.Weapons.Melee; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Prototypes; +using Robust.Shared.Timing; using static Content.Shared.GameObjects.EntitySystemMessages.MeleeWeaponSystemMessages; namespace Content.Client.GameObjects.EntitySystems diff --git a/Content.Client/GameObjects/EntitySystems/MoverSystem.cs b/Content.Client/GameObjects/EntitySystems/MoverSystem.cs index b460e194a9..ca426d8cbc 100644 --- a/Content.Client/GameObjects/EntitySystems/MoverSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/MoverSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.GameObjects.EntitySystems; using JetBrains.Annotations; using Robust.Client.Physics; using Robust.Client.Player; -using Robust.Shared.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Client.GameObjects.EntitySystems diff --git a/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs b/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs index 5459fa3076..192dc9c03f 100644 --- a/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs @@ -3,16 +3,15 @@ using Content.Client.GameObjects.Components.Items; using Content.Client.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.Components.Weapons.Ranged; using JetBrains.Annotations; -using Robust.Client.GameObjects.EntitySystems; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Input; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Client.Input; using Robust.Client.Player; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.Input; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; +using Robust.Shared.Timing; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/StandingStateSystem.cs b/Content.Client/GameObjects/EntitySystems/StandingStateSystem.cs index b5659fe7b1..41495c4445 100644 --- a/Content.Client/GameObjects/EntitySystems/StandingStateSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/StandingStateSystem.cs @@ -1,9 +1,7 @@ -using Content.Shared.Audio; -using Content.Shared.GameObjects.Components.Rotation; +using Content.Shared.GameObjects.Components.Rotation; using Content.Shared.GameObjects.EntitySystems; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.EntitySystems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs b/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs index 249df06da8..beda5c0fca 100644 --- a/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs @@ -1,9 +1,7 @@ using Content.Client.GameObjects.Components; using Content.Shared.Maps; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Map; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/EntitySystems/SuspicionEndTimerSystem.cs b/Content.Client/GameObjects/EntitySystems/SuspicionEndTimerSystem.cs index 0186bf4a01..97f99feda9 100644 --- a/Content.Client/GameObjects/EntitySystems/SuspicionEndTimerSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/SuspicionEndTimerSystem.cs @@ -1,6 +1,6 @@ using System; using Content.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs index 47a78456b5..d1fc7be2f6 100644 --- a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs @@ -12,15 +12,11 @@ using Content.Shared.GameTicking; using Content.Shared.Input; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.EntitySystems; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.Interfaces.State; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Input; using Robust.Client.Player; +using Robust.Client.ResourceManagement; +using Robust.Client.State; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.Utility; @@ -28,12 +24,11 @@ using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Input; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Timing; using Robust.Shared.Utility; using Timer = Robust.Shared.Timers.Timer; diff --git a/Content.Client/GameObjects/EntitySystems/WindowSystem.cs b/Content.Client/GameObjects/EntitySystems/WindowSystem.cs index 4f2d79ec8c..0fc84e7049 100644 --- a/Content.Client/GameObjects/EntitySystems/WindowSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/WindowSystem.cs @@ -2,8 +2,6 @@ using Content.Client.GameObjects.Components; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs index a6bdc2b225..c324244eb8 100644 --- a/Content.Client/GameTicking/ClientGameTicker.cs +++ b/Content.Client/GameTicking/ClientGameTicker.cs @@ -5,12 +5,10 @@ using Content.Client.State; using Content.Client.UserInterface; using Content.Shared.GameTicking; using Content.Shared.Network.NetMessages; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.State; -using Robust.Shared.Interfaces.Network; +using Robust.Client.Graphics; +using Robust.Client.State; using Robust.Shared.IoC; using Robust.Shared.Network; -using Robust.Shared.Timing; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Client/GlobalVerbs/ExamineVerb.cs b/Content.Client/GlobalVerbs/ExamineVerb.cs index 2116290796..4fd4f426d6 100644 --- a/Content.Client/GlobalVerbs/ExamineVerb.cs +++ b/Content.Client/GlobalVerbs/ExamineVerb.cs @@ -1,7 +1,6 @@ using Content.Client.GameObjects.EntitySystems; using Content.Shared.GameObjects.Verbs; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; namespace Content.Client.GlobalVerbs diff --git a/Content.Client/GlobalVerbs/ViewVariablesVerb.cs b/Content.Client/GlobalVerbs/ViewVariablesVerb.cs index fd31a6fd0c..c93d51997e 100644 --- a/Content.Client/GlobalVerbs/ViewVariablesVerb.cs +++ b/Content.Client/GlobalVerbs/ViewVariablesVerb.cs @@ -1,7 +1,7 @@ using Content.Shared.GameObjects.Verbs; using Robust.Client.Console; using Robust.Client.ViewVariables; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Client.GlobalVerbs diff --git a/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs b/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs index 50d7bddf28..fd01eeb1e2 100644 --- a/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs +++ b/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs @@ -1,8 +1,4 @@ -using Content.Shared.GameObjects.Components.Mobs; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.Graphics.ClientEye; +using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Content.Client/Graphics/Overlays/FlashOverlay.cs b/Content.Client/Graphics/Overlays/FlashOverlay.cs index 6acab964bf..0e867b59c0 100644 --- a/Content.Client/Graphics/Overlays/FlashOverlay.cs +++ b/Content.Client/Graphics/Overlays/FlashOverlay.cs @@ -1,15 +1,8 @@ -using Content.Shared.GameObjects.Components.Mobs; -using Content.Shared.Interfaces; -using Content.Shared.Network.NetMessages; -using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.Graphics; -using Robust.Shared.Interfaces.Timing; +using Robust.Client.Graphics; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; +using Robust.Shared.Timing; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; diff --git a/Content.Client/Graphics/Overlays/GradientCircleMask.cs b/Content.Client/Graphics/Overlays/GradientCircleMask.cs index b60fd7d16b..4fb87c0882 100644 --- a/Content.Client/Graphics/Overlays/GradientCircleMask.cs +++ b/Content.Client/Graphics/Overlays/GradientCircleMask.cs @@ -1,9 +1,5 @@ -using Content.Shared.GameObjects.Components.Mobs; -using Content.Shared.GameObjects.Components.Mobs.State; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.Graphics.ClientEye; +using Content.Shared.GameObjects.Components.Mobs.State; +using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Content.Client/Instruments/InstrumentMenu.xaml.cs b/Content.Client/Instruments/InstrumentMenu.xaml.cs index 9ead93cc77..8ed12b9190 100644 --- a/Content.Client/Instruments/InstrumentMenu.xaml.cs +++ b/Content.Client/Instruments/InstrumentMenu.xaml.cs @@ -6,8 +6,7 @@ using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; using Robust.Client.Audio.Midi; using Robust.Client.AutoGenerated; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -17,7 +16,6 @@ using Robust.Shared.Containers; using Robust.Shared.Input; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Timers; using Robust.Shared.Timing; diff --git a/Content.Client/Interfaces/IClientGameTicker.cs b/Content.Client/Interfaces/IClientGameTicker.cs index 981c9a3448..f5ebd911af 100644 --- a/Content.Client/Interfaces/IClientGameTicker.cs +++ b/Content.Client/Interfaces/IClientGameTicker.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Robust.Shared.Network; -using Robust.Shared.Timing; using static Content.Shared.GameTicking.SharedGameTicker; namespace Content.Client.Interfaces diff --git a/Content.Client/Parallax/ParallaxGenerator.cs b/Content.Client/Parallax/ParallaxGenerator.cs index 4c057b322b..794a891a84 100644 --- a/Content.Client/Parallax/ParallaxGenerator.cs +++ b/Content.Client/Parallax/ParallaxGenerator.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Globalization; using Nett; using Robust.Client.Utility; -using Robust.Shared.Interfaces.Log; +using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Noise; using Robust.Shared.Random; diff --git a/Content.Client/Parallax/ParallaxManager.cs b/Content.Client/Parallax/ParallaxManager.cs index 3a17cc2ea6..1b12c9a3e0 100644 --- a/Content.Client/Parallax/ParallaxManager.cs +++ b/Content.Client/Parallax/ParallaxManager.cs @@ -6,10 +6,9 @@ using Content.Client.Interfaces.Parallax; using Content.Shared; using Nett; using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Resources; +using Robust.Client.ResourceManagement; +using Robust.Shared.Configuration; +using Robust.Shared.ContentPack; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Utility; diff --git a/Content.Client/Parallax/ParallaxOverlay.cs b/Content.Client/Parallax/ParallaxOverlay.cs index c4bc5e8ebf..71e93d5d3c 100644 --- a/Content.Client/Parallax/ParallaxOverlay.cs +++ b/Content.Client/Parallax/ParallaxOverlay.cs @@ -1,10 +1,5 @@ using Content.Client.Interfaces.Parallax; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.Client/Placement/Modes/WallmountLight.cs b/Content.Client/Placement/Modes/WallmountLight.cs index ba01d7a293..319dcb7bb3 100644 --- a/Content.Client/Placement/Modes/WallmountLight.cs +++ b/Content.Client/Placement/Modes/WallmountLight.cs @@ -2,11 +2,6 @@ using Robust.Client.Placement; using Robust.Shared.Map; using Robust.Shared.Maths; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Content.Client.Placement.Modes { diff --git a/Content.Client/Sandbox/SandboxManager.cs b/Content.Client/Sandbox/SandboxManager.cs index aa91bb7264..1c5e7a6bca 100644 --- a/Content.Client/Sandbox/SandboxManager.cs +++ b/Content.Client/Sandbox/SandboxManager.cs @@ -3,16 +3,16 @@ using Content.Client.UserInterface; using Content.Shared.Input; using Content.Shared.Sandbox; using Robust.Client.Console; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.Placement; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Input; +using Robust.Client.Placement; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Map; +using Robust.Shared.Network; using Robust.Shared.Prototypes; namespace Content.Client.Sandbox diff --git a/Content.Client/ScreenshotHook.cs b/Content.Client/ScreenshotHook.cs index de977fe70a..7b17913cf3 100644 --- a/Content.Client/ScreenshotHook.cs +++ b/Content.Client/ScreenshotHook.cs @@ -2,10 +2,10 @@ using System; using System.IO; using System.Threading.Tasks; using Content.Shared.Input; -using Robust.Client.Interfaces.Graphics; -using Robust.Client.Interfaces.Input; +using Robust.Client.Graphics; +using Robust.Client.Input; +using Robust.Shared.ContentPack; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Utility; diff --git a/Content.Client/State/GameScreen.cs b/Content.Client/State/GameScreen.cs index 7a00879c55..ce0fd30c0b 100644 --- a/Content.Client/State/GameScreen.cs +++ b/Content.Client/State/GameScreen.cs @@ -2,8 +2,8 @@ using Content.Client.Chat; using Content.Client.Interfaces.Chat; using Content.Client.UserInterface; using Content.Shared.Input; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Input; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Input.Binding; using Robust.Shared.IoC; diff --git a/Content.Client/State/GameScreenBase.cs b/Content.Client/State/GameScreenBase.cs index 3957c5576e..f01c6f46a0 100644 --- a/Content.Client/State/GameScreenBase.cs +++ b/Content.Client/State/GameScreenBase.cs @@ -4,19 +4,15 @@ using System.Linq; using Content.Client.GameObjects.Components; using Content.Client.Utility; using Content.Shared; -using Robust.Client.GameObjects.EntitySystems; -using Robust.Client.Interfaces.GameObjects; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.State; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Client.Input; using Robust.Client.Player; +using Robust.Client.State; +using Robust.Client.UserInterface; +using Robust.Shared.Configuration; using Robust.Shared.GameObjects; using Robust.Shared.Input; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Client/State/LauncherConnecting.cs b/Content.Client/State/LauncherConnecting.cs index 250935f353..463d531783 100644 --- a/Content.Client/State/LauncherConnecting.cs +++ b/Content.Client/State/LauncherConnecting.cs @@ -1,15 +1,14 @@ using Content.Client.UserInterface.Controls; using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; +using Robust.Shared.Network; using static Content.Client.StaticIoC; namespace Content.Client.State diff --git a/Content.Client/State/LobbyState.cs b/Content.Client/State/LobbyState.cs index 6b6ae5d6bf..fd03cc18ee 100644 --- a/Content.Client/State/LobbyState.cs +++ b/Content.Client/State/LobbyState.cs @@ -4,16 +4,15 @@ using Content.Client.Interfaces; using Content.Client.Interfaces.Chat; using Content.Client.UserInterface; using Content.Shared.Input; +using Robust.Client; using Robust.Client.Console; -using Robust.Client.Interfaces; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Input; using Robust.Client.Player; +using Robust.Client.ResourceManagement; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; +using Robust.Shared.GameObjects; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Prototypes; diff --git a/Content.Client/State/MainMenu.cs b/Content.Client/State/MainMenu.cs index 586ed284ec..8d48cd2147 100644 --- a/Content.Client/State/MainMenu.cs +++ b/Content.Client/State/MainMenu.cs @@ -2,15 +2,11 @@ using System.Text.RegularExpressions; using Content.Client.UserInterface; using Robust.Client; -using Robust.Client.Interfaces; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.Interfaces.UserInterface; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; diff --git a/Content.Client/StaticIoC.cs b/Content.Client/StaticIoC.cs index 21ea88d49c..71c9ed7429 100644 --- a/Content.Client/StaticIoC.cs +++ b/Content.Client/StaticIoC.cs @@ -1,4 +1,4 @@ -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; using Robust.Shared.IoC; namespace Content.Client diff --git a/Content.Client/StationEvents/RadiationPulseOverlay.cs b/Content.Client/StationEvents/RadiationPulseOverlay.cs index 91917ea9dc..c78ca07311 100644 --- a/Content.Client/StationEvents/RadiationPulseOverlay.cs +++ b/Content.Client/StationEvents/RadiationPulseOverlay.cs @@ -3,17 +3,14 @@ using System; using System.Collections.Generic; using System.Linq; using Content.Client.GameObjects.Components.StationEvents; -using Content.Shared.GameObjects.Components.Mobs; using JetBrains.Annotations; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Interfaces.Graphics.ClientEye; +using Robust.Client.Graphics; using Robust.Client.Player; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Timing; namespace Content.Client.StationEvents { diff --git a/Content.Client/StationEvents/StationEventManager.cs b/Content.Client/StationEvents/StationEventManager.cs index 59e78e9734..3f9815aa61 100644 --- a/Content.Client/StationEvents/StationEventManager.cs +++ b/Content.Client/StationEvents/StationEventManager.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using Content.Shared.Network.NetMessages; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Network; diff --git a/Content.Client/UserInterface/ActionAlertTooltip.cs b/Content.Client/UserInterface/ActionAlertTooltip.cs index 07d081eee4..de5e4fa0bc 100644 --- a/Content.Client/UserInterface/ActionAlertTooltip.cs +++ b/Content.Client/UserInterface/ActionAlertTooltip.cs @@ -2,9 +2,7 @@ using System; using Content.Client.UserInterface.Stylesheets; -using Content.Shared.Actions; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Content.Client/UserInterface/ActionMenuItem.cs b/Content.Client/UserInterface/ActionMenuItem.cs index 0bfee17b6c..2b03119eb6 100644 --- a/Content.Client/UserInterface/ActionMenuItem.cs +++ b/Content.Client/UserInterface/ActionMenuItem.cs @@ -1,7 +1,6 @@ #nullable enable using System; -using Content.Client.GameObjects.Components.Mobs; using Content.Client.UserInterface.Stylesheets; using Content.Shared.Actions; using Robust.Client.UserInterface; diff --git a/Content.Client/UserInterface/ActionsUI.cs b/Content.Client/UserInterface/ActionsUI.cs index 2c275398e7..86b07a3469 100644 --- a/Content.Client/UserInterface/ActionsUI.cs +++ b/Content.Client/UserInterface/ActionsUI.cs @@ -7,15 +7,13 @@ using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; using Content.Shared.Actions; using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.Utility; using Robust.Shared.GameObjects; using Robust.Shared.Input; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; diff --git a/Content.Client/UserInterface/AdminMenu/AdminMenuManager.cs b/Content.Client/UserInterface/AdminMenu/AdminMenuManager.cs index c9caaedc71..4d13992720 100644 --- a/Content.Client/UserInterface/AdminMenu/AdminMenuManager.cs +++ b/Content.Client/UserInterface/AdminMenu/AdminMenuManager.cs @@ -2,11 +2,11 @@ using Content.Client.Administration; using Content.Shared.Input; using Robust.Client.Console; -using Robust.Client.Interfaces.Input; +using Robust.Client.Input; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; +using Robust.Shared.Network; namespace Content.Client.UserInterface.AdminMenu { diff --git a/Content.Client/UserInterface/AdminMenu/AdminMenuWindow.cs b/Content.Client/UserInterface/AdminMenu/AdminMenuWindow.cs index 62e863b7f1..266cf46f01 100644 --- a/Content.Client/UserInterface/AdminMenu/AdminMenuWindow.cs +++ b/Content.Client/UserInterface/AdminMenu/AdminMenuWindow.cs @@ -5,17 +5,15 @@ using System.Linq; using Content.Client.GameObjects.EntitySystems; using Content.Client.StationEvents; using Content.Shared.Atmos; -using Content.Shared.Roles; using Robust.Client.Console; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.Placement; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Graphics; +using Robust.Client.Placement; using Robust.Client.Player; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; diff --git a/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitEui.cs b/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitEui.cs index 0fa0229392..64b59f117a 100644 --- a/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitEui.cs +++ b/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitEui.cs @@ -1,13 +1,6 @@ using Content.Client.Eui; using Content.Shared.Eui; using JetBrains.Annotations; -using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.IoC; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Content.Shared.Administration; namespace Content.Client.UserInterface.AdminMenu.SetOutfit diff --git a/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml.cs b/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml.cs index 9590db8768..2259127557 100644 --- a/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml.cs +++ b/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml.cs @@ -1,16 +1,11 @@ #nullable enable -using System; -using Content.Shared.Construction; using Content.Shared.Roles; using Robust.Client.AutoGenerated; using Robust.Client.Console; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; -using Robust.Client.Utility; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/UserInterface/AlertsUI.cs b/Content.Client/UserInterface/AlertsUI.cs index 656f9f18c8..04c7ad44fd 100644 --- a/Content.Client/UserInterface/AlertsUI.cs +++ b/Content.Client/UserInterface/AlertsUI.cs @@ -1,6 +1,4 @@ -using System; -using Content.Client.UserInterface.Stylesheets; -using Robust.Client.Interfaces.Graphics; +using Content.Client.UserInterface.Stylesheets; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Maths; diff --git a/Content.Client/UserInterface/Atmos/GasTank/GasTankBoundUserInterface.cs b/Content.Client/UserInterface/Atmos/GasTank/GasTankBoundUserInterface.cs index 868aad1443..f3f5c980e2 100644 --- a/Content.Client/UserInterface/Atmos/GasTank/GasTankBoundUserInterface.cs +++ b/Content.Client/UserInterface/Atmos/GasTank/GasTankBoundUserInterface.cs @@ -1,7 +1,7 @@ using Content.Shared.GameObjects.Components.Atmos.GasTank; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.UserInterface.Atmos.GasTank { diff --git a/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs index 49210c9464..9135c08391 100644 --- a/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs +++ b/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs @@ -1,8 +1,8 @@ using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; using Content.Shared.GameObjects.Components.Atmos.GasTank; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Graphics; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; diff --git a/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs b/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs index 697c73a689..5103fa58c1 100644 --- a/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs +++ b/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Content.Client.GameObjects.Components.Cargo; using Content.Client.UserInterface.Stylesheets; using Content.Shared.Prototypes.Cargo; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.Utility; diff --git a/Content.Client/UserInterface/CharacterSetupGui.cs b/Content.Client/UserInterface/CharacterSetupGui.cs index 2e8bf4589a..b9d2ea1824 100644 --- a/Content.Client/UserInterface/CharacterSetupGui.cs +++ b/Content.Client/UserInterface/CharacterSetupGui.cs @@ -6,11 +6,11 @@ using Content.Client.Utility; using Content.Shared.Preferences; using Content.Shared.Roles; using Robust.Client.GameObjects; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Graphics; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; diff --git a/Content.Client/UserInterface/Controls/ActionSlot.cs b/Content.Client/UserInterface/Controls/ActionSlot.cs index 1ae242f6d5..aa9cf73b9d 100644 --- a/Content.Client/UserInterface/Controls/ActionSlot.cs +++ b/Content.Client/UserInterface/Controls/ActionSlot.cs @@ -4,14 +4,13 @@ using Content.Client.GameObjects.Components.Mobs; using Content.Client.UserInterface.Stylesheets; using Content.Shared.Actions; using Content.Shared.GameObjects.Components.Mobs; +using Robust.Client.GameObjects; using Robust.Client.Graphics; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.Utility; +using Robust.Shared.GameObjects; using Robust.Shared.Input; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/UserInterface/Controls/AlertControl.cs b/Content.Client/UserInterface/Controls/AlertControl.cs index 383a7db448..c4243e8363 100644 --- a/Content.Client/UserInterface/Controls/AlertControl.cs +++ b/Content.Client/UserInterface/Controls/AlertControl.cs @@ -3,7 +3,6 @@ using System; using Content.Shared.Alert; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Timing; diff --git a/Content.Client/UserInterface/CooldownGraphic.cs b/Content.Client/UserInterface/CooldownGraphic.cs index a2da053a92..34c570070a 100644 --- a/Content.Client/UserInterface/CooldownGraphic.cs +++ b/Content.Client/UserInterface/CooldownGraphic.cs @@ -1,6 +1,5 @@ using System; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Shaders; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Content.Client/UserInterface/CreditsWindow.cs b/Content.Client/UserInterface/CreditsWindow.cs index 86e30a18a1..ca718223a8 100644 --- a/Content.Client/UserInterface/CreditsWindow.cs +++ b/Content.Client/UserInterface/CreditsWindow.cs @@ -5,11 +5,11 @@ using System.Linq; using Content.Client.UserInterface.Stylesheets; using Content.Shared; using Robust.Client.Credits; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.Interfaces.Configuration; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/UserInterface/GameHud.cs b/Content.Client/UserInterface/GameHud.cs index 5feb17055d..89fa89ff80 100644 --- a/Content.Client/UserInterface/GameHud.cs +++ b/Content.Client/UserInterface/GameHud.cs @@ -1,15 +1,11 @@ using System; -using System.Transactions; using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.Input; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; using Robust.Client.Input; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.UserInterface; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface.Controls; using Robust.Shared.Input; using Robust.Shared.Input.Binding; @@ -17,7 +13,6 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Utility; -using YamlDotNet.Core.Tokens; using static Robust.Client.Input.Keyboard.Key; using Control = Robust.Client.UserInterface.Control; diff --git a/Content.Client/UserInterface/HandButton.cs b/Content.Client/UserInterface/HandButton.cs index c7120a73ef..224ff049d1 100644 --- a/Content.Client/UserInterface/HandButton.cs +++ b/Content.Client/UserInterface/HandButton.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.Components.Items; using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Maths; namespace Content.Client.UserInterface { diff --git a/Content.Client/UserInterface/HandsGui.cs b/Content.Client/UserInterface/HandsGui.cs index 01796984c1..734b0f0336 100644 --- a/Content.Client/UserInterface/HandsGui.cs +++ b/Content.Client/UserInterface/HandsGui.cs @@ -1,13 +1,12 @@ using System; using System.Linq; using Content.Client.GameObjects.Components.Items; -using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; using Content.Shared.GameObjects.Components.Items; using Content.Shared.Input; using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Player; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Input; diff --git a/Content.Client/UserInterface/HumanoidProfileEditor.Random.cs b/Content.Client/UserInterface/HumanoidProfileEditor.Random.cs index 761e88d751..92e0da2f76 100644 --- a/Content.Client/UserInterface/HumanoidProfileEditor.Random.cs +++ b/Content.Client/UserInterface/HumanoidProfileEditor.Random.cs @@ -1,10 +1,5 @@ -using System; -using System.Linq; -using Content.Shared.Preferences; -using Content.Shared.Preferences.Appearance; +using Content.Shared.Preferences; using Content.Shared.Text; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Maths; using Robust.Shared.Random; namespace Content.Client.UserInterface diff --git a/Content.Client/UserInterface/HumanoidProfileEditor.cs b/Content.Client/UserInterface/HumanoidProfileEditor.cs index 58fa5f0431..044e1f275c 100644 --- a/Content.Client/UserInterface/HumanoidProfileEditor.cs +++ b/Content.Client/UserInterface/HumanoidProfileEditor.cs @@ -5,12 +5,9 @@ using Content.Shared.GameTicking; using Content.Shared.Preferences; using Content.Shared.Roles; using Robust.Client.GameObjects; -using Robust.Client.Graphics.Drawing; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.Utility; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; @@ -22,6 +19,9 @@ using System; using System.Collections.Generic; using System.Linq; using Content.Client.UserInterface.Stylesheets; +using Robust.Client.Graphics; +using Robust.Shared.GameObjects; +using Robust.Shared.Random; namespace Content.Client.UserInterface { diff --git a/Content.Client/UserInterface/IItemSlotManager.cs b/Content.Client/UserInterface/IItemSlotManager.cs index f6f34c7903..d61952364b 100644 --- a/Content.Client/UserInterface/IItemSlotManager.cs +++ b/Content.Client/UserInterface/IItemSlotManager.cs @@ -1,5 +1,5 @@ using Robust.Client.UserInterface; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.UserInterface { diff --git a/Content.Client/UserInterface/ItemSlotButton.cs b/Content.Client/UserInterface/ItemSlotButton.cs index 773a1fb1bc..c56eac72bf 100644 --- a/Content.Client/UserInterface/ItemSlotButton.cs +++ b/Content.Client/UserInterface/ItemSlotButton.cs @@ -1,13 +1,10 @@ using System; using Content.Client.UserInterface.Stylesheets; using Robust.Client.Graphics; -using Robust.Client.Graphics.Shaders; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Input; -using Robust.Shared.IoC; using Robust.Shared.Maths; -using Robust.Shared.Prototypes; namespace Content.Client.UserInterface { diff --git a/Content.Client/UserInterface/ItemSlotManager.cs b/Content.Client/UserInterface/ItemSlotManager.cs index cbb7b57375..ad6725b1eb 100644 --- a/Content.Client/UserInterface/ItemSlotManager.cs +++ b/Content.Client/UserInterface/ItemSlotManager.cs @@ -3,20 +3,16 @@ using Content.Client.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Items; using Content.Shared.Input; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.EntitySystems; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Client.Interfaces.Graphics.ClientEye; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.Graphics; +using Robust.Client.Input; using Robust.Client.Player; using Robust.Client.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.Input; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Timing; namespace Content.Client.UserInterface { diff --git a/Content.Client/UserInterface/ItemStatusPanel.cs b/Content.Client/UserInterface/ItemStatusPanel.cs index 632a4cacf4..71905a7dfb 100644 --- a/Content.Client/UserInterface/ItemStatusPanel.cs +++ b/Content.Client/UserInterface/ItemStatusPanel.cs @@ -6,10 +6,9 @@ using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; using Content.Shared.GameObjects.Components.Items; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Client/UserInterface/LateJoinGui.cs b/Content.Client/UserInterface/LateJoinGui.cs index f4bbc7ecef..019e459eeb 100644 --- a/Content.Client/UserInterface/LateJoinGui.cs +++ b/Content.Client/UserInterface/LateJoinGui.cs @@ -4,7 +4,7 @@ using System.Linq; using Content.Client.Interfaces; using Content.Shared.Roles; using Robust.Client.Console; -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; diff --git a/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs b/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs index 21552467f9..3fff738e03 100644 --- a/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs +++ b/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs @@ -2,15 +2,14 @@ using Content.Client.GameObjects.Components.HUD.Inventory; using Content.Client.GameObjects.Components.Mobs; using Content.Client.Interfaces; -using Content.Shared; using Content.Shared.GameTicking; using Content.Shared.Preferences; using Content.Shared.Roles; +using Robust.Client.GameObjects; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; -using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; diff --git a/Content.Client/UserInterface/LobbyGui.cs b/Content.Client/UserInterface/LobbyGui.cs index ad87bc213b..9d613de256 100644 --- a/Content.Client/UserInterface/LobbyGui.cs +++ b/Content.Client/UserInterface/LobbyGui.cs @@ -2,11 +2,11 @@ using Content.Client.Interfaces; using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Graphics; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/UserInterface/OptionsMenu.Audio.cs b/Content.Client/UserInterface/OptionsMenu.Audio.cs index ac3ad087f4..e7f206b55d 100644 --- a/Content.Client/UserInterface/OptionsMenu.Audio.cs +++ b/Content.Client/UserInterface/OptionsMenu.Audio.cs @@ -1,9 +1,9 @@ using Content.Client.UserInterface.Stylesheets; -using Robust.Client.Interfaces.Graphics; +using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared; -using Robust.Shared.Interfaces.Configuration; +using Robust.Shared.Configuration; using Robust.Shared.Localization; namespace Content.Client.UserInterface diff --git a/Content.Client/UserInterface/OptionsMenu.Graphics.cs b/Content.Client/UserInterface/OptionsMenu.Graphics.cs index 7642cd3a90..615f5a99ab 100644 --- a/Content.Client/UserInterface/OptionsMenu.Graphics.cs +++ b/Content.Client/UserInterface/OptionsMenu.Graphics.cs @@ -1,10 +1,9 @@ -using Content.Shared; -using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Graphics; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared; -using Robust.Shared.Interfaces.Configuration; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/UserInterface/OptionsMenu.KeyRebind.cs b/Content.Client/UserInterface/OptionsMenu.KeyRebind.cs index f2448f6516..4d4e4158ba 100644 --- a/Content.Client/UserInterface/OptionsMenu.KeyRebind.cs +++ b/Content.Client/UserInterface/OptionsMenu.KeyRebind.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using Content.Client.UserInterface.Stylesheets; using Content.Shared.Input; using Robust.Client.Input; -using Robust.Client.Interfaces.Input; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Input; diff --git a/Content.Client/UserInterface/OptionsMenu.cs b/Content.Client/UserInterface/OptionsMenu.cs index 41df856416..45f16f043d 100644 --- a/Content.Client/UserInterface/OptionsMenu.cs +++ b/Content.Client/UserInterface/OptionsMenu.cs @@ -1,7 +1,7 @@ -using Robust.Client.Interfaces.Graphics; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.Interfaces.Configuration; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorBoundUserInterface.cs b/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorBoundUserInterface.cs index 1333b48546..3191291bfd 100644 --- a/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorBoundUserInterface.cs +++ b/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorBoundUserInterface.cs @@ -1,7 +1,7 @@ using Content.Shared.GameObjects.Components; using JetBrains.Annotations; -using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Client.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Client.ParticleAccelerator { diff --git a/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs b/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs index 46cc0066fd..c4c6832430 100644 --- a/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs +++ b/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs @@ -1,14 +1,10 @@ using System; -using Content.Client.Animations; using Content.Client.UserInterface; using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; using Content.Shared.GameObjects.Components; using Robust.Client.Animations; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Shaders; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/UserInterface/Placeholder.cs b/Content.Client/UserInterface/Placeholder.cs index d6a196d6c1..6ffeda1c42 100644 --- a/Content.Client/UserInterface/Placeholder.cs +++ b/Content.Client/UserInterface/Placeholder.cs @@ -1,4 +1,4 @@ -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface.Controls; namespace Content.Client.UserInterface diff --git a/Content.Client/UserInterface/StripeBack.cs b/Content.Client/UserInterface/StripeBack.cs index a43ab0c0fe..51e77e010f 100644 --- a/Content.Client/UserInterface/StripeBack.cs +++ b/Content.Client/UserInterface/StripeBack.cs @@ -1,4 +1,4 @@ -using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; using Robust.Shared.Maths; diff --git a/Content.Client/UserInterface/Stylesheets/StyleBase.cs b/Content.Client/UserInterface/Stylesheets/StyleBase.cs index bf62514e8d..40555c8d62 100644 --- a/Content.Client/UserInterface/Stylesheets/StyleBase.cs +++ b/Content.Client/UserInterface/Stylesheets/StyleBase.cs @@ -1,7 +1,6 @@ using Content.Client.Utility; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Shared.Maths; diff --git a/Content.Client/UserInterface/Stylesheets/StyleNano.cs b/Content.Client/UserInterface/Stylesheets/StyleNano.cs index 4f7e058093..858cc803c4 100644 --- a/Content.Client/UserInterface/Stylesheets/StyleNano.cs +++ b/Content.Client/UserInterface/Stylesheets/StyleNano.cs @@ -3,8 +3,7 @@ using Content.Client.GameObjects.EntitySystems; using Content.Client.UserInterface.Controls; using Content.Client.Utility; using Robust.Client.Graphics; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; diff --git a/Content.Client/UserInterface/Stylesheets/StyleSpace.cs b/Content.Client/UserInterface/Stylesheets/StyleSpace.cs index b3d9fcb0d7..f3aa23db4d 100644 --- a/Content.Client/UserInterface/Stylesheets/StyleSpace.cs +++ b/Content.Client/UserInterface/Stylesheets/StyleSpace.cs @@ -1,7 +1,7 @@ using System.Linq; using Content.Client.Utility; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Graphics; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Maths; diff --git a/Content.Client/UserInterface/Stylesheets/StylesheetManager.cs b/Content.Client/UserInterface/Stylesheets/StylesheetManager.cs index c9b8a07047..60f0eb4978 100644 --- a/Content.Client/UserInterface/Stylesheets/StylesheetManager.cs +++ b/Content.Client/UserInterface/Stylesheets/StylesheetManager.cs @@ -1,5 +1,4 @@ -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.Interfaces.UserInterface; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Shared.IoC; diff --git a/Content.Client/UserInterface/Suspicion/SuspicionGui.xaml.cs b/Content.Client/UserInterface/Suspicion/SuspicionGui.xaml.cs index 1ac94bc906..e0a75fd994 100644 --- a/Content.Client/UserInterface/Suspicion/SuspicionGui.xaml.cs +++ b/Content.Client/UserInterface/Suspicion/SuspicionGui.xaml.cs @@ -9,8 +9,7 @@ using Robust.Client.AutoGenerated; using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Client.UserInterface.XAML; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/UserInterface/TargetingDoll.cs b/Content.Client/UserInterface/TargetingDoll.cs index 9d70c818d8..762b73744a 100644 --- a/Content.Client/UserInterface/TargetingDoll.cs +++ b/Content.Client/UserInterface/TargetingDoll.cs @@ -1,7 +1,7 @@ using System; using Content.Client.Utility; using Content.Shared.GameObjects.Components.Mobs; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface.Controls; namespace Content.Client.UserInterface diff --git a/Content.Client/UserInterface/TutorialWindow.cs b/Content.Client/UserInterface/TutorialWindow.cs index 3bd614e109..c644360047 100644 --- a/Content.Client/UserInterface/TutorialWindow.cs +++ b/Content.Client/UserInterface/TutorialWindow.cs @@ -1,6 +1,5 @@ using Robust.Client.Graphics; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.Input; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; diff --git a/Content.Client/Utility/DragDropHelper.cs b/Content.Client/Utility/DragDropHelper.cs index 71add4725f..46c44827b3 100644 --- a/Content.Client/Utility/DragDropHelper.cs +++ b/Content.Client/Utility/DragDropHelper.cs @@ -1,4 +1,4 @@ -using Robust.Client.Interfaces.Input; +using Robust.Client.Input; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Content.Client/Utility/ResourceCacheExtensions.cs b/Content.Client/Utility/ResourceCacheExtensions.cs index c88fbed335..e1b9a704ef 100644 --- a/Content.Client/Utility/ResourceCacheExtensions.cs +++ b/Content.Client/Utility/ResourceCacheExtensions.cs @@ -1,6 +1,5 @@ using JetBrains.Annotations; using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.ResourceManagement; using Robust.Shared.Utility; diff --git a/Content.Client/Utility/UnobstructedExtensions.cs b/Content.Client/Utility/UnobstructedExtensions.cs index ab204bdf96..c954657148 100644 --- a/Content.Client/Utility/UnobstructedExtensions.cs +++ b/Content.Client/Utility/UnobstructedExtensions.cs @@ -1,9 +1,7 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Physics; using Robust.Client.Player; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using static Content.Shared.GameObjects.EntitySystems.SharedInteractionSystem; diff --git a/Content.Client/VendingMachines/VendingMachineMenu.cs b/Content.Client/VendingMachines/VendingMachineMenu.cs index 821fde51b3..0dca214eda 100644 --- a/Content.Client/VendingMachines/VendingMachineMenu.cs +++ b/Content.Client/VendingMachines/VendingMachineMenu.cs @@ -2,10 +2,9 @@ using Content.Client.GameObjects.Components.VendingMachines; using Robust.Client.GameObjects; using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.ResourceManagement; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.IntegrationTests/ContentIntegrationTest.cs b/Content.IntegrationTests/ContentIntegrationTest.cs index e298095260..4f945895e4 100644 --- a/Content.IntegrationTests/ContentIntegrationTest.cs +++ b/Content.IntegrationTests/ContentIntegrationTest.cs @@ -6,13 +6,12 @@ using Content.Server; using Content.Server.Interfaces.GameTicking; using Content.Shared; using NUnit.Framework; -using Robust.Server.Interfaces.Maps; -using Robust.Server.Interfaces.Timing; +using Robust.Server.Maps; +using Robust.Server.Timing; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Map; +using Robust.Shared.Network; using Robust.UnitTesting; namespace Content.IntegrationTests diff --git a/Content.IntegrationTests/DummyGameTicker.cs b/Content.IntegrationTests/DummyGameTicker.cs index 8b8ea88887..d4b10a106a 100644 --- a/Content.IntegrationTests/DummyGameTicker.cs +++ b/Content.IntegrationTests/DummyGameTicker.cs @@ -5,8 +5,8 @@ using Content.Server.Interfaces.GameTicking; using Content.Shared.Roles; using Content.Shared.Preferences; using Content.Server.Mobs; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.Player; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Timing; diff --git a/Content.IntegrationTests/Tests/AI/AiControllerTest.cs b/Content.IntegrationTests/Tests/AI/AiControllerTest.cs index 05cb40616c..e5b3916208 100644 --- a/Content.IntegrationTests/Tests/AI/AiControllerTest.cs +++ b/Content.IntegrationTests/Tests/AI/AiControllerTest.cs @@ -6,12 +6,10 @@ using Content.Shared.Utility; using NUnit.Framework; using Robust.Server.AI; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Prototypes; +using Robust.Shared.Reflection; namespace Content.IntegrationTests.Tests.AI { diff --git a/Content.IntegrationTests/Tests/AI/SpriteTest.cs b/Content.IntegrationTests/Tests/AI/SpriteTest.cs index 4c93b4bfa4..12f5f58474 100644 --- a/Content.IntegrationTests/Tests/AI/SpriteTest.cs +++ b/Content.IntegrationTests/Tests/AI/SpriteTest.cs @@ -1,11 +1,10 @@ #nullable enable using System.Threading.Tasks; using NUnit.Framework; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Client.Interfaces.ResourceManagement; +using Robust.Client.GameObjects; +using Robust.Client.ResourceManagement; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.Map; using Robust.Shared.Prototypes; namespace Content.IntegrationTests.Tests.AI diff --git a/Content.IntegrationTests/Tests/Atmos/AtmosHelpersTest.cs b/Content.IntegrationTests/Tests/Atmos/AtmosHelpersTest.cs index 507c7c2a4a..773ce8b3c2 100644 --- a/Content.IntegrationTests/Tests/Atmos/AtmosHelpersTest.cs +++ b/Content.IntegrationTests/Tests/Atmos/AtmosHelpersTest.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Content.Server.Atmos; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs b/Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs index 6610e1d59f..df4e7dcdb3 100644 --- a/Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs +++ b/Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Atmos; using NUnit.Framework; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.IntegrationTests.Tests.Atmos { diff --git a/Content.IntegrationTests/Tests/Body/LegTest.cs b/Content.IntegrationTests/Tests/Body/LegTest.cs index cd24b653c7..c934148172 100644 --- a/Content.IntegrationTests/Tests/Body/LegTest.cs +++ b/Content.IntegrationTests/Tests/Body/LegTest.cs @@ -5,8 +5,7 @@ using Content.Shared.GameObjects.Components.Body.Part; using Content.Shared.GameObjects.Components.Rotation; using NUnit.Framework; using Robust.Server.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/Body/LungTest.cs b/Content.IntegrationTests/Tests/Body/LungTest.cs index 5c4d66caf7..de734f1997 100644 --- a/Content.IntegrationTests/Tests/Body/LungTest.cs +++ b/Content.IntegrationTests/Tests/Body/LungTest.cs @@ -9,9 +9,8 @@ using Content.Server.GameObjects.Components.Metabolism; using Content.Shared.Atmos; using Content.Shared.GameObjects.Components.Body; using NUnit.Framework; -using Robust.Server.Interfaces.Maps; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Server.Maps; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.IntegrationTests/Tests/Body/MechanismBehaviorEventsTest.cs b/Content.IntegrationTests/Tests/Body/MechanismBehaviorEventsTest.cs index 4e757305e3..808ecb51c5 100644 --- a/Content.IntegrationTests/Tests/Body/MechanismBehaviorEventsTest.cs +++ b/Content.IntegrationTests/Tests/Body/MechanismBehaviorEventsTest.cs @@ -6,8 +6,7 @@ using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Body.Mechanism; using Content.Shared.GameObjects.Components.Body.Part; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs index fe4409a961..25d2eae216 100644 --- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs +++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs @@ -10,8 +10,7 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.EntitySystems.EffectBlocker; using Content.Shared.Utility; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs index 98f940702a..e376bb5a69 100644 --- a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs +++ b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs @@ -4,8 +4,7 @@ using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs.State; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs index e978f10629..06f3c12f98 100644 --- a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs +++ b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs @@ -5,8 +5,8 @@ using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; using Content.Shared; using NUnit.Framework; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Configuration; +using Robust.Shared.GameObjects; using Robust.Shared.Timing; namespace Content.IntegrationTests.Tests.Commands diff --git a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs index 3ab0b0c837..804386ab33 100644 --- a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs +++ b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs @@ -3,10 +3,8 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Items.Storage; using NUnit.Framework; using Robust.Client.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs index 54d27c9760..6ea6c33ed2 100644 --- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs +++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs @@ -3,8 +3,7 @@ using System.Threading.Tasks; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.IntegrationTests.Tests.Damageable diff --git a/Content.IntegrationTests/Tests/DeleteInventoryTest.cs b/Content.IntegrationTests/Tests/DeleteInventoryTest.cs index 4c3782b7fe..71fca5aae4 100644 --- a/Content.IntegrationTests/Tests/DeleteInventoryTest.cs +++ b/Content.IntegrationTests/Tests/DeleteInventoryTest.cs @@ -2,8 +2,7 @@ using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Clothing; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageClassTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageClassTest.cs index b0b88e91f3..87db264268 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageClassTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageClassTest.cs @@ -3,8 +3,7 @@ using Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes; diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs index 0a7c0a623f..caadda8c5f 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs @@ -3,8 +3,7 @@ using Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes; diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs index 2890b390dc..81674edbf0 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs @@ -5,8 +5,7 @@ using Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes; diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs index 70c2668a61..8a8a57ce3f 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs @@ -7,8 +7,7 @@ using Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes; diff --git a/Content.IntegrationTests/Tests/Destructible/TestThresholdListenerComponent.cs b/Content.IntegrationTests/Tests/Destructible/TestThresholdListenerComponent.cs index f0d6258355..4fc80f2bf4 100644 --- a/Content.IntegrationTests/Tests/Destructible/TestThresholdListenerComponent.cs +++ b/Content.IntegrationTests/Tests/Destructible/TestThresholdListenerComponent.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Destructible; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.IntegrationTests.Tests.Destructible { diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs index 0efbb7b69e..b489f5cdc0 100644 --- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs +++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs @@ -5,8 +5,7 @@ using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Disposal; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs index b8eb7ff7f6..d5c58b9364 100644 --- a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs +++ b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs @@ -3,12 +3,10 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components; using Content.Server.GameObjects.EntitySystems.DoAfter; using NUnit.Framework; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; +using Robust.Shared.Timing; namespace Content.IntegrationTests.Tests.DoAfter { diff --git a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs index 818dd3e4e1..f95e1b7881 100644 --- a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs +++ b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs @@ -1,9 +1,7 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Doors; using NUnit.Framework; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Physics; using static Content.Server.GameObjects.Components.Doors.ServerDoorComponent; diff --git a/Content.IntegrationTests/Tests/DummyIconTest.cs b/Content.IntegrationTests/Tests/DummyIconTest.cs index de2dca1b9f..d8846e8a31 100644 --- a/Content.IntegrationTests/Tests/DummyIconTest.cs +++ b/Content.IntegrationTests/Tests/DummyIconTest.cs @@ -1,10 +1,9 @@ -#nullable enable +#nullable enable using System.Linq; using System.Threading.Tasks; using NUnit.Framework; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Shared.GameObjects; +using Robust.Client.ResourceManagement; using Robust.Shared.Prototypes; namespace Content.IntegrationTests.Tests diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index a0a5c77a4f..305a5b7ffb 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -4,10 +4,8 @@ using System.Linq; using System.Threading.Tasks; using Content.Shared.Utility; using NUnit.Framework; -using Robust.Server.Interfaces.Timing; +using Robust.Server.Timing; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Prototypes; diff --git a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs index a574d4551f..078755aa57 100644 --- a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs +++ b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs @@ -4,12 +4,10 @@ using Content.Server.GameObjects.Components.Fluids; using Content.Shared.Chemistry; using Content.Shared.Utility; using NUnit.Framework; -using Robust.Server.Interfaces.Timing; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; +using Robust.Server.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.Map; +using Robust.Shared.Timing; namespace Content.IntegrationTests.Tests.Fluids { diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs index 87dca39b31..f63a39bc4b 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs @@ -7,8 +7,7 @@ using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Body; using NUnit.Framework; using Robust.Server.Console; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs index 675f55f23c..aafd484c81 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Content.Client.GameObjects.Components.Mobs; @@ -10,13 +10,12 @@ using Content.Shared.Actions; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.Utility; using NUnit.Framework; -using Robust.Client.Interfaces.UserInterface; -using Robust.Client.Player; +using Robust.Client.UserInterface; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.Map; +using Robust.Shared.Timing; using Robust.Shared.Utility; +using IPlayerManager = Robust.Server.Player.IPlayerManager; namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs { @@ -65,7 +64,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs await server.WaitIdleAsync(); await client.WaitIdleAsync(); - var serverPlayerManager = server.ResolveDependency(); + var serverPlayerManager = server.ResolveDependency(); var innateActions = new List(); await server.WaitAssertion(() => @@ -91,7 +90,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs await server.WaitRunTicks(5); await client.WaitRunTicks(5); - var clientPlayerMgr = client.ResolveDependency(); + var clientPlayerMgr = client.ResolveDependency(); var clientUIMgr = client.ResolveDependency(); var expectedOrder = new List(); @@ -226,7 +225,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs await server.WaitIdleAsync(); await client.WaitIdleAsync(); - var serverPlayerManager = server.ResolveDependency(); + var serverPlayerManager = server.ResolveDependency(); var serverEntManager = server.ResolveDependency(); var serverGameTiming = server.ResolveDependency(); @@ -273,7 +272,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs await client.WaitRunTicks(5); // check that client has the actions, and toggle the light on via the action slot it was auto-assigned to - var clientPlayerMgr = client.ResolveDependency(); + var clientPlayerMgr = client.ResolveDependency(); var clientUIMgr = client.ResolveDependency(); EntityUid clientFlashlight = default; await client.WaitAssertion(() => diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs index e2d2abaf94..a414292942 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using System.Threading.Tasks; using Content.Client.GameObjects.Components.Mobs; using Content.Client.UserInterface; @@ -6,8 +6,8 @@ using Content.Client.UserInterface.Controls; using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Alert; using NUnit.Framework; -using Robust.Client.Interfaces.UserInterface; -using Robust.Client.Player; +using Robust.Client.UserInterface; +using IPlayerManager = Robust.Server.Player.IPlayerManager; namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs { @@ -24,7 +24,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs await server.WaitIdleAsync(); await client.WaitIdleAsync(); - var serverPlayerManager = server.ResolveDependency(); + var serverPlayerManager = server.ResolveDependency(); await server.WaitAssertion(() => { @@ -42,7 +42,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs await server.WaitRunTicks(5); await client.WaitRunTicks(5); - var clientPlayerMgr = client.ResolveDependency(); + var clientPlayerMgr = client.ResolveDependency(); var clientUIMgr = client.ResolveDependency(); await client.WaitAssertion(() => { diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs index 66f1e85e68..e4db6d3aba 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs @@ -4,9 +4,7 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Movement; using Content.Shared.Physics; using NUnit.Framework; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs index 3ca3b0c6a7..83cae4d383 100644 --- a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs @@ -4,7 +4,7 @@ using Content.Server.GameTicking; using Content.Server.GameTicking.GameRules; using Content.Server.Interfaces.GameTicking; using NUnit.Framework; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.Timing; namespace Content.IntegrationTests.Tests.GameRules { diff --git a/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs b/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs index 261e538d35..a2b2723b64 100644 --- a/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs +++ b/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs @@ -7,8 +7,6 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Utility; using NUnit.Framework; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.Map; namespace Content.IntegrationTests.Tests.Gravity diff --git a/Content.IntegrationTests/Tests/GravityGridTest.cs b/Content.IntegrationTests/Tests/GravityGridTest.cs index 7daaea6994..c620c27133 100644 --- a/Content.IntegrationTests/Tests/GravityGridTest.cs +++ b/Content.IntegrationTests/Tests/GravityGridTest.cs @@ -4,8 +4,7 @@ using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Shared.GameObjects.Components.Gravity; using Content.Shared.Utility; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/GridTileLookupTest.cs b/Content.IntegrationTests/Tests/GridTileLookupTest.cs index c3aaa9e69b..9ea66e9c38 100644 --- a/Content.IntegrationTests/Tests/GridTileLookupTest.cs +++ b/Content.IntegrationTests/Tests/GridTileLookupTest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using NUnit.Framework; -using Robust.Server.GameObjects.EntitySystems.TileLookup; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs index c899568638..07cf5576b5 100644 --- a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs +++ b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs @@ -1,8 +1,7 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.GUI; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs index b6b5afc111..2b5e1ff1f1 100644 --- a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs +++ b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs @@ -1,12 +1,10 @@ -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Client.Utility; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Utility; using NUnit.Framework; -using Robust.Server.GameObjects.Components.Container; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Map; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.IntegrationTests.Tests.Interaction diff --git a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs index 382215145d..c87dbfe770 100644 --- a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs +++ b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs @@ -4,8 +4,7 @@ using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Mobs; using Content.Server.Utility; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs index 218e6a85b6..a6a1cba2bb 100644 --- a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs +++ b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs @@ -1,4 +1,4 @@ -using System.Threading.Tasks; +using System.Threading.Tasks; using Content.Client; using Content.Client.Interfaces; using Content.Client.State; @@ -9,9 +9,9 @@ using Content.Server.Preferences; using Content.Shared; using Content.Shared.Preferences; using NUnit.Framework; -using Robust.Client.Interfaces.State; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Network; +using Robust.Client.State; +using Robust.Shared.Configuration; +using Robust.Shared.Network; namespace Content.IntegrationTests.Tests.Lobby { diff --git a/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs b/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs index f9c5e5b973..945649e71b 100644 --- a/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs +++ b/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs @@ -4,10 +4,9 @@ using Content.Server.Mobs; using Content.Server.Players; using Content.Shared.Utility; using NUnit.Framework; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Server.GameObjects; +using Robust.Server.Player; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/Networking/ConnectTest.cs b/Content.IntegrationTests/Tests/Networking/ConnectTest.cs index 1bf135cc82..a2e1ce57d6 100644 --- a/Content.IntegrationTests/Tests/Networking/ConnectTest.cs +++ b/Content.IntegrationTests/Tests/Networking/ConnectTest.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; using NUnit.Framework; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Enums; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Network; namespace Content.IntegrationTests.Tests.Networking { diff --git a/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs b/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs index 780dd49f02..67fc547885 100644 --- a/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs +++ b/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; using NUnit.Framework; using Robust.Client.Console; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; +using Robust.Shared.Network; namespace Content.IntegrationTests.Tests.Networking { diff --git a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs index a7e5a59fdc..6ff8eee2b5 100644 --- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs +++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs @@ -5,18 +5,14 @@ using System.Threading.Tasks; using Content.Shared.GameObjects; using NUnit.Framework; using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameStates; -using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Reflection; using Robust.Shared.Timing; using System; +using Robust.Client.GameStates; +using Robust.Server.Player; using Robust.Shared.Serialization; namespace Content.IntegrationTests.Tests.Networking diff --git a/Content.IntegrationTests/Tests/Pathfinding/PathfindingChunkTest.cs b/Content.IntegrationTests/Tests/Pathfinding/PathfindingChunkTest.cs index cc5ee8a17d..09ed1a197c 100644 --- a/Content.IntegrationTests/Tests/Pathfinding/PathfindingChunkTest.cs +++ b/Content.IntegrationTests/Tests/Pathfinding/PathfindingChunkTest.cs @@ -2,8 +2,7 @@ using System.Linq; using System.Threading.Tasks; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding; using NUnit.Framework; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index feddf591e5..88e4e79046 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Threading.Tasks; using NUnit.Framework; -using Robust.Shared.Interfaces.Resources; +using Robust.Shared.ContentPack; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.IntegrationTests/Tests/PowerTest.cs b/Content.IntegrationTests/Tests/PowerTest.cs index f7b8f0ce36..51db85c585 100644 --- a/Content.IntegrationTests/Tests/PowerTest.cs +++ b/Content.IntegrationTests/Tests/PowerTest.cs @@ -5,8 +5,7 @@ using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.Components.Power.PowerNetComponents; using Content.Shared.Utility; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/Pulling/PullTest.cs b/Content.IntegrationTests/Tests/Pulling/PullTest.cs index e03392bda9..e1f9954e5e 100644 --- a/Content.IntegrationTests/Tests/Pulling/PullTest.cs +++ b/Content.IntegrationTests/Tests/Pulling/PullTest.cs @@ -3,9 +3,7 @@ using Content.Server.GameObjects.Components.Pulling; using Content.Shared.GameObjects.Components.Pulling; using Content.Shared.Physics.Pull; using NUnit.Framework; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.IntegrationTests.Tests.Pulling diff --git a/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs b/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs index 99df0017fb..7ca2f6f3a5 100644 --- a/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs +++ b/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs @@ -3,8 +3,7 @@ using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; using Content.Shared.GameTicking; using NUnit.Framework; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Reflection; diff --git a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs index d0fac8904a..a5c56e29aa 100644 --- a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs +++ b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs @@ -1,9 +1,8 @@ using System.Threading.Tasks; using NUnit.Framework; -using Robust.Server.Interfaces.Maps; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Resources; +using Robust.Server.Maps; +using Robust.Shared.ContentPack; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs index bacc793736..b9cfb8e30b 100644 --- a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs +++ b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs @@ -2,10 +2,9 @@ using System.Linq; using System.Threading.Tasks; using NUnit.Framework; -using Robust.Server.Interfaces.Maps; -using Robust.Server.Interfaces.Timing; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Resources; +using Robust.Server.Maps; +using Robust.Server.Timing; +using Robust.Shared.ContentPack; using Robust.Shared.Map; using Robust.Shared.Utility; diff --git a/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs b/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs index cce62afc06..a724e9be14 100644 --- a/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs +++ b/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; using Content.Server.GameObjects.EntitySystems.StationEvents; using NUnit.Framework; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Timing; namespace Content.IntegrationTests.Tests.StationEvents { diff --git a/Content.IntegrationTests/Tests/Tag/TagTest.cs b/Content.IntegrationTests/Tests/Tag/TagTest.cs index 90b985fb91..ee23b7afb6 100644 --- a/Content.IntegrationTests/Tests/Tag/TagTest.cs +++ b/Content.IntegrationTests/Tests/Tag/TagTest.cs @@ -4,8 +4,7 @@ using System.Threading.Tasks; using Content.Shared.GameObjects.Components.Tag; using Content.Shared.Prototypes.Tag; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Prototypes; diff --git a/Content.IntegrationTests/Tests/VendingMachineTest.cs b/Content.IntegrationTests/Tests/VendingMachineTest.cs index 52c130610a..6bb5511937 100644 --- a/Content.IntegrationTests/Tests/VendingMachineTest.cs +++ b/Content.IntegrationTests/Tests/VendingMachineTest.cs @@ -1,7 +1,6 @@ using System.Threading.Tasks; using Content.Shared.VendingMachines; using NUnit.Framework; -using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; @@ -38,4 +37,4 @@ namespace Content.IntegrationTests.Tests await server.WaitIdleAsync(); } } -} \ No newline at end of file +} diff --git a/Content.Server/AI/Operators/AiOperator.cs b/Content.Server/AI/Operators/AiOperator.cs index 4714998040..975eb90e1b 100644 --- a/Content.Server/AI/Operators/AiOperator.cs +++ b/Content.Server/AI/Operators/AiOperator.cs @@ -1,6 +1,4 @@ -using System; - namespace Content.Server.AI.Operators { public abstract class AiOperator diff --git a/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs b/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs index 90a174ea34..49bc912171 100644 --- a/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs +++ b/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs @@ -2,7 +2,7 @@ using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Weapon.Melee; using Content.Server.GameObjects.EntitySystems.Click; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Operators.Combat.Melee diff --git a/Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs b/Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs index a614b34c21..2d0c2b8b0e 100644 --- a/Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs +++ b/Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs @@ -1,7 +1,7 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Weapon.Melee; using Content.Server.GameObjects.EntitySystems.Click; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Operators.Combat.Melee diff --git a/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs b/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs index 0b3208588d..44ca81d991 100644 --- a/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs +++ b/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs @@ -3,7 +3,7 @@ using Content.Server.AI.WorldState.States.Inventory; using Content.Server.GameObjects.Components.Items.Storage; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Operators.Inventory { diff --git a/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs b/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs index 94778ff169..faf70677ab 100644 --- a/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs +++ b/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs @@ -1,5 +1,5 @@ using Content.Server.GameObjects.Components.GUI; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Operators.Inventory { diff --git a/Content.Server/AI/Operators/Inventory/DropHandItemsOperator.cs b/Content.Server/AI/Operators/Inventory/DropHandItemsOperator.cs index 65b0ef9f03..4f1a1923c9 100644 --- a/Content.Server/AI/Operators/Inventory/DropHandItemsOperator.cs +++ b/Content.Server/AI/Operators/Inventory/DropHandItemsOperator.cs @@ -1,5 +1,5 @@ using Content.Server.GameObjects.Components.GUI; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Operators.Inventory { diff --git a/Content.Server/AI/Operators/Inventory/EquipEntityOperator.cs b/Content.Server/AI/Operators/Inventory/EquipEntityOperator.cs index 9e1348c5a1..82216f83d4 100644 --- a/Content.Server/AI/Operators/Inventory/EquipEntityOperator.cs +++ b/Content.Server/AI/Operators/Inventory/EquipEntityOperator.cs @@ -1,5 +1,5 @@ using Content.Server.GameObjects.Components.GUI; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Operators.Inventory { diff --git a/Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs b/Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs index 23c559ad47..f7ac5d21a8 100644 --- a/Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs +++ b/Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs @@ -1,7 +1,7 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.EntitySystems.Click; using Content.Shared.Utility; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Operators.Inventory diff --git a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs index fd93d83335..e13c463fc8 100644 --- a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs +++ b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs @@ -5,7 +5,7 @@ using Content.Server.GameObjects.Components.Items.Storage; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Shared.Containers; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Operators.Inventory { diff --git a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs index 060b1a533b..660387da25 100644 --- a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs +++ b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs @@ -4,7 +4,7 @@ using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.EntitySystems.Click; using Content.Shared.Utility; using Robust.Shared.Containers; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Operators.Inventory diff --git a/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs b/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs index 1be054733d..0535bbc1b5 100644 --- a/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs +++ b/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Operators.Inventory { diff --git a/Content.Server/AI/Operators/Movement/MoveToEntityOperator.cs b/Content.Server/AI/Operators/Movement/MoveToEntityOperator.cs index 0327b8b9da..a1e1f88b3a 100644 --- a/Content.Server/AI/Operators/Movement/MoveToEntityOperator.cs +++ b/Content.Server/AI/Operators/Movement/MoveToEntityOperator.cs @@ -1,7 +1,6 @@ using System; using Content.Server.GameObjects.EntitySystems.AI.Steering; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; namespace Content.Server.AI.Operators.Movement diff --git a/Content.Server/AI/Operators/Movement/MoveToGridOperator.cs b/Content.Server/AI/Operators/Movement/MoveToGridOperator.cs index 19f8ef465a..55af609b10 100644 --- a/Content.Server/AI/Operators/Movement/MoveToGridOperator.cs +++ b/Content.Server/AI/Operators/Movement/MoveToGridOperator.cs @@ -1,7 +1,6 @@ using System; using Content.Server.GameObjects.EntitySystems.AI.Steering; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Utility; diff --git a/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs b/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs index 7388ee13b4..531d278bd7 100644 --- a/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs +++ b/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs @@ -3,8 +3,7 @@ using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Nutrition; using Content.Shared.GameObjects.Components.Nutrition; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Random; diff --git a/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs b/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs index 27f74d92c4..dcbf6017a7 100644 --- a/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs +++ b/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs @@ -3,8 +3,7 @@ using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Nutrition; using Content.Shared.GameObjects.Components.Nutrition; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Random; diff --git a/Content.Server/AI/Operators/Sequences/GoPickupEntitySequence.cs b/Content.Server/AI/Operators/Sequences/GoPickupEntitySequence.cs index 48cf084cbe..e7d9471e26 100644 --- a/Content.Server/AI/Operators/Sequences/GoPickupEntitySequence.cs +++ b/Content.Server/AI/Operators/Sequences/GoPickupEntitySequence.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Content.Server.AI.Operators.Inventory; using Content.Server.AI.Operators.Movement; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Operators.Sequences { diff --git a/Content.Server/AI/Utility/Actions/Clothing/Gloves/EquipGloves.cs b/Content.Server/AI/Utility/Actions/Clothing/Gloves/EquipGloves.cs index d3cfcd94cf..8d0658c7ff 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/Gloves/EquipGloves.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/Gloves/EquipGloves.cs @@ -6,7 +6,7 @@ using Content.Server.AI.Utility.Considerations; using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Clothing.Gloves diff --git a/Content.Server/AI/Utility/Actions/Clothing/Gloves/PickUpGloves.cs b/Content.Server/AI/Utility/Actions/Clothing/Gloves/PickUpGloves.cs index 3558bca497..744ddf0c1c 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/Gloves/PickUpGloves.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/Gloves/PickUpGloves.cs @@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.Utility.Considerations.Movement; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Clothing.Gloves diff --git a/Content.Server/AI/Utility/Actions/Clothing/Head/EquipHead.cs b/Content.Server/AI/Utility/Actions/Clothing/Head/EquipHead.cs index c0337464cc..893b3daa48 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/Head/EquipHead.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/Head/EquipHead.cs @@ -6,7 +6,7 @@ using Content.Server.AI.Utility.Considerations; using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Clothing.Head diff --git a/Content.Server/AI/Utility/Actions/Clothing/Head/PickUpHead.cs b/Content.Server/AI/Utility/Actions/Clothing/Head/PickUpHead.cs index ca0ee164d6..fc93ab6313 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/Head/PickUpHead.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/Head/PickUpHead.cs @@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.Utility.Considerations.Movement; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Clothing.Head diff --git a/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/EquipOuterClothing.cs b/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/EquipOuterClothing.cs index 51982ca0e2..df2d3068e0 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/EquipOuterClothing.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/EquipOuterClothing.cs @@ -6,7 +6,7 @@ using Content.Server.AI.Utility.Considerations; using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Clothing.OuterClothing diff --git a/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/PickUpOuterClothing.cs b/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/PickUpOuterClothing.cs index 75e72dfbd9..4b23ab4fa1 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/PickUpOuterClothing.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/PickUpOuterClothing.cs @@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.Utility.Considerations.Movement; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Clothing.OuterClothing diff --git a/Content.Server/AI/Utility/Actions/Clothing/Shoes/EquipShoes.cs b/Content.Server/AI/Utility/Actions/Clothing/Shoes/EquipShoes.cs index 69b5871215..af63780559 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/Shoes/EquipShoes.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/Shoes/EquipShoes.cs @@ -6,7 +6,7 @@ using Content.Server.AI.Utility.Considerations; using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Clothing.Shoes diff --git a/Content.Server/AI/Utility/Actions/Clothing/Shoes/PickUpShoes.cs b/Content.Server/AI/Utility/Actions/Clothing/Shoes/PickUpShoes.cs index 39559bedb6..afe505873a 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/Shoes/PickUpShoes.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/Shoes/PickUpShoes.cs @@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.Utility.Considerations.Movement; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Clothing.Shoes diff --git a/Content.Server/AI/Utility/Actions/Combat/Melee/EquipMelee.cs b/Content.Server/AI/Utility/Actions/Combat/Melee/EquipMelee.cs index bf823ccfb3..19a7610a24 100644 --- a/Content.Server/AI/Utility/Actions/Combat/Melee/EquipMelee.cs +++ b/Content.Server/AI/Utility/Actions/Combat/Melee/EquipMelee.cs @@ -8,7 +8,7 @@ using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Combat; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Combat.Melee diff --git a/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeWeaponAttackEntity.cs b/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeWeaponAttackEntity.cs index d18ce81802..4b2d2d054c 100644 --- a/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeWeaponAttackEntity.cs +++ b/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeWeaponAttackEntity.cs @@ -14,7 +14,7 @@ using Content.Server.AI.WorldState.States.Combat; using Content.Server.AI.WorldState.States.Inventory; using Content.Server.AI.WorldState.States.Movement; using Content.Server.GameObjects.Components.Weapon.Melee; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Combat.Melee diff --git a/Content.Server/AI/Utility/Actions/Combat/Melee/PickUpMeleeWeapon.cs b/Content.Server/AI/Utility/Actions/Combat/Melee/PickUpMeleeWeapon.cs index 495e6dbbc6..dde7602dd8 100644 --- a/Content.Server/AI/Utility/Actions/Combat/Melee/PickUpMeleeWeapon.cs +++ b/Content.Server/AI/Utility/Actions/Combat/Melee/PickUpMeleeWeapon.cs @@ -8,7 +8,7 @@ using Content.Server.AI.Utility.Considerations.Movement; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Combat; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Combat.Melee diff --git a/Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs b/Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs index bd64519dd7..fead7a4db8 100644 --- a/Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs +++ b/Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs @@ -12,7 +12,7 @@ using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Combat; using Content.Server.AI.WorldState.States.Movement; using Content.Server.GameObjects.Components.Weapon.Melee; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Combat.Melee diff --git a/Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs b/Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs index f1ab155f00..703b2f0429 100644 --- a/Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs +++ b/Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs @@ -10,7 +10,7 @@ using Content.Server.AI.Utility.Considerations.State; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Inventory; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Idle diff --git a/Content.Server/AI/Utility/Actions/Idle/WanderAndWait.cs b/Content.Server/AI/Utility/Actions/Idle/WanderAndWait.cs index 0574f10e5a..6f491d2fdd 100644 --- a/Content.Server/AI/Utility/Actions/Idle/WanderAndWait.cs +++ b/Content.Server/AI/Utility/Actions/Idle/WanderAndWait.cs @@ -8,10 +8,7 @@ using Content.Server.AI.Utility.Considerations.ActionBlocker; using Content.Server.AI.WorldState; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Random; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Random; diff --git a/Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs b/Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs index 5adf2af6a7..f2ec596184 100644 --- a/Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs +++ b/Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs @@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Movement; using Content.Server.AI.Utility.Considerations.Nutrition.Drink; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Nutrition.Drink diff --git a/Content.Server/AI/Utility/Actions/Nutrition/Drink/UseDrinkInInventory.cs b/Content.Server/AI/Utility/Actions/Nutrition/Drink/UseDrinkInInventory.cs index 075a1f58f3..4f71379169 100644 --- a/Content.Server/AI/Utility/Actions/Nutrition/Drink/UseDrinkInInventory.cs +++ b/Content.Server/AI/Utility/Actions/Nutrition/Drink/UseDrinkInInventory.cs @@ -8,7 +8,7 @@ using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.Utility.Considerations.Nutrition.Drink; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Nutrition.Drink diff --git a/Content.Server/AI/Utility/Actions/Nutrition/Food/PickUpFood.cs b/Content.Server/AI/Utility/Actions/Nutrition/Food/PickUpFood.cs index 741d611a68..2c5ae8e219 100644 --- a/Content.Server/AI/Utility/Actions/Nutrition/Food/PickUpFood.cs +++ b/Content.Server/AI/Utility/Actions/Nutrition/Food/PickUpFood.cs @@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Movement; using Content.Server.AI.Utility.Considerations.Nutrition.Food; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Nutrition.Food diff --git a/Content.Server/AI/Utility/Actions/Nutrition/Food/UseFoodInInventory.cs b/Content.Server/AI/Utility/Actions/Nutrition/Food/UseFoodInInventory.cs index 4528035a95..6e813ccc7c 100644 --- a/Content.Server/AI/Utility/Actions/Nutrition/Food/UseFoodInInventory.cs +++ b/Content.Server/AI/Utility/Actions/Nutrition/Food/UseFoodInInventory.cs @@ -8,7 +8,7 @@ using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.Utility.Considerations.Nutrition.Food; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.Actions.Nutrition.Food diff --git a/Content.Server/AI/Utility/Actions/Test/MoveRightAndLeftTen.cs b/Content.Server/AI/Utility/Actions/Test/MoveRightAndLeftTen.cs index 545c317a67..82b8c0e738 100644 --- a/Content.Server/AI/Utility/Actions/Test/MoveRightAndLeftTen.cs +++ b/Content.Server/AI/Utility/Actions/Test/MoveRightAndLeftTen.cs @@ -4,7 +4,7 @@ using Content.Server.AI.Operators; using Content.Server.AI.Operators.Movement; using Content.Server.AI.Utility.Considerations; using Content.Server.AI.WorldState; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; diff --git a/Content.Server/AI/Utility/Actions/UtilityAction.cs b/Content.Server/AI/Utility/Actions/UtilityAction.cs index 3fbf978cfc..2ab431acf7 100644 --- a/Content.Server/AI/Utility/Actions/UtilityAction.cs +++ b/Content.Server/AI/Utility/Actions/UtilityAction.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Content.Server.AI.Operators; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States.Utility; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; namespace Content.Server.AI.Utility.Actions diff --git a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs index df0284deed..cb2936ebba 100644 --- a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs +++ b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs @@ -9,12 +9,9 @@ using Content.Server.AI.WorldState.States.Utility; using Content.Server.GameObjects.EntitySystems.AI; using Content.Server.GameObjects.EntitySystems.AI.LoadBalancer; using Content.Server.GameObjects.EntitySystems.JobQueues; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs.State; using Robust.Server.AI; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Utility; diff --git a/Content.Server/AI/Utility/BehaviorSets/BehaviorSet.cs b/Content.Server/AI/Utility/BehaviorSets/BehaviorSet.cs index d5f221a5cd..59bb26dd24 100644 --- a/Content.Server/AI/Utility/BehaviorSets/BehaviorSet.cs +++ b/Content.Server/AI/Utility/BehaviorSets/BehaviorSet.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Content.Server.AI.Utility.Actions; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Utility.BehaviorSets { diff --git a/Content.Server/AI/Utility/BehaviorSets/ClothingBehaviorSet.cs b/Content.Server/AI/Utility/BehaviorSets/ClothingBehaviorSet.cs index eb0530bdb5..2008026a08 100644 --- a/Content.Server/AI/Utility/BehaviorSets/ClothingBehaviorSet.cs +++ b/Content.Server/AI/Utility/BehaviorSets/ClothingBehaviorSet.cs @@ -3,7 +3,7 @@ using Content.Server.AI.Utility.ExpandableActions.Clothing.Gloves; using Content.Server.AI.Utility.ExpandableActions.Clothing.Head; using Content.Server.AI.Utility.ExpandableActions.Clothing.OuterClothing; using Content.Server.AI.Utility.ExpandableActions.Clothing.Shoes; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Utility.BehaviorSets { diff --git a/Content.Server/AI/Utility/BehaviorSets/HungerBehaviorSet.cs b/Content.Server/AI/Utility/BehaviorSets/HungerBehaviorSet.cs index b91b504418..dc6920d4bf 100644 --- a/Content.Server/AI/Utility/BehaviorSets/HungerBehaviorSet.cs +++ b/Content.Server/AI/Utility/BehaviorSets/HungerBehaviorSet.cs @@ -1,6 +1,6 @@ using Content.Server.AI.Utility.Actions; using Content.Server.AI.Utility.ExpandableActions.Nutrition; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Utility.BehaviorSets { diff --git a/Content.Server/AI/Utility/BehaviorSets/IdleBehaviorSet.cs b/Content.Server/AI/Utility/BehaviorSets/IdleBehaviorSet.cs index ac1b843585..dc9640b35f 100644 --- a/Content.Server/AI/Utility/BehaviorSets/IdleBehaviorSet.cs +++ b/Content.Server/AI/Utility/BehaviorSets/IdleBehaviorSet.cs @@ -1,6 +1,6 @@ using Content.Server.AI.Utility.Actions; using Content.Server.AI.Utility.Actions.Idle; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Utility.BehaviorSets { diff --git a/Content.Server/AI/Utility/BehaviorSets/PathingDummyBehaviorSet.cs b/Content.Server/AI/Utility/BehaviorSets/PathingDummyBehaviorSet.cs index cb90072b53..f11cf9a099 100644 --- a/Content.Server/AI/Utility/BehaviorSets/PathingDummyBehaviorSet.cs +++ b/Content.Server/AI/Utility/BehaviorSets/PathingDummyBehaviorSet.cs @@ -1,6 +1,6 @@ using Content.Server.AI.Utility.Actions; using Content.Server.AI.Utility.Actions.Test; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Utility.BehaviorSets { diff --git a/Content.Server/AI/Utility/BehaviorSets/SpirateBehaviorSet.cs b/Content.Server/AI/Utility/BehaviorSets/SpirateBehaviorSet.cs index 29f0ec72cb..7013390fbd 100644 --- a/Content.Server/AI/Utility/BehaviorSets/SpirateBehaviorSet.cs +++ b/Content.Server/AI/Utility/BehaviorSets/SpirateBehaviorSet.cs @@ -1,6 +1,6 @@ using Content.Server.AI.Utility.Actions; using Content.Server.AI.Utility.ExpandableActions.Combat.Melee; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Utility.BehaviorSets { diff --git a/Content.Server/AI/Utility/BehaviorSets/ThirstBehaviorSet.cs b/Content.Server/AI/Utility/BehaviorSets/ThirstBehaviorSet.cs index cc38d1babb..64cb60a751 100644 --- a/Content.Server/AI/Utility/BehaviorSets/ThirstBehaviorSet.cs +++ b/Content.Server/AI/Utility/BehaviorSets/ThirstBehaviorSet.cs @@ -1,6 +1,6 @@ using Content.Server.AI.Utility.Actions; using Content.Server.AI.Utility.ExpandableActions.Nutrition; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Utility.BehaviorSets { diff --git a/Content.Server/AI/Utility/BehaviorSets/UnarmedAttackPlayersBehaviorSet.cs b/Content.Server/AI/Utility/BehaviorSets/UnarmedAttackPlayersBehaviorSet.cs index 6b479b87e9..0dd77c6025 100644 --- a/Content.Server/AI/Utility/BehaviorSets/UnarmedAttackPlayersBehaviorSet.cs +++ b/Content.Server/AI/Utility/BehaviorSets/UnarmedAttackPlayersBehaviorSet.cs @@ -1,6 +1,6 @@ using Content.Server.AI.Utility.Actions; using Content.Server.AI.Utility.ExpandableActions.Combat.Melee; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Utility.BehaviorSets { diff --git a/Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs b/Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs index b53c0d0190..068bed08af 100644 --- a/Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs +++ b/Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs @@ -1,6 +1,5 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; namespace Content.Server.AI.Utility.Considerations.ActionBlocker diff --git a/Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs b/Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs index ae2ed521d1..ebf80fc142 100644 --- a/Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs +++ b/Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs @@ -1,6 +1,5 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs.State; namespace Content.Server.AI.Utility.Considerations.Combat diff --git a/Content.Server/AI/Utility/Considerations/Combat/TargetIsDeadCon.cs b/Content.Server/AI/Utility/Considerations/Combat/TargetIsDeadCon.cs index 8eb020f443..8cd4998719 100644 --- a/Content.Server/AI/Utility/Considerations/Combat/TargetIsDeadCon.cs +++ b/Content.Server/AI/Utility/Considerations/Combat/TargetIsDeadCon.cs @@ -1,6 +1,5 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs.State; namespace Content.Server.AI.Utility.Considerations.Combat diff --git a/Content.Server/AI/Utility/Considerations/ConsiderationsManager.cs b/Content.Server/AI/Utility/Considerations/ConsiderationsManager.cs index 629da77df2..81eb727a44 100644 --- a/Content.Server/AI/Utility/Considerations/ConsiderationsManager.cs +++ b/Content.Server/AI/Utility/Considerations/ConsiderationsManager.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; +using Robust.Shared.Reflection; namespace Content.Server.AI.Utility.Considerations { diff --git a/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs b/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs index 2f93ace5ae..961d51c6f1 100644 --- a/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs +++ b/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs @@ -4,7 +4,7 @@ using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible; using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.Containers; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Utility.Considerations.Containers { diff --git a/Content.Server/AI/Utility/Considerations/State/StoredStateEntityIsNullCon.cs b/Content.Server/AI/Utility/Considerations/State/StoredStateEntityIsNullCon.cs index 76fd3fd176..fde48342fe 100644 --- a/Content.Server/AI/Utility/Considerations/State/StoredStateEntityIsNullCon.cs +++ b/Content.Server/AI/Utility/Considerations/State/StoredStateEntityIsNullCon.cs @@ -1,7 +1,7 @@ using System; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States.Utility; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Utility.Considerations.State { diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs index 0846361441..b825065e01 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs @@ -8,7 +8,7 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.EntitySystems.AI; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.ExpandableActions.Combat.Melee diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyPlayerExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyPlayerExp.cs index 26f8443426..803c335444 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyPlayerExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyPlayerExp.cs @@ -8,7 +8,7 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.EntitySystems.AI; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.Utility.ExpandableActions.Combat.Melee diff --git a/Content.Server/AI/Utility/UtilityAiHelpers.cs b/Content.Server/AI/Utility/UtilityAiHelpers.cs index a15cd5c9c2..b8f0e02036 100644 --- a/Content.Server/AI/Utility/UtilityAiHelpers.cs +++ b/Content.Server/AI/Utility/UtilityAiHelpers.cs @@ -1,7 +1,7 @@ using Content.Server.AI.Utility.AiLogic; using Content.Server.AI.WorldState; using Content.Server.GameObjects.Components.Movement; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.Utility { diff --git a/Content.Server/AI/Utils/Visibility.cs b/Content.Server/AI/Utils/Visibility.cs index d79f9f0db9..238d6b90c7 100644 --- a/Content.Server/AI/Utils/Visibility.cs +++ b/Content.Server/AI/Utils/Visibility.cs @@ -4,11 +4,10 @@ using System.Linq; using Content.Server.GameObjects.Components.Movement; using Content.Shared.Physics; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Physics; namespace Content.Server.AI.Utils { diff --git a/Content.Server/AI/WorldState/Blackboard.cs b/Content.Server/AI/WorldState/Blackboard.cs index 0b7b2bd8f6..eb33315fac 100644 --- a/Content.Server/AI/WorldState/Blackboard.cs +++ b/Content.Server/AI/WorldState/Blackboard.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.WorldState diff --git a/Content.Server/AI/WorldState/BlackboardManager.cs b/Content.Server/AI/WorldState/BlackboardManager.cs index 1e6d17a85d..db33bb8b49 100644 --- a/Content.Server/AI/WorldState/BlackboardManager.cs +++ b/Content.Server/AI/WorldState/BlackboardManager.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; +using Robust.Shared.Reflection; using Robust.Shared.Utility; namespace Content.Server.AI.WorldState diff --git a/Content.Server/AI/WorldState/StateData.cs b/Content.Server/AI/WorldState/StateData.cs index 684f8e250e..850faa2cdf 100644 --- a/Content.Server/AI/WorldState/StateData.cs +++ b/Content.Server/AI/WorldState/StateData.cs @@ -1,7 +1,7 @@ using System; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Timing; namespace Content.Server.AI.WorldState { diff --git a/Content.Server/AI/WorldState/States/Clothing/EquippedClothingState.cs b/Content.Server/AI/WorldState/States/Clothing/EquippedClothingState.cs index 694697a49b..8d305c44d9 100644 --- a/Content.Server/AI/WorldState/States/Clothing/EquippedClothingState.cs +++ b/Content.Server/AI/WorldState/States/Clothing/EquippedClothingState.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.GUI; using Content.Shared.GameObjects.Components.Inventory; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.WorldState.States.Clothing { diff --git a/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs b/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs index 0447f6c5a6..4845bfa663 100644 --- a/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs +++ b/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs @@ -5,7 +5,7 @@ using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Movement; using JetBrains.Annotations; using Robust.Shared.Containers; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.WorldState.States.Clothing { diff --git a/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyMeleeWeapons.cs b/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyMeleeWeapons.cs index 89cc63dc25..458e6f5518 100644 --- a/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyMeleeWeapons.cs +++ b/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyMeleeWeapons.cs @@ -3,7 +3,7 @@ using Content.Server.AI.Utils; using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.Components.Weapon.Melee; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.WorldState.States.Combat.Nearby { diff --git a/Content.Server/AI/WorldState/States/Combat/WeaponEntityState.cs b/Content.Server/AI/WorldState/States/Combat/WeaponEntityState.cs index c148d379fa..369c7afd02 100644 --- a/Content.Server/AI/WorldState/States/Combat/WeaponEntityState.cs +++ b/Content.Server/AI/WorldState/States/Combat/WeaponEntityState.cs @@ -1,5 +1,5 @@ using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.WorldState.States.Combat { diff --git a/Content.Server/AI/WorldState/States/Hands/HandItemsState.cs b/Content.Server/AI/WorldState/States/Hands/HandItemsState.cs index 41bb9b5081..dc8e0c9902 100644 --- a/Content.Server/AI/WorldState/States/Hands/HandItemsState.cs +++ b/Content.Server/AI/WorldState/States/Hands/HandItemsState.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.GUI; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.WorldState.States.Hands { diff --git a/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs b/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs index 88426963ba..11a90465e0 100644 --- a/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs +++ b/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.GUI; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.WorldState.States.Inventory { diff --git a/Content.Server/AI/WorldState/States/Inventory/InventoryState.cs b/Content.Server/AI/WorldState/States/Inventory/InventoryState.cs index 8f9701a9ee..695fb488e9 100644 --- a/Content.Server/AI/WorldState/States/Inventory/InventoryState.cs +++ b/Content.Server/AI/WorldState/States/Inventory/InventoryState.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.GUI; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.WorldState.States.Inventory { diff --git a/Content.Server/AI/WorldState/States/Inventory/LastOpenedStorageState.cs b/Content.Server/AI/WorldState/States/Inventory/LastOpenedStorageState.cs index 0df276ee3a..ec309c554d 100644 --- a/Content.Server/AI/WorldState/States/Inventory/LastOpenedStorageState.cs +++ b/Content.Server/AI/WorldState/States/Inventory/LastOpenedStorageState.cs @@ -1,5 +1,5 @@ using Content.Server.GameObjects.Components.Items.Storage; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Log; namespace Content.Server.AI.WorldState.States.Inventory diff --git a/Content.Server/AI/WorldState/States/Mobs/NearbyBodiesState.cs b/Content.Server/AI/WorldState/States/Mobs/NearbyBodiesState.cs index 54dc776808..764406e0f8 100644 --- a/Content.Server/AI/WorldState/States/Mobs/NearbyBodiesState.cs +++ b/Content.Server/AI/WorldState/States/Mobs/NearbyBodiesState.cs @@ -3,7 +3,7 @@ using Content.Server.AI.Utils; using Content.Server.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Body; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.WorldState.States.Mobs { diff --git a/Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs b/Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs index d915006a3a..d974a2cd01 100644 --- a/Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs +++ b/Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs @@ -2,8 +2,8 @@ using Content.Server.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Damage; using JetBrains.Annotations; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.Player; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.AI.WorldState.States.Mobs diff --git a/Content.Server/AI/WorldState/States/Movement/MoveTargetState.cs b/Content.Server/AI/WorldState/States/Movement/MoveTargetState.cs index 44d520832c..0acfa56ceb 100644 --- a/Content.Server/AI/WorldState/States/Movement/MoveTargetState.cs +++ b/Content.Server/AI/WorldState/States/Movement/MoveTargetState.cs @@ -1,5 +1,5 @@ using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.WorldState.States.Movement { diff --git a/Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs b/Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs index e01662b2bc..b8574ea998 100644 --- a/Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs +++ b/Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs @@ -5,7 +5,7 @@ using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.Components.Nutrition; using JetBrains.Annotations; using Robust.Shared.Containers; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.WorldState.States.Nutrition { diff --git a/Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs b/Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs index 60f02346b5..7abc8ab27d 100644 --- a/Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs +++ b/Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs @@ -5,7 +5,7 @@ using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.Components.Nutrition; using JetBrains.Annotations; using Robust.Shared.Containers; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.WorldState.States.Nutrition { diff --git a/Content.Server/AI/WorldState/States/SelfState.cs b/Content.Server/AI/WorldState/States/SelfState.cs index 9f77743565..dc1ed00ac8 100644 --- a/Content.Server/AI/WorldState/States/SelfState.cs +++ b/Content.Server/AI/WorldState/States/SelfState.cs @@ -1,5 +1,5 @@ using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.WorldState.States { diff --git a/Content.Server/AI/WorldState/States/TargetEntityState.cs b/Content.Server/AI/WorldState/States/TargetEntityState.cs index 33ea22ff75..de5b7edb2d 100644 --- a/Content.Server/AI/WorldState/States/TargetEntityState.cs +++ b/Content.Server/AI/WorldState/States/TargetEntityState.cs @@ -1,5 +1,5 @@ using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.AI.WorldState.States { diff --git a/Content.Server/Actions/DebugInstant.cs b/Content.Server/Actions/DebugInstant.cs index b136bd506e..568d3827a9 100644 --- a/Content.Server/Actions/DebugInstant.cs +++ b/Content.Server/Actions/DebugInstant.cs @@ -2,7 +2,6 @@ using Content.Shared.Actions; using Content.Shared.Utility; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.Actions diff --git a/Content.Server/Actions/DebugTargetEntity.cs b/Content.Server/Actions/DebugTargetEntity.cs index d1dd45ef7b..0809a33e72 100644 --- a/Content.Server/Actions/DebugTargetEntity.cs +++ b/Content.Server/Actions/DebugTargetEntity.cs @@ -1,7 +1,6 @@ using Content.Server.Utility; using Content.Shared.Actions; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.Actions diff --git a/Content.Server/Actions/DebugTargetPoint.cs b/Content.Server/Actions/DebugTargetPoint.cs index d87ad502d1..3e1b831bf6 100644 --- a/Content.Server/Actions/DebugTargetPoint.cs +++ b/Content.Server/Actions/DebugTargetPoint.cs @@ -1,9 +1,6 @@ -using Content.Server.Utility; +using Content.Server.Utility; using Content.Shared.Actions; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.IoC; using Robust.Shared.Serialization; namespace Content.Server.Actions diff --git a/Content.Server/Actions/DebugToggle.cs b/Content.Server/Actions/DebugToggle.cs index 483eba1acd..92b002c463 100644 --- a/Content.Server/Actions/DebugToggle.cs +++ b/Content.Server/Actions/DebugToggle.cs @@ -1,7 +1,6 @@ using Content.Server.Utility; using Content.Shared.Actions; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.Actions diff --git a/Content.Server/Actions/DisarmAction.cs b/Content.Server/Actions/DisarmAction.cs index baff6d9b7b..5960b4636b 100644 --- a/Content.Server/Actions/DisarmAction.cs +++ b/Content.Server/Actions/DisarmAction.cs @@ -1,27 +1,18 @@ #nullable enable using System; using System.Linq; -using Content.Server.GameObjects.Components.GUI; -using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.Components.Pulling; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameObjects; using Content.Server.Utility; using Content.Shared.Actions; using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Mobs; -using Content.Shared.GameObjects.Components.Pulling; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces; using Content.Shared.Utility; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Audio; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Serialization; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Server/Actions/ScreamAction.cs b/Content.Server/Actions/ScreamAction.cs index b1d5cfd3bb..542ad73840 100644 --- a/Content.Server/Actions/ScreamAction.cs +++ b/Content.Server/Actions/ScreamAction.cs @@ -4,16 +4,13 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Actions; using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Mobs; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Preferences; using Content.Shared.Utility; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.Audio; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Random; using Robust.Shared.Serialization; diff --git a/Content.Server/Administration/AdminManager.cs b/Content.Server/Administration/AdminManager.cs index c66d4163d1..3b8b6f9bfb 100644 --- a/Content.Server/Administration/AdminManager.cs +++ b/Content.Server/Administration/AdminManager.cs @@ -12,13 +12,11 @@ using Content.Shared; using Content.Shared.Administration; using Content.Shared.Network.NetMessages; using Robust.Server.Console; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; +using Robust.Shared.Configuration; using Robust.Shared.Console; +using Robust.Shared.ContentPack; using Robust.Shared.Enums; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Network; diff --git a/Content.Server/Administration/AdminPermsChangedEventArgs.cs b/Content.Server/Administration/AdminPermsChangedEventArgs.cs index de2a7b0dbd..dee717e69b 100644 --- a/Content.Server/Administration/AdminPermsChangedEventArgs.cs +++ b/Content.Server/Administration/AdminPermsChangedEventArgs.cs @@ -1,6 +1,6 @@ using System; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; namespace Content.Server.Administration { diff --git a/Content.Server/Administration/Commands/AGhost.cs b/Content.Server/Administration/Commands/AGhost.cs index 7d7bd0720f..9ec7adab07 100644 --- a/Content.Server/Administration/Commands/AGhost.cs +++ b/Content.Server/Administration/Commands/AGhost.cs @@ -1,11 +1,10 @@ -using Content.Server.Commands.Observer; -using Content.Server.GameObjects.Components.Observer; +using Content.Server.GameObjects.Components.Observer; using Content.Server.Interfaces.GameTicking; using Content.Server.Players; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Administration.Commands diff --git a/Content.Server/Administration/Commands/BanCommand.cs b/Content.Server/Administration/Commands/BanCommand.cs index 3d906be036..62878d364d 100644 --- a/Content.Server/Administration/Commands/BanCommand.cs +++ b/Content.Server/Administration/Commands/BanCommand.cs @@ -1,7 +1,7 @@ using System; using Content.Server.Database; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; using Robust.Shared.Network; diff --git a/Content.Server/Administration/Commands/ControlMob.cs b/Content.Server/Administration/Commands/ControlMob.cs index 2e830269df..aff1e4526c 100644 --- a/Content.Server/Administration/Commands/ControlMob.cs +++ b/Content.Server/Administration/Commands/ControlMob.cs @@ -2,10 +2,9 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Observer; using Content.Server.Players; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/Administration/Commands/DSay.cs b/Content.Server/Administration/Commands/DSay.cs index b2a1d021af..486e3d5c86 100644 --- a/Content.Server/Administration/Commands/DSay.cs +++ b/Content.Server/Administration/Commands/DSay.cs @@ -1,6 +1,6 @@ using Content.Server.Interfaces.Chat; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/Administration/Commands/DeAdminCommand.cs b/Content.Server/Administration/Commands/DeAdminCommand.cs index 057d942218..f50db7c038 100644 --- a/Content.Server/Administration/Commands/DeAdminCommand.cs +++ b/Content.Server/Administration/Commands/DeAdminCommand.cs @@ -1,6 +1,6 @@ using Content.Shared.Administration; using JetBrains.Annotations; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Administration/Commands/DeleteComponent.cs b/Content.Server/Administration/Commands/DeleteComponent.cs index 5e6941b52f..8c05561cc9 100644 --- a/Content.Server/Administration/Commands/DeleteComponent.cs +++ b/Content.Server/Administration/Commands/DeleteComponent.cs @@ -1,8 +1,7 @@ #nullable enable using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Administration.Commands diff --git a/Content.Server/Administration/Commands/DeleteEntitiesWithComponent.cs b/Content.Server/Administration/Commands/DeleteEntitiesWithComponent.cs index c8849b1e2b..7d48800577 100644 --- a/Content.Server/Administration/Commands/DeleteEntitiesWithComponent.cs +++ b/Content.Server/Administration/Commands/DeleteEntitiesWithComponent.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/Administration/Commands/DeleteEntitiesWithId.cs b/Content.Server/Administration/Commands/DeleteEntitiesWithId.cs index 8ff64ce231..167a98c751 100644 --- a/Content.Server/Administration/Commands/DeleteEntitiesWithId.cs +++ b/Content.Server/Administration/Commands/DeleteEntitiesWithId.cs @@ -1,9 +1,7 @@ #nullable enable using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Administration.Commands diff --git a/Content.Server/Administration/Commands/ExplosionCommand.cs b/Content.Server/Administration/Commands/ExplosionCommand.cs index eef777b895..588579a155 100644 --- a/Content.Server/Administration/Commands/ExplosionCommand.cs +++ b/Content.Server/Administration/Commands/ExplosionCommand.cs @@ -1,6 +1,6 @@ using Content.Server.Explosions; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.Map; diff --git a/Content.Server/Administration/Commands/OpenPermissionsCommand.cs b/Content.Server/Administration/Commands/OpenPermissionsCommand.cs index eeb8551f0a..ecf736c2c6 100644 --- a/Content.Server/Administration/Commands/OpenPermissionsCommand.cs +++ b/Content.Server/Administration/Commands/OpenPermissionsCommand.cs @@ -1,6 +1,6 @@ using Content.Server.Eui; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Administration/Commands/PromoteHostCommand.cs b/Content.Server/Administration/Commands/PromoteHostCommand.cs index b81efefb04..308f678973 100644 --- a/Content.Server/Administration/Commands/PromoteHostCommand.cs +++ b/Content.Server/Administration/Commands/PromoteHostCommand.cs @@ -1,6 +1,6 @@ #nullable enable using JetBrains.Annotations; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Administration/Commands/ReAdminCommand.cs b/Content.Server/Administration/Commands/ReAdminCommand.cs index 100bdf92ef..04747b8c4a 100644 --- a/Content.Server/Administration/Commands/ReAdminCommand.cs +++ b/Content.Server/Administration/Commands/ReAdminCommand.cs @@ -1,4 +1,4 @@ -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Administration/Commands/ReadyAll.cs b/Content.Server/Administration/Commands/ReadyAll.cs index f37ef7c7dd..205b794f99 100644 --- a/Content.Server/Administration/Commands/ReadyAll.cs +++ b/Content.Server/Administration/Commands/ReadyAll.cs @@ -2,7 +2,7 @@ using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Administration/Commands/Rejuvenate.cs b/Content.Server/Administration/Commands/Rejuvenate.cs index 7134e5d590..5350969026 100644 --- a/Content.Server/Administration/Commands/Rejuvenate.cs +++ b/Content.Server/Administration/Commands/Rejuvenate.cs @@ -1,9 +1,8 @@ using Content.Server.GlobalVerbs; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/Administration/Commands/SetMindCommand.cs b/Content.Server/Administration/Commands/SetMindCommand.cs index b868c9f20e..0cdc6c97cc 100644 --- a/Content.Server/Administration/Commands/SetMindCommand.cs +++ b/Content.Server/Administration/Commands/SetMindCommand.cs @@ -3,10 +3,9 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.Mobs; using Content.Server.Players; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs index ea6b84bc8a..c4cda4a73c 100644 --- a/Content.Server/Administration/Commands/SetOutfitCommand.cs +++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs @@ -3,10 +3,9 @@ using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Shared.Administration; using Content.Shared.Roles; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Prototypes; diff --git a/Content.Server/Administration/Commands/WarpCommand.cs b/Content.Server/Administration/Commands/WarpCommand.cs index 9170dc2da0..f46f7c2fca 100644 --- a/Content.Server/Administration/Commands/WarpCommand.cs +++ b/Content.Server/Administration/Commands/WarpCommand.cs @@ -2,12 +2,10 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Markers; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.Enums; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/Administration/IAdminManager.cs b/Content.Server/Administration/IAdminManager.cs index 6137387669..cb7ba4b71d 100644 --- a/Content.Server/Administration/IAdminManager.cs +++ b/Content.Server/Administration/IAdminManager.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; #nullable enable diff --git a/Content.Server/Administration/PermissionsEui.cs b/Content.Server/Administration/PermissionsEui.cs index c59c35ebc0..573e360ebf 100644 --- a/Content.Server/Administration/PermissionsEui.cs +++ b/Content.Server/Administration/PermissionsEui.cs @@ -6,7 +6,7 @@ using Content.Server.Database; using Content.Server.Eui; using Content.Shared.Administration; using Content.Shared.Eui; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Network; diff --git a/Content.Server/Alert/Click/RemoveCuffs.cs b/Content.Server/Alert/Click/RemoveCuffs.cs index 07d90bfd55..06f615a2ec 100644 --- a/Content.Server/Alert/Click/RemoveCuffs.cs +++ b/Content.Server/Alert/Click/RemoveCuffs.cs @@ -2,7 +2,6 @@ using Content.Server.GameObjects.Components.ActionBlocking; using Content.Shared.Alert; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.Alert.Click diff --git a/Content.Server/Alert/Click/ResistFire.cs b/Content.Server/Alert/Click/ResistFire.cs index 66e0c3b0c0..7f45cfa408 100644 --- a/Content.Server/Alert/Click/ResistFire.cs +++ b/Content.Server/Alert/Click/ResistFire.cs @@ -1,7 +1,6 @@ using Content.Server.GameObjects.Components.Atmos; using Content.Shared.Alert; using JetBrains.Annotations; - using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.Alert.Click diff --git a/Content.Server/Alert/Click/StopPiloting.cs b/Content.Server/Alert/Click/StopPiloting.cs index d191b411f9..2b27062bbe 100644 --- a/Content.Server/Alert/Click/StopPiloting.cs +++ b/Content.Server/Alert/Click/StopPiloting.cs @@ -1,7 +1,6 @@ using Content.Server.GameObjects.Components.Movement; using Content.Shared.Alert; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.Alert.Click diff --git a/Content.Server/Alert/Click/StopPulling.cs b/Content.Server/Alert/Click/StopPulling.cs index f378bb582d..b0bde32872 100644 --- a/Content.Server/Alert/Click/StopPulling.cs +++ b/Content.Server/Alert/Click/StopPulling.cs @@ -2,8 +2,7 @@ using Content.Shared.GameObjects.Components.Pulling; using Content.Shared.GameObjects.EntitySystems; using JetBrains.Annotations; - using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Alert.Click diff --git a/Content.Server/Alert/Click/Unbuckle.cs b/Content.Server/Alert/Click/Unbuckle.cs index e590d584bf..48d3e182de 100644 --- a/Content.Server/Alert/Click/Unbuckle.cs +++ b/Content.Server/Alert/Click/Unbuckle.cs @@ -2,7 +2,6 @@ using Content.Shared.Alert; using Robust.Shared.Serialization; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Serialization; namespace Content.Server.Alert.Click { diff --git a/Content.Server/Atmos/AtmosHelpers.cs b/Content.Server/Atmos/AtmosHelpers.cs index 2761bf3457..02c51839c3 100644 --- a/Content.Server/Atmos/AtmosHelpers.cs +++ b/Content.Server/Atmos/AtmosHelpers.cs @@ -2,9 +2,7 @@ using System.Diagnostics.CodeAnalysis; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Atmos; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/Atmos/EntityNetworkUtils.cs b/Content.Server/Atmos/EntityNetworkUtils.cs index 1a00fe83b9..7b1671b6e6 100644 --- a/Content.Server/Atmos/EntityNetworkUtils.cs +++ b/Content.Server/Atmos/EntityNetworkUtils.cs @@ -1,5 +1,4 @@ using System; -using Robust.Shared.Map; using Robust.Shared.Maths; namespace Content.Server.Atmos diff --git a/Content.Server/Atmos/FireEvent.cs b/Content.Server/Atmos/FireEvent.cs index a425fcca6d..2007f61aec 100644 --- a/Content.Server/Atmos/FireEvent.cs +++ b/Content.Server/Atmos/FireEvent.cs @@ -1,6 +1,4 @@ -using Robust.Shared.GameObjects; - -namespace Content.Server.Atmos +namespace Content.Server.Atmos { public interface IFireAct { diff --git a/Content.Server/Atmos/GasMixture.cs b/Content.Server/Atmos/GasMixture.cs index a1644dfa21..be9cb63c56 100644 --- a/Content.Server/Atmos/GasMixture.cs +++ b/Content.Server/Atmos/GasMixture.cs @@ -7,8 +7,7 @@ using Content.Server.Atmos.Reactions; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Shared.Atmos; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/Atmos/HighPressureMovementController.cs b/Content.Server/Atmos/HighPressureMovementController.cs index 352a5d77f8..e2e47c0663 100644 --- a/Content.Server/Atmos/HighPressureMovementController.cs +++ b/Content.Server/Atmos/HighPressureMovementController.cs @@ -3,8 +3,7 @@ using System; using Content.Server.GameObjects.Components.Atmos; using Content.Shared.Atmos; using Content.Shared.Physics; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.Random; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/Atmos/IGridAtmosphereComponent.cs b/Content.Server/Atmos/IGridAtmosphereComponent.cs index 016551464c..2405b56859 100644 --- a/Content.Server/Atmos/IGridAtmosphereComponent.cs +++ b/Content.Server/Atmos/IGridAtmosphereComponent.cs @@ -4,7 +4,7 @@ using Content.Server.GameObjects.Components.Atmos; using Content.Server.GameObjects.Components.Atmos.Piping; using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Content.Shared.Atmos; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/Atmos/ITemperatureExpose.cs b/Content.Server/Atmos/ITemperatureExpose.cs index 8b9cfa2d2f..bb53294c77 100644 --- a/Content.Server/Atmos/ITemperatureExpose.cs +++ b/Content.Server/Atmos/ITemperatureExpose.cs @@ -1,7 +1,4 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.Map; - -namespace Content.Server.Atmos +namespace Content.Server.Atmos { public interface ITemperatureExpose { diff --git a/Content.Server/Atmos/Reactions/GasReactionPrototype.cs b/Content.Server/Atmos/Reactions/GasReactionPrototype.cs index ceb3c0bbb8..8e4e6718a4 100644 --- a/Content.Server/Atmos/Reactions/GasReactionPrototype.cs +++ b/Content.Server/Atmos/Reactions/GasReactionPrototype.cs @@ -1,9 +1,8 @@ -using System; +using System; using System.Collections.Generic; using Content.Server.Interfaces; using Content.Shared.Atmos; -using Robust.Server.GameObjects.EntitySystems.TileLookup; -using Robust.Shared.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using YamlDotNet.RepresentationModel; diff --git a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs index 77bcf4647d..ae4197b3a8 100644 --- a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs +++ b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs @@ -1,12 +1,10 @@ -#nullable enable +#nullable enable using System; using Content.Server.Interfaces; using Content.Server.Utility; using Content.Shared.Atmos; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems.TileLookup; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Server.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Atmos.Reactions diff --git a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs index ffe677c71a..4a5109d5e2 100644 --- a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs +++ b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs @@ -1,11 +1,9 @@ -#nullable enable +#nullable enable using Content.Server.Interfaces; using Content.Server.Utility; using Content.Shared.Atmos; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems.TileLookup; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Server.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Atmos.Reactions diff --git a/Content.Server/Atmos/TileAtmosphere.cs b/Content.Server/Atmos/TileAtmosphere.cs index 4b3d894894..274a31cced 100644 --- a/Content.Server/Atmos/TileAtmosphere.cs +++ b/Content.Server/Atmos/TileAtmosphere.cs @@ -1,4 +1,4 @@ -#nullable enable annotations +#nullable enable annotations using System; using System.Buffers; using System.Collections.Generic; @@ -11,14 +11,9 @@ using Content.Shared.Atmos; using Content.Shared.Audio; using Content.Shared.Maps; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.GameObjects.EntitySystems.TileLookup; +using Robust.Server.GameObjects; using Robust.Shared.Containers; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Random; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/Botany/Seed.cs b/Content.Server/Botany/Seed.cs index ad95296f8e..56240adf5c 100644 --- a/Content.Server/Botany/Seed.cs +++ b/Content.Server/Botany/Seed.cs @@ -2,18 +2,12 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Botany; -using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Atmos; using Content.Shared.Interfaces; using Content.Shared.Utility; -using Microsoft.EntityFrameworkCore.Metadata.Builders; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; diff --git a/Content.Server/Chat/ChatManager.cs b/Content.Server/Chat/ChatManager.cs index d4235b55dc..3d1a4f936b 100644 --- a/Content.Server/Chat/ChatManager.cs +++ b/Content.Server/Chat/ChatManager.cs @@ -4,23 +4,20 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Headset; using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.GameObjects.Components.Mobs.Speech; using Content.Server.GameObjects.Components.Observer; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Server.Interfaces.Chat; using Content.Shared.Chat; using Content.Shared.GameObjects.Components.Inventory; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; +using Robust.Server.GameObjects; +using Robust.Server.Player; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Network; using static Content.Server.Interfaces.Chat.IChatManager; namespace Content.Server.Chat diff --git a/Content.Server/Chemistry/Metabolism/DefaultDrink.cs b/Content.Server/Chemistry/Metabolism/DefaultDrink.cs index 027695432d..5edd38f1e9 100644 --- a/Content.Server/Chemistry/Metabolism/DefaultDrink.cs +++ b/Content.Server/Chemistry/Metabolism/DefaultDrink.cs @@ -1,8 +1,7 @@ using Content.Server.GameObjects.Components.Nutrition; using Content.Shared.Chemistry; using Content.Shared.Interfaces.Chemistry; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Chemistry.Metabolism diff --git a/Content.Server/Chemistry/Metabolism/DefaultFood.cs b/Content.Server/Chemistry/Metabolism/DefaultFood.cs index e6be251147..8259073a30 100644 --- a/Content.Server/Chemistry/Metabolism/DefaultFood.cs +++ b/Content.Server/Chemistry/Metabolism/DefaultFood.cs @@ -1,8 +1,7 @@ using Content.Server.GameObjects.Components.Nutrition; using Content.Shared.Chemistry; using Content.Shared.Interfaces.Chemistry; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Chemistry.Metabolism diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs index e5151631c3..fc8491c429 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs @@ -2,9 +2,7 @@ using System.Diagnostics.CodeAnalysis; using Content.Server.GameObjects.Components.Botany; using Content.Shared.Interfaces.Chemistry; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Random; using Robust.Shared.Serialization; diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustHealth.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustHealth.cs index 26ada887ea..960742d25b 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustHealth.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustHealth.cs @@ -1,7 +1,6 @@ #nullable enable -using Content.Server.GameObjects.Components.Botany; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism { diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustMutationLevel.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustMutationLevel.cs index c6813f68e3..6437b0b39c 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustMutationLevel.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustMutationLevel.cs @@ -1,7 +1,6 @@ #nullable enable -using Content.Server.GameObjects.Components.Botany; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism { diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustMutationMod.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustMutationMod.cs index 177c2fa72f..0461aa9c5a 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustMutationMod.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustMutationMod.cs @@ -1,7 +1,6 @@ #nullable enable -using Content.Server.GameObjects.Components.Botany; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism { diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustNutrition.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustNutrition.cs index 5379b34322..2a2e00783d 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustNutrition.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustNutrition.cs @@ -1,8 +1,6 @@ #nullable enable -using Content.Server.GameObjects.Components.Botany; -using Content.Shared.Interfaces.Chemistry; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism { diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustPests.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustPests.cs index be8a0efaf7..0245ba335c 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustPests.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustPests.cs @@ -1,7 +1,6 @@ #nullable enable -using Content.Server.GameObjects.Components.Botany; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism { diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustToxins.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustToxins.cs index b05c6feb5a..544bb63b99 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustToxins.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustToxins.cs @@ -1,8 +1,6 @@ #nullable enable -using Content.Server.GameObjects.Components.Botany; -using Content.Shared.Interfaces.Chemistry; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism { diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustWater.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustWater.cs index 481c2bcd60..9314506b05 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustWater.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustWater.cs @@ -1,8 +1,6 @@ #nullable enable -using Content.Server.GameObjects.Components.Botany; -using Content.Shared.Interfaces.Chemistry; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism { diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustWeeds.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustWeeds.cs index 1b9be2e74e..66a0f8f480 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AdjustWeeds.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AdjustWeeds.cs @@ -1,8 +1,6 @@ #nullable enable -using Content.Server.GameObjects.Components.Botany; -using Content.Shared.Interfaces.Chemistry; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism { diff --git a/Content.Server/Chemistry/PlantMetabolism/AffectGrowth.cs b/Content.Server/Chemistry/PlantMetabolism/AffectGrowth.cs index dd1c3fb05f..6962eabb94 100644 --- a/Content.Server/Chemistry/PlantMetabolism/AffectGrowth.cs +++ b/Content.Server/Chemistry/PlantMetabolism/AffectGrowth.cs @@ -1,7 +1,6 @@ #nullable enable -using Content.Server.GameObjects.Components.Botany; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.PlantMetabolism { diff --git a/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs b/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs index f3d7d55c29..b741ac23da 100644 --- a/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs +++ b/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs @@ -3,10 +3,9 @@ using System; using Content.Server.GameObjects.Components.Botany; using Content.Shared.Interfaces.Chemistry; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Random; using Robust.Shared.Serialization; namespace Content.Server.Chemistry.PlantMetabolism diff --git a/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs b/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs index 387b471b4a..85d577a3a4 100644 --- a/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs +++ b/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs @@ -2,9 +2,7 @@ using Content.Server.GameObjects.Components.Botany; using Content.Shared.Interfaces.Chemistry; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Random; diff --git a/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs b/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs index 095d05b456..e2bbbab75d 100644 --- a/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs +++ b/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs @@ -2,9 +2,7 @@ using Content.Server.GameObjects.Components.Botany; using Content.Shared.Interfaces.Chemistry; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Random; diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs index 87700302d6..3744faf564 100644 --- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs @@ -5,13 +5,11 @@ using Content.Server.Interfaces.Chemistry; using Content.Server.Utility; using Content.Shared.Audio; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Serialization; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Map; using Robust.Shared.Serialization; namespace Content.Server.Chemistry.ReactionEffects diff --git a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs index 2523411a33..57286a0b3b 100644 --- a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs @@ -2,8 +2,7 @@ using System; using Content.Server.Explosions; using Content.Server.GameObjects.Components.Chemistry; using Content.Server.Interfaces.Chemistry; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Chemistry.ReactionEffects diff --git a/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs index edc6a26285..2e3b10a6ab 100644 --- a/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.GameObjects.Components.Chemistry; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.ReactionEffects { diff --git a/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs index 3a78557321..1537ecdd8b 100644 --- a/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.GameObjects.Components.Chemistry; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Chemistry.ReactionEffects { diff --git a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs index 9d26d8dcc7..6a693f582b 100644 --- a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs @@ -2,7 +2,6 @@ using Content.Server.Utility; using Content.Shared.Chemistry; using Content.Shared.Interfaces.Chemistry; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Map; using Robust.Shared.Serialization; using System.Linq; diff --git a/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs b/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs index e87925cb36..876497d876 100644 --- a/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs @@ -4,7 +4,6 @@ using Content.Shared.Atmos; using Content.Shared.Chemistry; using Content.Shared.Interfaces.Chemistry; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Map; using Robust.Shared.Serialization; diff --git a/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs b/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs index 2c003a2f5a..7194772906 100644 --- a/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs @@ -1,10 +1,8 @@ using System; using Content.Server.Atmos; -using Content.Shared.Atmos; using Content.Shared.Chemistry; using Content.Shared.Interfaces.Chemistry; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Map; using Robust.Shared.Serialization; diff --git a/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs b/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs index 207d7d5ace..1f978d1983 100644 --- a/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs @@ -1,9 +1,7 @@ using Content.Server.GameObjects.Components.Fluids; -using Content.Server.GameObjects.Components.Movement; using Content.Shared.Chemistry; using Content.Shared.Interfaces.Chemistry; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Map; using Robust.Shared.Serialization; diff --git a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs index dec67c8e5c..a2435706ee 100644 --- a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs @@ -3,8 +3,6 @@ using Content.Server.GameObjects.Components.Movement; using Content.Shared.Chemistry; using Content.Shared.Interfaces.Chemistry; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Serialization; diff --git a/Content.Server/Commands/AI/AddAiCommand.cs b/Content.Server/Commands/AI/AddAiCommand.cs index 184341fc1f..382da7b2c6 100644 --- a/Content.Server/Commands/AI/AddAiCommand.cs +++ b/Content.Server/Commands/AI/AddAiCommand.cs @@ -4,11 +4,8 @@ using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.EntitySystems.AI; using Content.Shared.Administration; using Content.Shared.GameObjects.Components.Movement; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Commands.AI diff --git a/Content.Server/Commands/AI/FactionCommand.cs b/Content.Server/Commands/AI/FactionCommand.cs index a040c082a3..80ca71a445 100644 --- a/Content.Server/Commands/AI/FactionCommand.cs +++ b/Content.Server/Commands/AI/FactionCommand.cs @@ -4,9 +4,8 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.AI; using Content.Server.GameObjects.EntitySystems.AI; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; namespace Content.Server.Commands.AI diff --git a/Content.Server/Commands/Actions/CooldownAction.cs b/Content.Server/Commands/Actions/CooldownAction.cs index 7c8367af09..c313d535a4 100644 --- a/Content.Server/Commands/Actions/CooldownAction.cs +++ b/Content.Server/Commands/Actions/CooldownAction.cs @@ -4,10 +4,10 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Actions; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; +using Robust.Shared.Timing; namespace Content.Server.Commands.Actions { diff --git a/Content.Server/Commands/Actions/GrantAction.cs b/Content.Server/Commands/Actions/GrantAction.cs index a6bb3f410b..4befb8104d 100644 --- a/Content.Server/Commands/Actions/GrantAction.cs +++ b/Content.Server/Commands/Actions/GrantAction.cs @@ -4,7 +4,7 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Actions; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; @@ -24,7 +24,7 @@ namespace Content.Server.Commands.Actions if (args.Length > 1) { var target = args[1]; - if (!Commands.CommandUtils.TryGetAttachedEntityByUsernameOrId(shell, target, player, out attachedEntity)) return; + if (!CommandUtils.TryGetAttachedEntityByUsernameOrId(shell, target, player, out attachedEntity)) return; } if (attachedEntity == null) return; diff --git a/Content.Server/Commands/Actions/RevokeAction.cs b/Content.Server/Commands/Actions/RevokeAction.cs index 78a0d0cae3..d493f69f38 100644 --- a/Content.Server/Commands/Actions/RevokeAction.cs +++ b/Content.Server/Commands/Actions/RevokeAction.cs @@ -4,7 +4,7 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Actions; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/Alerts/ClearAlert.cs b/Content.Server/Commands/Alerts/ClearAlert.cs index 761f08b7c6..081016691e 100644 --- a/Content.Server/Commands/Alerts/ClearAlert.cs +++ b/Content.Server/Commands/Alerts/ClearAlert.cs @@ -4,7 +4,7 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Administration; using Content.Shared.Alert; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/Alerts/ShowAlert.cs b/Content.Server/Commands/Alerts/ShowAlert.cs index 2381c14fa3..3fd7536077 100644 --- a/Content.Server/Commands/Alerts/ShowAlert.cs +++ b/Content.Server/Commands/Alerts/ShowAlert.cs @@ -4,7 +4,7 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Administration; using Content.Shared.Alert; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/Atmos/AddAtmosCommand.cs b/Content.Server/Commands/Atmos/AddAtmosCommand.cs index e2e1c2322c..5605bb7320 100644 --- a/Content.Server/Commands/Atmos/AddAtmosCommand.cs +++ b/Content.Server/Commands/Atmos/AddAtmosCommand.cs @@ -3,10 +3,8 @@ using Content.Server.Administration; using Content.Server.Atmos; using Content.Server.GameObjects.Components.Atmos; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/Commands/Atmos/AddGasCommand.cs b/Content.Server/Commands/Atmos/AddGasCommand.cs index a73d005137..ed582e8087 100644 --- a/Content.Server/Commands/Atmos/AddGasCommand.cs +++ b/Content.Server/Commands/Atmos/AddGasCommand.cs @@ -3,10 +3,8 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Atmos; using Content.Shared.Administration; using Content.Shared.Atmos; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/Commands/Atmos/AddUnsimulatedAtmosCommand.cs b/Content.Server/Commands/Atmos/AddUnsimulatedAtmosCommand.cs index e6ec43ec27..2bee55935f 100644 --- a/Content.Server/Commands/Atmos/AddUnsimulatedAtmosCommand.cs +++ b/Content.Server/Commands/Atmos/AddUnsimulatedAtmosCommand.cs @@ -3,10 +3,8 @@ using Content.Server.Administration; using Content.Server.Atmos; using Content.Server.GameObjects.Components.Atmos; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/Commands/Atmos/DeleteGasCommand.cs b/Content.Server/Commands/Atmos/DeleteGasCommand.cs index ac11c85360..d2ba43e381 100644 --- a/Content.Server/Commands/Atmos/DeleteGasCommand.cs +++ b/Content.Server/Commands/Atmos/DeleteGasCommand.cs @@ -4,10 +4,9 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Atmos; using Content.Shared.Administration; using Content.Shared.Atmos; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/Commands/Atmos/FillGasCommand.cs b/Content.Server/Commands/Atmos/FillGasCommand.cs index 1bac6ace5d..0b095eebb6 100644 --- a/Content.Server/Commands/Atmos/FillGasCommand.cs +++ b/Content.Server/Commands/Atmos/FillGasCommand.cs @@ -3,10 +3,8 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Atmos; using Content.Shared.Administration; using Content.Shared.Atmos; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/Commands/Atmos/ListGasesCommand.cs b/Content.Server/Commands/Atmos/ListGasesCommand.cs index 129719e866..fb909275d9 100644 --- a/Content.Server/Commands/Atmos/ListGasesCommand.cs +++ b/Content.Server/Commands/Atmos/ListGasesCommand.cs @@ -2,9 +2,8 @@ using Content.Server.Administration; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.Commands.Atmos { diff --git a/Content.Server/Commands/Atmos/RemoveGasCommand.cs b/Content.Server/Commands/Atmos/RemoveGasCommand.cs index 84f0cadcee..5935ef80b2 100644 --- a/Content.Server/Commands/Atmos/RemoveGasCommand.cs +++ b/Content.Server/Commands/Atmos/RemoveGasCommand.cs @@ -2,10 +2,8 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Atmos; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/Commands/Atmos/SetAtmosTemperatureCommand.cs b/Content.Server/Commands/Atmos/SetAtmosTemperatureCommand.cs index 28b2452397..ddcd587641 100644 --- a/Content.Server/Commands/Atmos/SetAtmosTemperatureCommand.cs +++ b/Content.Server/Commands/Atmos/SetAtmosTemperatureCommand.cs @@ -3,10 +3,8 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Atmos; using Content.Shared.Administration; using Content.Shared.Atmos; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/Commands/Atmos/SetTemperatureCommand.cs b/Content.Server/Commands/Atmos/SetTemperatureCommand.cs index 33be481d12..e271d51764 100644 --- a/Content.Server/Commands/Atmos/SetTemperatureCommand.cs +++ b/Content.Server/Commands/Atmos/SetTemperatureCommand.cs @@ -3,10 +3,8 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Atmos; using Content.Shared.Administration; using Content.Shared.Atmos; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/Commands/Atmos/ShowAtmosCommand.cs b/Content.Server/Commands/Atmos/ShowAtmosCommand.cs index bd3f8cf6ca..73d61243aa 100644 --- a/Content.Server/Commands/Atmos/ShowAtmosCommand.cs +++ b/Content.Server/Commands/Atmos/ShowAtmosCommand.cs @@ -2,9 +2,9 @@ using Content.Server.Administration; using Content.Server.GameObjects.EntitySystems.Atmos; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.Commands.Atmos { diff --git a/Content.Server/Commands/AttachBodyPartCommand.cs b/Content.Server/Commands/AttachBodyPartCommand.cs index 07b9e92fdd..2dfe28136a 100644 --- a/Content.Server/Commands/AttachBodyPartCommand.cs +++ b/Content.Server/Commands/AttachBodyPartCommand.cs @@ -4,10 +4,9 @@ using Content.Server.GameObjects.Components.Body.Part; using Content.Shared.Administration; using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Body.Part; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Commands diff --git a/Content.Server/Commands/Body/AddHandCommand.cs b/Content.Server/Commands/Body/AddHandCommand.cs index e0dedf53af..8b854cf3e2 100644 --- a/Content.Server/Commands/Body/AddHandCommand.cs +++ b/Content.Server/Commands/Body/AddHandCommand.cs @@ -3,11 +3,9 @@ using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Body.Part; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Random; diff --git a/Content.Server/Commands/Body/DestroyMechanismCommand.cs b/Content.Server/Commands/Body/DestroyMechanismCommand.cs index 59aa109a10..2e3a2fec02 100644 --- a/Content.Server/Commands/Body/DestroyMechanismCommand.cs +++ b/Content.Server/Commands/Body/DestroyMechanismCommand.cs @@ -2,9 +2,8 @@ using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.GameObjects.Components.Body; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Random; diff --git a/Content.Server/Commands/Body/RemoveHandCommand.cs b/Content.Server/Commands/Body/RemoveHandCommand.cs index 9a3bcd87fa..086f91f4c6 100644 --- a/Content.Server/Commands/Body/RemoveHandCommand.cs +++ b/Content.Server/Commands/Body/RemoveHandCommand.cs @@ -4,9 +4,8 @@ using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Body.Part; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Random; diff --git a/Content.Server/Commands/Chat/AdminChatCommand.cs b/Content.Server/Commands/Chat/AdminChatCommand.cs index a138ac68ae..f490c608a6 100644 --- a/Content.Server/Commands/Chat/AdminChatCommand.cs +++ b/Content.Server/Commands/Chat/AdminChatCommand.cs @@ -2,7 +2,7 @@ using Content.Server.Administration; using Content.Server.Interfaces.Chat; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/Chat/MeCommand.cs b/Content.Server/Commands/Chat/MeCommand.cs index f22d82f054..3c8fc235c1 100644 --- a/Content.Server/Commands/Chat/MeCommand.cs +++ b/Content.Server/Commands/Chat/MeCommand.cs @@ -2,7 +2,7 @@ using Content.Server.Administration; using Content.Server.Interfaces.Chat; using Content.Server.Players; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.Enums; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/Chat/OOCCommand.cs b/Content.Server/Commands/Chat/OOCCommand.cs index 7233d2f96a..98d744ba6a 100644 --- a/Content.Server/Commands/Chat/OOCCommand.cs +++ b/Content.Server/Commands/Chat/OOCCommand.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.Administration; using Content.Server.Interfaces.Chat; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/Chat/SayCommand.cs b/Content.Server/Commands/Chat/SayCommand.cs index 530e029636..56bf6770dd 100644 --- a/Content.Server/Commands/Chat/SayCommand.cs +++ b/Content.Server/Commands/Chat/SayCommand.cs @@ -3,7 +3,7 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Observer; using Content.Server.Interfaces.Chat; using Content.Server.Players; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.Enums; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/Chat/SuicideCommand.cs b/Content.Server/Commands/Chat/SuicideCommand.cs index c20e82f8a7..5b72a9188c 100644 --- a/Content.Server/Commands/Chat/SuicideCommand.cs +++ b/Content.Server/Commands/Chat/SuicideCommand.cs @@ -12,10 +12,10 @@ using Content.Server.Utility; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; using Content.Shared.Interfaces; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.Enums; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/Commands/CommandUtils.cs b/Content.Server/Commands/CommandUtils.cs index c291c0b36c..e5d8ce6b2a 100644 --- a/Content.Server/Commands/CommandUtils.cs +++ b/Content.Server/Commands/CommandUtils.cs @@ -1,10 +1,9 @@ #nullable enable using System; using System.Diagnostics.CodeAnalysis; -using Robust.Server.Console; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Network; diff --git a/Content.Server/Commands/Damage/AddDamageFlagCommand.cs b/Content.Server/Commands/Damage/AddDamageFlagCommand.cs index 698a9a4b07..ecd0512afd 100644 --- a/Content.Server/Commands/Damage/AddDamageFlagCommand.cs +++ b/Content.Server/Commands/Damage/AddDamageFlagCommand.cs @@ -1,8 +1,7 @@ #nullable enable using Content.Server.Administration; using Content.Shared.Administration; -using Robust.Server.Console; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; namespace Content.Server.Commands.Damage diff --git a/Content.Server/Commands/Damage/DamageFlagCommand.cs b/Content.Server/Commands/Damage/DamageFlagCommand.cs index b1eee70281..cb19ca374c 100644 --- a/Content.Server/Commands/Damage/DamageFlagCommand.cs +++ b/Content.Server/Commands/Damage/DamageFlagCommand.cs @@ -2,10 +2,9 @@ using System; using System.Diagnostics.CodeAnalysis; using Content.Shared.GameObjects.Components.Damage; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Commands.Damage diff --git a/Content.Server/Commands/Damage/GodModeCommand.cs b/Content.Server/Commands/Damage/GodModeCommand.cs index cedd3b1fb1..d6f37b05f2 100644 --- a/Content.Server/Commands/Damage/GodModeCommand.cs +++ b/Content.Server/Commands/Damage/GodModeCommand.cs @@ -2,11 +2,9 @@ using Content.Server.Administration; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Commands.Damage diff --git a/Content.Server/Commands/Damage/RemoveDamageFlagCommand.cs b/Content.Server/Commands/Damage/RemoveDamageFlagCommand.cs index c315723273..6924c5832d 100644 --- a/Content.Server/Commands/Damage/RemoveDamageFlagCommand.cs +++ b/Content.Server/Commands/Damage/RemoveDamageFlagCommand.cs @@ -1,8 +1,7 @@ #nullable enable using Content.Server.Administration; using Content.Shared.Administration; -using Robust.Server.Console; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; namespace Content.Server.Commands.Damage diff --git a/Content.Server/Commands/Disposal/TubeConnectionsCommand.cs b/Content.Server/Commands/Disposal/TubeConnectionsCommand.cs index 5188893165..3a9934dfdb 100644 --- a/Content.Server/Commands/Disposal/TubeConnectionsCommand.cs +++ b/Content.Server/Commands/Disposal/TubeConnectionsCommand.cs @@ -2,10 +2,9 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Disposal; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/Commands/FindEntitiesWithComponents.cs b/Content.Server/Commands/FindEntitiesWithComponents.cs index 85daab24c6..93dc1d2124 100644 --- a/Content.Server/Commands/FindEntitiesWithComponents.cs +++ b/Content.Server/Commands/FindEntitiesWithComponents.cs @@ -3,10 +3,8 @@ using System; using System.Collections.Generic; using Content.Server.Administration; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Commands diff --git a/Content.Server/Commands/GameTicking/DelayStartCommand.cs b/Content.Server/Commands/GameTicking/DelayStartCommand.cs index a74293779f..4ba57bf6f6 100644 --- a/Content.Server/Commands/GameTicking/DelayStartCommand.cs +++ b/Content.Server/Commands/GameTicking/DelayStartCommand.cs @@ -3,7 +3,6 @@ using Content.Server.Administration; using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/GameTicking/EndRoundCommand.cs b/Content.Server/Commands/GameTicking/EndRoundCommand.cs index 12afa279cb..3fb9205ce8 100644 --- a/Content.Server/Commands/GameTicking/EndRoundCommand.cs +++ b/Content.Server/Commands/GameTicking/EndRoundCommand.cs @@ -3,7 +3,6 @@ using Content.Server.Administration; using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/GameTicking/ForcePresetCommand.cs b/Content.Server/Commands/GameTicking/ForcePresetCommand.cs index bdd92c6500..ed959d0e7a 100644 --- a/Content.Server/Commands/GameTicking/ForcePresetCommand.cs +++ b/Content.Server/Commands/GameTicking/ForcePresetCommand.cs @@ -2,7 +2,6 @@ using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/GameTicking/GoLobbyCommand.cs b/Content.Server/Commands/GameTicking/GoLobbyCommand.cs index 7ca9c0c76b..f43131cadc 100644 --- a/Content.Server/Commands/GameTicking/GoLobbyCommand.cs +++ b/Content.Server/Commands/GameTicking/GoLobbyCommand.cs @@ -4,11 +4,9 @@ using Content.Server.Administration; using Content.Server.Interfaces.GameTicking; using Content.Shared; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Shared.Configuration; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Configuration; using Robust.Shared.IoC; -using Robust.Shared.Localization; namespace Content.Server.Commands.GameTicking { diff --git a/Content.Server/Commands/GameTicking/JoinGameCommand.cs b/Content.Server/Commands/GameTicking/JoinGameCommand.cs index b160a1fe08..708727ccf3 100644 --- a/Content.Server/Commands/GameTicking/JoinGameCommand.cs +++ b/Content.Server/Commands/GameTicking/JoinGameCommand.cs @@ -3,7 +3,7 @@ using Content.Server.Administration; using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; using Content.Shared.Roles; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Server/Commands/GameTicking/MappingCommand.cs b/Content.Server/Commands/GameTicking/MappingCommand.cs index 0ed2167734..99233838ea 100644 --- a/Content.Server/Commands/GameTicking/MappingCommand.cs +++ b/Content.Server/Commands/GameTicking/MappingCommand.cs @@ -3,11 +3,11 @@ using System.Linq; using Content.Server.Administration; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; -using Robust.Server.Interfaces.Timing; +using Robust.Server.Player; +using Robust.Server.Timing; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Utility; diff --git a/Content.Server/Commands/GameTicking/NewRoundCommand.cs b/Content.Server/Commands/GameTicking/NewRoundCommand.cs index 98d90cfab4..160419fa1b 100644 --- a/Content.Server/Commands/GameTicking/NewRoundCommand.cs +++ b/Content.Server/Commands/GameTicking/NewRoundCommand.cs @@ -2,7 +2,6 @@ using Content.Server.Administration; using Content.Server.Interfaces.GameTicking; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/GameTicking/ObserveCommand.cs b/Content.Server/Commands/GameTicking/ObserveCommand.cs index fcc0e867a6..b0d4f6a164 100644 --- a/Content.Server/Commands/GameTicking/ObserveCommand.cs +++ b/Content.Server/Commands/GameTicking/ObserveCommand.cs @@ -1,6 +1,6 @@ using Content.Server.Administration; using Content.Server.Interfaces.GameTicking; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/GameTicking/RespawnCommand.cs b/Content.Server/Commands/GameTicking/RespawnCommand.cs index 9af7ed05d8..731dcb78e6 100644 --- a/Content.Server/Commands/GameTicking/RespawnCommand.cs +++ b/Content.Server/Commands/GameTicking/RespawnCommand.cs @@ -1,6 +1,6 @@ using Content.Server.Interfaces.GameTicking; using Content.Server.Players; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; using Robust.Shared.Network; diff --git a/Content.Server/Commands/GameTicking/SetGamePresetCommand.cs b/Content.Server/Commands/GameTicking/SetGamePresetCommand.cs index b085164e96..ee98b1f7ab 100644 --- a/Content.Server/Commands/GameTicking/SetGamePresetCommand.cs +++ b/Content.Server/Commands/GameTicking/SetGamePresetCommand.cs @@ -1,7 +1,6 @@ using Content.Server.Administration; using Content.Server.Interfaces.GameTicking; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/GameTicking/StartRoundCommand.cs b/Content.Server/Commands/GameTicking/StartRoundCommand.cs index 14a74caf86..8de6bf1997 100644 --- a/Content.Server/Commands/GameTicking/StartRoundCommand.cs +++ b/Content.Server/Commands/GameTicking/StartRoundCommand.cs @@ -3,7 +3,6 @@ using Content.Server.Administration; using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/GameTicking/TileWallsCommand.cs b/Content.Server/Commands/GameTicking/TileWallsCommand.cs index e2c7445763..dd402f7320 100644 --- a/Content.Server/Commands/GameTicking/TileWallsCommand.cs +++ b/Content.Server/Commands/GameTicking/TileWallsCommand.cs @@ -1,11 +1,9 @@ using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.Maps; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/Commands/GameTicking/ToggleDisallowLateJoinCommand.cs b/Content.Server/Commands/GameTicking/ToggleDisallowLateJoinCommand.cs index d519ba5754..04ff29e091 100644 --- a/Content.Server/Commands/GameTicking/ToggleDisallowLateJoinCommand.cs +++ b/Content.Server/Commands/GameTicking/ToggleDisallowLateJoinCommand.cs @@ -1,7 +1,6 @@ using Content.Server.Administration; using Content.Server.Interfaces.GameTicking; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/GameTicking/ToggleReadyCommand.cs b/Content.Server/Commands/GameTicking/ToggleReadyCommand.cs index f710c59fb1..fc0f20eaa8 100644 --- a/Content.Server/Commands/GameTicking/ToggleReadyCommand.cs +++ b/Content.Server/Commands/GameTicking/ToggleReadyCommand.cs @@ -1,6 +1,6 @@ using Content.Server.Administration; using Content.Server.Interfaces.GameTicking; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/HideContainedContextCommand.cs b/Content.Server/Commands/HideContainedContextCommand.cs index caf3384abe..75fae2f00c 100644 --- a/Content.Server/Commands/HideContainedContextCommand.cs +++ b/Content.Server/Commands/HideContainedContextCommand.cs @@ -2,9 +2,9 @@ using Content.Server.Administration; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.Commands { diff --git a/Content.Server/Commands/Hungry.cs b/Content.Server/Commands/Hungry.cs index 02ddebe18c..0adee94b04 100644 --- a/Content.Server/Commands/Hungry.cs +++ b/Content.Server/Commands/Hungry.cs @@ -3,7 +3,7 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Nutrition; using Content.Shared.Administration; using Content.Shared.GameObjects.Components.Nutrition; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; namespace Content.Server.Commands diff --git a/Content.Server/Commands/HurtCommand.cs b/Content.Server/Commands/HurtCommand.cs index 532af0304e..e288f0cf4e 100644 --- a/Content.Server/Commands/HurtCommand.cs +++ b/Content.Server/Commands/HurtCommand.cs @@ -6,10 +6,9 @@ using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Commands diff --git a/Content.Server/Commands/Interactable/AnchorCommand.cs b/Content.Server/Commands/Interactable/AnchorCommand.cs index 1d891fbb43..42c2acbf45 100644 --- a/Content.Server/Commands/Interactable/AnchorCommand.cs +++ b/Content.Server/Commands/Interactable/AnchorCommand.cs @@ -3,8 +3,8 @@ using System.Linq; using Content.Server.Administration; using Content.Server.GameObjects.Components; using Content.Shared.Administration; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/Interactable/TilePryCommand.cs b/Content.Server/Commands/Interactable/TilePryCommand.cs index 9691736f51..9b843faa20 100644 --- a/Content.Server/Commands/Interactable/TilePryCommand.cs +++ b/Content.Server/Commands/Interactable/TilePryCommand.cs @@ -3,9 +3,8 @@ using Content.Server.Administration; using Content.Server.GameObjects.Components.Interactable; using Content.Shared.Administration; using Content.Shared.Maps; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/Commands/Interactable/UnAnchorCommand.cs b/Content.Server/Commands/Interactable/UnAnchorCommand.cs index 5fdf8c23f0..25259366a8 100644 --- a/Content.Server/Commands/Interactable/UnAnchorCommand.cs +++ b/Content.Server/Commands/Interactable/UnAnchorCommand.cs @@ -3,8 +3,8 @@ using System.Linq; using Content.Server.Administration; using Content.Server.GameObjects.Components; using Content.Shared.Administration; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/MachineLinking/SignalLinkerCommand.cs b/Content.Server/Commands/MachineLinking/SignalLinkerCommand.cs index d729edddff..c8c98d89c8 100644 --- a/Content.Server/Commands/MachineLinking/SignalLinkerCommand.cs +++ b/Content.Server/Commands/MachineLinking/SignalLinkerCommand.cs @@ -1,9 +1,9 @@ using Content.Server.Administration; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Commands.MachineLinking diff --git a/Content.Server/Commands/MakeSentientCommand.cs b/Content.Server/Commands/MakeSentientCommand.cs index 7882fde7ba..eb969ecf49 100644 --- a/Content.Server/Commands/MakeSentientCommand.cs +++ b/Content.Server/Commands/MakeSentientCommand.cs @@ -1,14 +1,11 @@ #nullable enable using Content.Server.Administration; using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.Components.Mobs.Speech; using Content.Server.GameObjects.Components.Movement; using Content.Shared.Administration; using Content.Shared.GameObjects.Components.Mobs.Speech; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Commands diff --git a/Content.Server/Commands/Mobs/AddRoleCommand.cs b/Content.Server/Commands/Mobs/AddRoleCommand.cs index eedec5dfbc..8e129a93e9 100644 --- a/Content.Server/Commands/Mobs/AddRoleCommand.cs +++ b/Content.Server/Commands/Mobs/AddRoleCommand.cs @@ -3,7 +3,7 @@ using Content.Server.Mobs.Roles; using Content.Server.Players; using Content.Shared.Administration; using Content.Shared.Roles; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Server/Commands/Mobs/MindInfoCommand.cs b/Content.Server/Commands/Mobs/MindInfoCommand.cs index 520fdde43a..4363164d91 100644 --- a/Content.Server/Commands/Mobs/MindInfoCommand.cs +++ b/Content.Server/Commands/Mobs/MindInfoCommand.cs @@ -2,7 +2,7 @@ using Content.Server.Administration; using Content.Server.Players; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/Mobs/RemoveRoleCommand.cs b/Content.Server/Commands/Mobs/RemoveRoleCommand.cs index 11763ea74e..34a6800dd9 100644 --- a/Content.Server/Commands/Mobs/RemoveRoleCommand.cs +++ b/Content.Server/Commands/Mobs/RemoveRoleCommand.cs @@ -3,7 +3,7 @@ using Content.Server.Mobs.Roles; using Content.Server.Players; using Content.Shared.Administration; using Content.Shared.Roles; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Server/Commands/Notify/PopupMsgCommand.cs b/Content.Server/Commands/Notify/PopupMsgCommand.cs index 524439e34e..0da87926ba 100644 --- a/Content.Server/Commands/Notify/PopupMsgCommand.cs +++ b/Content.Server/Commands/Notify/PopupMsgCommand.cs @@ -1,10 +1,8 @@ using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.Interfaces; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Commands.Notify diff --git a/Content.Server/Commands/Objectives/AddObjectiveCommand.cs b/Content.Server/Commands/Objectives/AddObjectiveCommand.cs index 24785024e3..021f7f4860 100644 --- a/Content.Server/Commands/Objectives/AddObjectiveCommand.cs +++ b/Content.Server/Commands/Objectives/AddObjectiveCommand.cs @@ -3,7 +3,7 @@ using Content.Server.Administration; using Content.Server.Objectives; using Content.Server.Players; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Server/Commands/Objectives/ListObjectivesCommand.cs b/Content.Server/Commands/Objectives/ListObjectivesCommand.cs index 536b4e536f..33201d962a 100644 --- a/Content.Server/Commands/Objectives/ListObjectivesCommand.cs +++ b/Content.Server/Commands/Objectives/ListObjectivesCommand.cs @@ -3,7 +3,7 @@ using System.Linq; using Content.Server.Administration; using Content.Server.Players; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/Objectives/RemoveObjectiveCommand.cs b/Content.Server/Commands/Objectives/RemoveObjectiveCommand.cs index 988090c25d..5d7806fb6c 100644 --- a/Content.Server/Commands/Objectives/RemoveObjectiveCommand.cs +++ b/Content.Server/Commands/Objectives/RemoveObjectiveCommand.cs @@ -2,7 +2,7 @@ using Content.Server.Administration; using Content.Server.Players; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/Commands/Observer/Ghost.cs b/Content.Server/Commands/Observer/Ghost.cs index 18be076486..32d0a96689 100644 --- a/Content.Server/Commands/Observer/Ghost.cs +++ b/Content.Server/Commands/Observer/Ghost.cs @@ -1,16 +1,9 @@ #nullable enable using Content.Server.Administration; -using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.Components.Observer; using Content.Server.Interfaces.GameTicking; using Content.Server.Players; -using Content.Shared.Damage; -using Content.Shared.GameObjects.Components.Damage; -using Content.Shared.GameObjects.Components.Mobs; -using Content.Shared.GameObjects.Components.Mobs.State; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Commands.Observer diff --git a/Content.Server/Commands/RemoveExtraComponents.cs b/Content.Server/Commands/RemoveExtraComponents.cs index d2bb8bb2ce..c2ea1b9dc7 100644 --- a/Content.Server/Commands/RemoveExtraComponents.cs +++ b/Content.Server/Commands/RemoveExtraComponents.cs @@ -1,10 +1,8 @@ #nullable enable using Content.Server.Administration; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Server/Commands/SetAnchorCommand.cs b/Content.Server/Commands/SetAnchorCommand.cs index 3dc2a16cf5..c605039fe3 100644 --- a/Content.Server/Commands/SetAnchorCommand.cs +++ b/Content.Server/Commands/SetAnchorCommand.cs @@ -1,11 +1,8 @@ #nullable enable using Content.Server.Administration; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Commands diff --git a/Content.Server/Commands/ShowContainedContextCommand.cs b/Content.Server/Commands/ShowContainedContextCommand.cs index fc93c08a7f..9739e7b807 100644 --- a/Content.Server/Commands/ShowContainedContextCommand.cs +++ b/Content.Server/Commands/ShowContainedContextCommand.cs @@ -2,9 +2,9 @@ using Content.Server.Administration; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.Commands { diff --git a/Content.Server/Commands/Speech/AddAccent.cs b/Content.Server/Commands/Speech/AddAccent.cs index 1d7fa9fb6e..e5fd9449fd 100644 --- a/Content.Server/Commands/Speech/AddAccent.cs +++ b/Content.Server/Commands/Speech/AddAccent.cs @@ -4,9 +4,9 @@ using System.Text; using Content.Server.Administration; using Content.Server.GameObjects.Components.Mobs.Speech; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Commands.Speech diff --git a/Content.Server/Commands/StartSingularityEngineCommand.cs b/Content.Server/Commands/StartSingularityEngineCommand.cs index 4a9695fae4..2f56bb8251 100644 --- a/Content.Server/Commands/StartSingularityEngineCommand.cs +++ b/Content.Server/Commands/StartSingularityEngineCommand.cs @@ -1,15 +1,11 @@ #nullable enable -using System; -using System.Collections.Generic; using Content.Server.Administration; using Content.Server.GameObjects.Components.Singularity; using Content.Server.GameObjects.Components.PA; using Content.Shared.Administration; using Content.Shared.GameObjects.Components; -using Robust.Server.Interfaces.Player; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Commands diff --git a/Content.Server/Commands/StationEvents/StationEventCommand.cs b/Content.Server/Commands/StationEvents/StationEventCommand.cs index 99f28ce5a0..0927cbc2be 100644 --- a/Content.Server/Commands/StationEvents/StationEventCommand.cs +++ b/Content.Server/Commands/StationEvents/StationEventCommand.cs @@ -2,9 +2,9 @@ using Content.Server.Administration; using Content.Server.GameObjects.EntitySystems.StationEvents; using Content.Shared.Administration; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Console; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; namespace Content.Server.Commands.StationEvents diff --git a/Content.Server/ConnectionManager.cs b/Content.Server/ConnectionManager.cs index c655913943..e437e57482 100644 --- a/Content.Server/ConnectionManager.cs +++ b/Content.Server/ConnectionManager.cs @@ -3,8 +3,7 @@ using System.Threading.Tasks; using Content.Server.Database; using Content.Server.Preferences; using Content.Shared; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Network; diff --git a/Content.Server/Construction/Completions/AddContainer.cs b/Content.Server/Construction/Completions/AddContainer.cs index 32d4d112ca..ab3ae50fa8 100644 --- a/Content.Server/Construction/Completions/AddContainer.cs +++ b/Content.Server/Construction/Completions/AddContainer.cs @@ -3,8 +3,7 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Construction; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Construction.Completions diff --git a/Content.Server/Construction/Completions/BuildComputer.cs b/Content.Server/Construction/Completions/BuildComputer.cs index dbb7369fee..0f78639fec 100644 --- a/Content.Server/Construction/Completions/BuildComputer.cs +++ b/Content.Server/Construction/Completions/BuildComputer.cs @@ -1,12 +1,11 @@ -#nullable enable +#nullable enable using System.Linq; using System.Threading.Tasks; using Content.Server.GameObjects.Components.Construction; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Server.GameObjects.Components.Container; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Log; using Robust.Shared.Serialization; diff --git a/Content.Server/Construction/Completions/BuildMachine.cs b/Content.Server/Construction/Completions/BuildMachine.cs index 2d7e9d35f4..461d5a5f1c 100644 --- a/Content.Server/Construction/Completions/BuildMachine.cs +++ b/Content.Server/Construction/Completions/BuildMachine.cs @@ -1,15 +1,12 @@ -#nullable enable +#nullable enable using System.Linq; using System.Threading.Tasks; -using Content.Server.GameObjects; using Content.Server.GameObjects.Components.Construction; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects; using Robust.Shared.Containers; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Log; using Robust.Shared.Serialization; diff --git a/Content.Server/Construction/Completions/DeleteEntity.cs b/Content.Server/Construction/Completions/DeleteEntity.cs index 61fcadc89b..2b924578a5 100644 --- a/Content.Server/Construction/Completions/DeleteEntity.cs +++ b/Content.Server/Construction/Completions/DeleteEntity.cs @@ -2,8 +2,7 @@ using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Construction.Completions diff --git a/Content.Server/Construction/Completions/EmptyAllContainers.cs b/Content.Server/Construction/Completions/EmptyAllContainers.cs index ec4495c5b4..ece0866564 100644 --- a/Content.Server/Construction/Completions/EmptyAllContainers.cs +++ b/Content.Server/Construction/Completions/EmptyAllContainers.cs @@ -2,10 +2,9 @@ using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects; using Robust.Shared.Containers; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Construction.Completions diff --git a/Content.Server/Construction/Completions/EmptyContainer.cs b/Content.Server/Construction/Completions/EmptyContainer.cs index 88612b0fb2..624ddfcadb 100644 --- a/Content.Server/Construction/Completions/EmptyContainer.cs +++ b/Content.Server/Construction/Completions/EmptyContainer.cs @@ -1,12 +1,10 @@ #nullable enable -using System.Linq; using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects; using Robust.Shared.Containers; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Construction.Completions diff --git a/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs b/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs index 18120c5567..c76ca72184 100644 --- a/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs +++ b/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs @@ -3,8 +3,7 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Construction; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Construction.Completions diff --git a/Content.Server/Construction/Completions/PlaySound.cs b/Content.Server/Construction/Completions/PlaySound.cs index 69991ea04e..be859e9726 100644 --- a/Content.Server/Construction/Completions/PlaySound.cs +++ b/Content.Server/Construction/Completions/PlaySound.cs @@ -3,10 +3,8 @@ using System.Threading.Tasks; using Content.Shared.Audio; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Construction.Completions diff --git a/Content.Server/Construction/Completions/PopupUser.cs b/Content.Server/Construction/Completions/PopupUser.cs index bbdae1a688..28275c806e 100644 --- a/Content.Server/Construction/Completions/PopupUser.cs +++ b/Content.Server/Construction/Completions/PopupUser.cs @@ -3,8 +3,7 @@ using System.Threading.Tasks; using Content.Shared.Construction; using Content.Shared.Interfaces; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Construction.Completions diff --git a/Content.Server/Construction/Completions/SetAnchor.cs b/Content.Server/Construction/Completions/SetAnchor.cs index ba18f42b6a..69037b8b79 100644 --- a/Content.Server/Construction/Completions/SetAnchor.cs +++ b/Content.Server/Construction/Completions/SetAnchor.cs @@ -2,9 +2,7 @@ using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Construction.Completions diff --git a/Content.Server/Construction/Completions/SetStackCount.cs b/Content.Server/Construction/Completions/SetStackCount.cs index 7bcd5f78cf..9ac78c5dfb 100644 --- a/Content.Server/Construction/Completions/SetStackCount.cs +++ b/Content.Server/Construction/Completions/SetStackCount.cs @@ -3,9 +3,8 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Stack; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; using System; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Log; using Robust.Shared.Serialization; diff --git a/Content.Server/Construction/Completions/SnapToGrid.cs b/Content.Server/Construction/Completions/SnapToGrid.cs index dbb5c12636..5f52e30a91 100644 --- a/Content.Server/Construction/Completions/SnapToGrid.cs +++ b/Content.Server/Construction/Completions/SnapToGrid.cs @@ -3,9 +3,7 @@ using System.Threading.Tasks; using Content.Server.Utility; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.Maths; diff --git a/Content.Server/Construction/Completions/SpawnPrototype.cs b/Content.Server/Construction/Completions/SpawnPrototype.cs index f98224f881..be3b2fc7b4 100644 --- a/Content.Server/Construction/Completions/SpawnPrototype.cs +++ b/Content.Server/Construction/Completions/SpawnPrototype.cs @@ -5,8 +5,7 @@ using Content.Server.GameObjects.Components.Stack; using Content.Shared.Construction; using Content.Shared.Utility; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Serialization; diff --git a/Content.Server/Construction/Completions/SpriteChange.cs b/Content.Server/Construction/Completions/SpriteChange.cs index 2517a62826..8547407196 100644 --- a/Content.Server/Construction/Completions/SpriteChange.cs +++ b/Content.Server/Construction/Completions/SpriteChange.cs @@ -1,11 +1,9 @@ #nullable enable -using System; using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Server.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/Construction/Completions/SpriteStateChange.cs b/Content.Server/Construction/Completions/SpriteStateChange.cs index 2e52d7834a..7296b42662 100644 --- a/Content.Server/Construction/Completions/SpriteStateChange.cs +++ b/Content.Server/Construction/Completions/SpriteStateChange.cs @@ -3,10 +3,8 @@ using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Server.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -using Robust.Shared.Utility; namespace Content.Server.Construction.Completions { diff --git a/Content.Server/Construction/Completions/VisualizerDataInt.cs b/Content.Server/Construction/Completions/VisualizerDataInt.cs index dc523f0bbe..1cb52454f6 100644 --- a/Content.Server/Construction/Completions/VisualizerDataInt.cs +++ b/Content.Server/Construction/Completions/VisualizerDataInt.cs @@ -3,10 +3,9 @@ using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Server.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; namespace Content.Server.Construction.Completions diff --git a/Content.Server/Construction/Conditions/AllWiresCut.cs b/Content.Server/Construction/Conditions/AllWiresCut.cs index 256dadb531..de2d53fe6c 100644 --- a/Content.Server/Construction/Conditions/AllWiresCut.cs +++ b/Content.Server/Construction/Conditions/AllWiresCut.cs @@ -1,10 +1,8 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components; -using Content.Server.GameObjects.Components.Power; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.Construction.Conditions diff --git a/Content.Server/Construction/Conditions/ComponentInTile.cs b/Content.Server/Construction/Conditions/ComponentInTile.cs index 6350a8f0c4..45cc323fba 100644 --- a/Content.Server/Construction/Conditions/ComponentInTile.cs +++ b/Content.Server/Construction/Conditions/ComponentInTile.cs @@ -2,10 +2,9 @@ using Content.Shared.Construction; using Content.Shared.Maps; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Serialization; namespace Content.Server.Construction.Conditions diff --git a/Content.Server/Construction/Conditions/ContainerEmpty.cs b/Content.Server/Construction/Conditions/ContainerEmpty.cs index 601ebe5e6f..0deb924e45 100644 --- a/Content.Server/Construction/Conditions/ContainerEmpty.cs +++ b/Content.Server/Construction/Conditions/ContainerEmpty.cs @@ -2,9 +2,8 @@ using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Server.GameObjects.Components.Container; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/Construction/Conditions/DoorWelded.cs b/Content.Server/Construction/Conditions/DoorWelded.cs index e6c16d09f1..982f88d3ef 100644 --- a/Content.Server/Construction/Conditions/DoorWelded.cs +++ b/Content.Server/Construction/Conditions/DoorWelded.cs @@ -1,13 +1,9 @@ using System.Threading.Tasks; -using Content.Server.GameObjects.Components.Atmos; using Content.Server.GameObjects.Components.Doors; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; -using Robust.Shared.Log; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/Construction/Conditions/EntityAnchored.cs b/Content.Server/Construction/Conditions/EntityAnchored.cs index 948108a786..8dcb5bfc76 100644 --- a/Content.Server/Construction/Conditions/EntityAnchored.cs +++ b/Content.Server/Construction/Conditions/EntityAnchored.cs @@ -1,9 +1,7 @@ using System.Threading.Tasks; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/Construction/Conditions/MachineFrameComplete.cs b/Content.Server/Construction/Conditions/MachineFrameComplete.cs index 9fa3786e4d..bc66d08aea 100644 --- a/Content.Server/Construction/Conditions/MachineFrameComplete.cs +++ b/Content.Server/Construction/Conditions/MachineFrameComplete.cs @@ -2,8 +2,7 @@ using Content.Server.GameObjects.Components.Construction; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/Construction/Conditions/ToiletLidClosed.cs b/Content.Server/Construction/Conditions/ToiletLidClosed.cs index d3778b4218..93bc91b085 100644 --- a/Content.Server/Construction/Conditions/ToiletLidClosed.cs +++ b/Content.Server/Construction/Conditions/ToiletLidClosed.cs @@ -3,8 +3,7 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Watercloset; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/Construction/Conditions/WirePanel.cs b/Content.Server/Construction/Conditions/WirePanel.cs index 169c001813..8d76ff3b18 100644 --- a/Content.Server/Construction/Conditions/WirePanel.cs +++ b/Content.Server/Construction/Conditions/WirePanel.cs @@ -2,8 +2,7 @@ using Content.Server.GameObjects.Components; using Content.Shared.Construction; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/Construction/StackHelpers.cs b/Content.Server/Construction/StackHelpers.cs index fcb72892cc..3edbdcb3e4 100644 --- a/Content.Server/Construction/StackHelpers.cs +++ b/Content.Server/Construction/StackHelpers.cs @@ -2,7 +2,7 @@ using System; using Content.Server.GameObjects.Components.Stack; using Content.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs index e5651f12d5..edcc2a5cd6 100644 --- a/Content.Server/Database/ServerDbManager.cs +++ b/Content.Server/Database/ServerDbManager.cs @@ -9,10 +9,10 @@ using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Npgsql; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Log; -using Robust.Shared.Interfaces.Resources; +using Robust.Shared.Configuration; +using Robust.Shared.ContentPack; using Robust.Shared.IoC; +using Robust.Shared.Log; using Robust.Shared.Network; using MSLogLevel = Microsoft.Extensions.Logging.LogLevel; using LogLevel = Robust.Shared.Log.LogLevel; diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs index 9e726240e0..56ed4f134d 100644 --- a/Content.Server/Database/ServerDbSqlite.cs +++ b/Content.Server/Database/ServerDbSqlite.cs @@ -8,7 +8,7 @@ using Content.Server.Preferences; using Content.Server.Utility; using Content.Shared; using Microsoft.EntityFrameworkCore; -using Robust.Shared.Interfaces.Configuration; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Network; diff --git a/Content.Server/DeviceNetwork/DeviceNetwork.cs b/Content.Server/DeviceNetwork/DeviceNetwork.cs index d9d4688d38..3d9d1f7c93 100644 --- a/Content.Server/DeviceNetwork/DeviceNetwork.cs +++ b/Content.Server/DeviceNetwork/DeviceNetwork.cs @@ -1,8 +1,8 @@ using System; using Content.Server.Interfaces; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using System.Collections.Generic; +using Robust.Shared.Random; namespace Content.Server.GameObjects.EntitySystems.DeviceNetwork { diff --git a/Content.Server/DeviceNetwork/NetworkConnections/WiredNetworkConnection.cs b/Content.Server/DeviceNetwork/NetworkConnections/WiredNetworkConnection.cs index d11e230059..046d8bc295 100644 --- a/Content.Server/DeviceNetwork/NetworkConnections/WiredNetworkConnection.cs +++ b/Content.Server/DeviceNetwork/NetworkConnections/WiredNetworkConnection.cs @@ -1,8 +1,8 @@ using Content.Server.GameObjects.Components.NodeContainer; using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Robust.Shared.Interfaces.GameObjects; using System.Collections.Generic; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems.DeviceNetwork { diff --git a/Content.Server/DeviceNetwork/NetworkConnections/WirelessNetworkConnection.cs b/Content.Server/DeviceNetwork/NetworkConnections/WirelessNetworkConnection.cs index 5763ef3d3b..3ad98ed8b3 100644 --- a/Content.Server/DeviceNetwork/NetworkConnections/WirelessNetworkConnection.cs +++ b/Content.Server/DeviceNetwork/NetworkConnections/WirelessNetworkConnection.cs @@ -1,7 +1,7 @@ -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Maths; +using Robust.Shared.Maths; using System; using System.Collections.Generic; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems.DeviceNetwork { diff --git a/Content.Server/DeviceNetwork/NetworkUtils.cs b/Content.Server/DeviceNetwork/NetworkUtils.cs index 349d1a6c4d..308de60c76 100644 --- a/Content.Server/DeviceNetwork/NetworkUtils.cs +++ b/Content.Server/DeviceNetwork/NetworkUtils.cs @@ -1,7 +1,5 @@ using Content.Server.Interfaces; -using System; using System.Collections.Generic; -using System.Text; namespace Content.Server.GameObjects.EntitySystems.DeviceNetwork { diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs index f7bbac022d..0eea4d7db4 100644 --- a/Content.Server/EntryPoint.cs +++ b/Content.Server/EntryPoint.cs @@ -13,10 +13,9 @@ using Content.Server.Sandbox; using Content.Shared.Actions; using Content.Shared.Kitchen; using Content.Shared.Alert; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Log; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Timing; diff --git a/Content.Server/Eui/BaseEui.cs b/Content.Server/Eui/BaseEui.cs index cd2dc4c52f..db436d1839 100644 --- a/Content.Server/Eui/BaseEui.cs +++ b/Content.Server/Eui/BaseEui.cs @@ -1,9 +1,9 @@ using System; using Content.Shared.Eui; using Content.Shared.Network.NetMessages; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.Network; +using Robust.Server.Player; using Robust.Shared.IoC; +using Robust.Shared.Network; #nullable enable diff --git a/Content.Server/Eui/EuiManager.cs b/Content.Server/Eui/EuiManager.cs index b417e76f0c..6a9d263835 100644 --- a/Content.Server/Eui/EuiManager.cs +++ b/Content.Server/Eui/EuiManager.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; using Content.Shared.Network.NetMessages; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; using Robust.Shared.Enums; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Network; using Robust.Shared.Utility; #nullable enable diff --git a/Content.Server/Explosions/ExplosionHelper.cs b/Content.Server/Explosions/ExplosionHelper.cs index aa5a97e111..759d3c1269 100644 --- a/Content.Server/Explosions/ExplosionHelper.cs +++ b/Content.Server/Explosions/ExplosionHelper.cs @@ -9,21 +9,15 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Maps; using Content.Shared.Physics; using Content.Shared.Utility; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.Containers; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Random; +using Robust.Shared.Timing; namespace Content.Server.Explosions { diff --git a/Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs b/Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs index c75e913069..ec26dea010 100644 --- a/Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs +++ b/Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs @@ -1,5 +1,4 @@ using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects.Components.Access { diff --git a/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs b/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs index 5b0046ff20..1652a3863f 100644 --- a/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs +++ b/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs @@ -9,7 +9,6 @@ using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Inventory; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs b/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs index 44a0232bcf..a25d8f6863 100644 --- a/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs @@ -12,11 +12,8 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.GameObjects.Verbs; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; diff --git a/Content.Server/GameObjects/Components/Access/PresetIdCardComponent.cs b/Content.Server/GameObjects/Components/Access/PresetIdCardComponent.cs index fef2f41022..d7b8016563 100644 --- a/Content.Server/GameObjects/Components/Access/PresetIdCardComponent.cs +++ b/Content.Server/GameObjects/Components/Access/PresetIdCardComponent.cs @@ -1,6 +1,6 @@ #nullable enable using Content.Shared.Roles; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs b/Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs index 61354f3538..cb342632ca 100644 --- a/Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs +++ b/Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs @@ -5,7 +5,6 @@ using System.Linq; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.EntitySystems.DoAfter; -using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.Alert; using Content.Shared.GameObjects.Components.ActionBlocking; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; @@ -13,11 +12,7 @@ using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Utility; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs b/Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs index 51f0addcee..4490bfecc8 100644 --- a/Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs +++ b/Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs @@ -9,10 +9,8 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Actor/CharacterInfoComponent.cs b/Content.Server/GameObjects/Components/Actor/CharacterInfoComponent.cs index b29fe3a2d5..4d15ade315 100644 --- a/Content.Server/GameObjects/Components/Actor/CharacterInfoComponent.cs +++ b/Content.Server/GameObjects/Components/Actor/CharacterInfoComponent.cs @@ -1,12 +1,11 @@ #nullable enable using System.Collections.Generic; -using System.Linq; using Content.Server.GameObjects.Components.Mobs; using Content.Server.Mobs.Roles; using Content.Shared.GameObjects.Components.Actor; using Content.Shared.Objectives; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Network; using Robust.Shared.Players; namespace Content.Server.GameObjects.Components.Actor diff --git a/Content.Server/GameObjects/Components/AnchorableComponent.cs b/Content.Server/GameObjects/Components/AnchorableComponent.cs index 3e9cfb6f25..5410116d88 100644 --- a/Content.Server/GameObjects/Components/AnchorableComponent.cs +++ b/Content.Server/GameObjects/Components/AnchorableComponent.cs @@ -6,9 +6,6 @@ using Content.Server.Utility; using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Arcade/BlockGameArcadeComponent.cs b/Content.Server/GameObjects/Components/Arcade/BlockGameArcadeComponent.cs index 53bd939102..464385f55a 100644 --- a/Content.Server/GameObjects/Components/Arcade/BlockGameArcadeComponent.cs +++ b/Content.Server/GameObjects/Components/Arcade/BlockGameArcadeComponent.cs @@ -9,14 +9,9 @@ using Content.Shared.Arcade; using Content.Shared.GameObjects; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/Arcade/RandomArcadeGameComponent.cs b/Content.Server/GameObjects/Components/Arcade/RandomArcadeGameComponent.cs index 84c4b6ccd3..e6c229b6ec 100644 --- a/Content.Server/GameObjects/Components/Arcade/RandomArcadeGameComponent.cs +++ b/Content.Server/GameObjects/Components/Arcade/RandomArcadeGameComponent.cs @@ -1,11 +1,7 @@ -using System; -using Robust.Server.Interfaces.GameObjects; +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.Random; -using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Arcade { diff --git a/Content.Server/GameObjects/Components/Arcade/SpaceVillainArcadeComponent.cs b/Content.Server/GameObjects/Components/Arcade/SpaceVillainArcadeComponent.cs index 4b12425209..e5f646873c 100644 --- a/Content.Server/GameObjects/Components/Arcade/SpaceVillainArcadeComponent.cs +++ b/Content.Server/GameObjects/Components/Arcade/SpaceVillainArcadeComponent.cs @@ -5,18 +5,11 @@ using Content.Server.GameObjects.Components.VendingMachines; using Content.Server.Utility; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Arcade; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -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.Maths; diff --git a/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs b/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs index 0d05e63cc8..1974e7a21f 100644 --- a/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs @@ -1,11 +1,8 @@ -#nullable enable +#nullable enable using Content.Server.GameObjects.EntitySystems; using Content.Shared.Atmos; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Atmos/AtmosExposedComponent.cs b/Content.Server/GameObjects/Components/Atmos/AtmosExposedComponent.cs index 39af196ddd..9c5726040d 100644 --- a/Content.Server/GameObjects/Components/Atmos/AtmosExposedComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/AtmosExposedComponent.cs @@ -2,7 +2,6 @@ using Content.Server.Atmos; using Content.Server.GameObjects.Components.Temperature; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Atmos diff --git a/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs b/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs index f595aa4b13..e0388dd008 100644 --- a/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs @@ -6,7 +6,6 @@ using Content.Shared.Alert; using Content.Shared.Atmos; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; -using Content.Shared.GameObjects.Components.Mobs; using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Atmos diff --git a/Content.Server/GameObjects/Components/Atmos/BreathToolComponent.cs b/Content.Server/GameObjects/Components/Atmos/BreathToolComponent.cs index 1546b9f305..5d8b269030 100644 --- a/Content.Server/GameObjects/Components/Atmos/BreathToolComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/BreathToolComponent.cs @@ -2,9 +2,7 @@ using Content.Server.GameObjects.Components.Body.Respiratory; using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.Interfaces.GameObjects.Components; -using Npgsql.TypeHandlers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Atmos diff --git a/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs b/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs index 5a8fd241f4..94c2aa50aa 100644 --- a/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs @@ -7,8 +7,6 @@ using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects.Components.Atmos { diff --git a/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs b/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs index 9a8bcdb594..26777a5488 100644 --- a/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs @@ -3,28 +3,19 @@ using System.Collections.Generic; using Content.Server.Atmos; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Temperature; -using Content.Server.GameObjects.EntitySystems; using Content.Shared.Alert; using Content.Shared.Atmos; using Content.Shared.Chemistry; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Atmos; using Content.Shared.GameObjects.Components.Damage; -using Content.Shared.GameObjects.Components.Mobs; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; -using Robust.Shared.Timers; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Atmos diff --git a/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs b/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs index 586a332bdb..32804ad986 100644 --- a/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs @@ -9,18 +9,13 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.UserInterface; -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.Map; using Robust.Shared.ViewVariables; using System.Collections.Generic; using System.Threading.Tasks; +using Robust.Server.Player; namespace Content.Server.GameObjects.Components.Atmos { diff --git a/Content.Server/GameObjects/Components/Atmos/GasCanisterComponent.cs b/Content.Server/GameObjects/Components/Atmos/GasCanisterComponent.cs index 215d33fa1f..9c1d0f329b 100644 --- a/Content.Server/GameObjects/Components/Atmos/GasCanisterComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/GasCanisterComponent.cs @@ -4,27 +4,15 @@ using Content.Server.Atmos; using Content.Server.GameObjects.Components.Atmos.Piping; using Content.Server.Interfaces; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using System.Linq; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Server.Utility; using Content.Shared.GameObjects.Components.Atmos; -using Content.Shared.GameObjects.EntitySystems; -using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Atmos; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Containers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Localization; namespace Content.Server.GameObjects.Components.Atmos { diff --git a/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs b/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs index cc53c0e7c4..74fc116be2 100644 --- a/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs @@ -15,16 +15,10 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces.GameObjects.Components; using JetBrains.Annotations; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs b/Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs index 193b606eb0..da167ff466 100644 --- a/Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using System.Collections; using System.Collections.Generic; @@ -11,13 +11,8 @@ using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems.Atmos; using Content.Shared.Atmos; using Content.Shared.Maps; -using Robust.Server.GameObjects.EntitySystems.TileLookup; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Map; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs b/Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs index 8e840ce03e..36a5bae151 100644 --- a/Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs @@ -1,7 +1,6 @@ #nullable enable using System.Diagnostics.CodeAnalysis; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/GasCanisterPortComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/GasCanisterPortComponent.cs index a5fbc16b0c..03392c1846 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/GasCanisterPortComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/Piping/GasCanisterPortComponent.cs @@ -2,8 +2,6 @@ using Content.Server.GameObjects.Components.NodeContainer; using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Log; using Robust.Shared.ViewVariables; using System.Linq; diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs index 451a5c39d5..d120fe4d29 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs @@ -6,8 +6,6 @@ using Content.Shared.Atmos; using Content.Shared.GameObjects.Components.Atmos; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Log; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/GasGeneratorComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/GasGeneratorComponent.cs index 5a37d7a669..d4362bbb2a 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/GasGeneratorComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/Piping/GasGeneratorComponent.cs @@ -3,7 +3,6 @@ using Content.Server.GameObjects.Components.NodeContainer; using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Shared.Atmos; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Log; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/PipeNetDeviceComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/PipeNetDeviceComponent.cs index 0b2b94d92f..52b3b10bc7 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/PipeNetDeviceComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/Piping/PipeNetDeviceComponent.cs @@ -2,7 +2,6 @@ using Content.Server.Atmos; using Content.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.Components.Atmos.Piping { diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs index 76cbc85961..672743c018 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs @@ -7,7 +7,6 @@ using Content.Shared.GameObjects.Components.Atmos; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Log; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs index a67e354a4d..e6f24f166f 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs @@ -7,8 +7,6 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Atmos; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Log; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs index c9b9e48f86..2a58dd5284 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs @@ -7,8 +7,6 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Atmos; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Log; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Atmos/UnsimulatedGridAtmosphereComponent.cs b/Content.Server/GameObjects/Components/Atmos/UnsimulatedGridAtmosphereComponent.cs index a2a9829673..299eefe531 100644 --- a/Content.Server/GameObjects/Components/Atmos/UnsimulatedGridAtmosphereComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/UnsimulatedGridAtmosphereComponent.cs @@ -5,8 +5,6 @@ using Content.Server.GameObjects.Components.Atmos.Piping; using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Content.Shared.Atmos; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.Map; using Robust.Shared.Maths; namespace Content.Server.GameObjects.Components.Atmos diff --git a/Content.Server/GameObjects/Components/AtmosPlaqueComponent.cs b/Content.Server/GameObjects/Components/AtmosPlaqueComponent.cs index 4107589cc5..2d5c1545a5 100644 --- a/Content.Server/GameObjects/Components/AtmosPlaqueComponent.cs +++ b/Content.Server/GameObjects/Components/AtmosPlaqueComponent.cs @@ -1,8 +1,7 @@ -using Robust.Server.GameObjects; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; +using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/BarSign/BarSignComponent.cs b/Content.Server/GameObjects/Components/BarSign/BarSignComponent.cs index bc18f218e0..5c4f2c1161 100644 --- a/Content.Server/GameObjects/Components/BarSign/BarSignComponent.cs +++ b/Content.Server/GameObjects/Components/BarSign/BarSignComponent.cs @@ -2,10 +2,7 @@ using System.Linq; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Robust.Server.GameObjects; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; diff --git a/Content.Server/GameObjects/Components/Body/Behavior/BrainBehavior.cs b/Content.Server/GameObjects/Components/Body/Behavior/BrainBehavior.cs index 5b740f75f1..f079847d9d 100644 --- a/Content.Server/GameObjects/Components/Body/Behavior/BrainBehavior.cs +++ b/Content.Server/GameObjects/Components/Body/Behavior/BrainBehavior.cs @@ -5,7 +5,6 @@ using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Body.Part; using Content.Shared.GameObjects.Components.Movement; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects.Components.Body.Behavior { diff --git a/Content.Server/GameObjects/Components/Body/Behavior/HeartBehavior.cs b/Content.Server/GameObjects/Components/Body/Behavior/HeartBehavior.cs index 855c5831ef..d4bb7e2539 100644 --- a/Content.Server/GameObjects/Components/Body/Behavior/HeartBehavior.cs +++ b/Content.Server/GameObjects/Components/Body/Behavior/HeartBehavior.cs @@ -1,5 +1,4 @@ -using Content.Shared.GameObjects.Components.Body.Behavior; -using Content.Shared.GameObjects.Components.Body.Networks; +using Content.Shared.GameObjects.Components.Body.Networks; namespace Content.Server.GameObjects.Components.Body.Behavior { diff --git a/Content.Server/GameObjects/Components/Body/Behavior/LungBehavior.cs b/Content.Server/GameObjects/Components/Body/Behavior/LungBehavior.cs index cf402231ec..f85b38b39f 100644 --- a/Content.Server/GameObjects/Components/Body/Behavior/LungBehavior.cs +++ b/Content.Server/GameObjects/Components/Body/Behavior/LungBehavior.cs @@ -1,18 +1,16 @@ #nullable enable using System; -using System.Linq; using Content.Server.Atmos; using Content.Server.GameObjects.Components.Atmos; using Content.Server.GameObjects.Components.Body.Circulatory; using Content.Server.GameObjects.Components.Body.Respiratory; using Content.Server.Utility; using Content.Shared.Atmos; -using Content.Shared.GameObjects.Components.Body.Behavior; using Content.Shared.GameObjects.Components.Mobs.State; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Body.Behavior diff --git a/Content.Server/GameObjects/Components/Body/Behavior/MechanismBehavior.cs b/Content.Server/GameObjects/Components/Body/Behavior/MechanismBehavior.cs index ca571ab0ac..a3629ad1fc 100644 --- a/Content.Server/GameObjects/Components/Body/Behavior/MechanismBehavior.cs +++ b/Content.Server/GameObjects/Components/Body/Behavior/MechanismBehavior.cs @@ -3,7 +3,7 @@ using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Body.Behavior; using Content.Shared.GameObjects.Components.Body.Mechanism; using Content.Shared.GameObjects.Components.Body.Part; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/Body/BodyComponent.cs b/Content.Server/GameObjects/Components/Body/BodyComponent.cs index 8adec50390..2c91381820 100644 --- a/Content.Server/GameObjects/Components/Body/BodyComponent.cs +++ b/Content.Server/GameObjects/Components/Body/BodyComponent.cs @@ -5,18 +5,13 @@ using Content.Server.GameObjects.Components.Observer; using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Body.Part; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs.State; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.Utility; using Robust.Server.Console; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Audio; +using Robust.Server.GameObjects; using Robust.Shared.Console; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Players; diff --git a/Content.Server/GameObjects/Components/Body/BodyScannerComponent.cs b/Content.Server/GameObjects/Components/Body/BodyScannerComponent.cs index 9ff7e3394c..332d42dab3 100644 --- a/Content.Server/GameObjects/Components/Body/BodyScannerComponent.cs +++ b/Content.Server/GameObjects/Components/Body/BodyScannerComponent.cs @@ -3,8 +3,7 @@ using Content.Server.Utility; using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Body.Scanner; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Body/MechanismComponent.cs b/Content.Server/GameObjects/Components/Body/MechanismComponent.cs index 8dd4658573..c89b4b7d55 100644 --- a/Content.Server/GameObjects/Components/Body/MechanismComponent.cs +++ b/Content.Server/GameObjects/Components/Body/MechanismComponent.cs @@ -9,9 +9,7 @@ using Content.Shared.GameObjects.Components.Body.Surgery; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/Body/Part/BodyPartComponent.cs b/Content.Server/GameObjects/Components/Body/Part/BodyPartComponent.cs index dfa0ee67fe..365c3c639a 100644 --- a/Content.Server/GameObjects/Components/Body/Part/BodyPartComponent.cs +++ b/Content.Server/GameObjects/Components/Body/Part/BodyPartComponent.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Content.Server.Commands; using Content.Server.Utility; using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Body.Mechanism; @@ -14,12 +13,8 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Server.Console; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; diff --git a/Content.Server/GameObjects/Components/Body/Respiratory/InternalsComponent.cs b/Content.Server/GameObjects/Components/Body/Respiratory/InternalsComponent.cs index 63594ffcee..b94093c8b6 100644 --- a/Content.Server/GameObjects/Components/Body/Respiratory/InternalsComponent.cs +++ b/Content.Server/GameObjects/Components/Body/Respiratory/InternalsComponent.cs @@ -1,7 +1,6 @@ #nullable enable using Content.Server.GameObjects.Components.Atmos; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Body.Respiratory diff --git a/Content.Server/GameObjects/Components/Body/Surgery/BiologicalSurgeryDataComponent.cs b/Content.Server/GameObjects/Components/Body/Surgery/BiologicalSurgeryDataComponent.cs index 76faca3c32..33645c5b3f 100644 --- a/Content.Server/GameObjects/Components/Body/Surgery/BiologicalSurgeryDataComponent.cs +++ b/Content.Server/GameObjects/Components/Body/Surgery/BiologicalSurgeryDataComponent.cs @@ -10,8 +10,6 @@ using Content.Shared.GameObjects.Components.Body.Part; using Content.Shared.GameObjects.Components.Body.Surgery; using Content.Shared.Interfaces; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using static Content.Shared.GameObjects.Components.Body.Surgery.ISurgeryData; diff --git a/Content.Server/GameObjects/Components/Body/Surgery/SurgeryToolComponent.cs b/Content.Server/GameObjects/Components/Body/Surgery/SurgeryToolComponent.cs index 717bbccd99..7a93fa7e54 100644 --- a/Content.Server/GameObjects/Components/Body/Surgery/SurgeryToolComponent.cs +++ b/Content.Server/GameObjects/Components/Body/Surgery/SurgeryToolComponent.cs @@ -12,11 +12,8 @@ using Content.Shared.GameObjects.Components.Body.Surgery; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Botany/LogComponent.cs b/Content.Server/GameObjects/Components/Botany/LogComponent.cs index e39722cd05..0f98cc42c1 100644 --- a/Content.Server/GameObjects/Components/Botany/LogComponent.cs +++ b/Content.Server/GameObjects/Components/Botany/LogComponent.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/Botany/PlantHolderComponent.cs b/Content.Server/GameObjects/Components/Botany/PlantHolderComponent.cs index a77e48bf1b..82ac664922 100644 --- a/Content.Server/GameObjects/Components/Botany/PlantHolderComponent.cs +++ b/Content.Server/GameObjects/Components/Botany/PlantHolderComponent.cs @@ -19,19 +19,14 @@ using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Botany/SeedExtractorComponent.cs b/Content.Server/GameObjects/Components/Botany/SeedExtractorComponent.cs index 0d4b9a5d63..d1878065df 100644 --- a/Content.Server/GameObjects/Components/Botany/SeedExtractorComponent.cs +++ b/Content.Server/GameObjects/Components/Botany/SeedExtractorComponent.cs @@ -1,18 +1,12 @@ #nullable enable -using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.Utility; -using Content.Shared.GameObjects.Components.Botany; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Random; namespace Content.Server.GameObjects.Components.Botany { diff --git a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs index 61f1539e22..187bff7edc 100644 --- a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs +++ b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs @@ -10,24 +10,19 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.Alert; using Content.Shared.GameObjects.Components.Buckle; using Content.Shared.GameObjects.Components.Strap; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Buckle diff --git a/Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs b/Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs index db36c2a884..b23c650ac1 100644 --- a/Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs @@ -6,19 +6,14 @@ using Content.Server.Utility; 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; 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.Log; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using System.Collections.Generic; -using System.Linq; +using Robust.Server.GameObjects; +using Robust.Shared.Map; namespace Content.Server.GameObjects.Components.Cargo { diff --git a/Content.Server/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs b/Content.Server/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs index 54c5c7e091..cac12d409d 100644 --- a/Content.Server/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs +++ b/Content.Server/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs @@ -2,8 +2,6 @@ using Content.Server.Cargo; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Cargo; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.IoC; namespace Content.Server.GameObjects.Components.Cargo { diff --git a/Content.Server/GameObjects/Components/Cargo/CargoTelepadComponent.cs b/Content.Server/GameObjects/Components/Cargo/CargoTelepadComponent.cs index a261a92626..6c180235b0 100644 --- a/Content.Server/GameObjects/Components/Cargo/CargoTelepadComponent.cs +++ b/Content.Server/GameObjects/Components/Cargo/CargoTelepadComponent.cs @@ -1,14 +1,9 @@ #nullable enable using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Prototypes.Cargo; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using System.Collections.Generic; namespace Content.Server.GameObjects.Components.Cargo diff --git a/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs b/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs index 7d5d0625ab..4fe26afa10 100644 --- a/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs @@ -15,14 +15,9 @@ using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Content.Shared.GameObjects.Verbs; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Chemistry/FoamSolutionAreaEffectComponent.cs b/Content.Server/GameObjects/Components/Chemistry/FoamSolutionAreaEffectComponent.cs index 6b9e6dd3b5..30f5c8704d 100644 --- a/Content.Server/GameObjects/Components/Chemistry/FoamSolutionAreaEffectComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/FoamSolutionAreaEffectComponent.cs @@ -7,8 +7,6 @@ using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.GameObjects.Components.Inventory; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Chemistry diff --git a/Content.Server/GameObjects/Components/Chemistry/HyposprayComponent.cs b/Content.Server/GameObjects/Components/Chemistry/HyposprayComponent.cs index 7783b38f72..756252181f 100644 --- a/Content.Server/GameObjects/Components/Chemistry/HyposprayComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/HyposprayComponent.cs @@ -7,11 +7,8 @@ using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs b/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs index fa23f8c0de..651e71f223 100644 --- a/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs @@ -9,7 +9,6 @@ using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Chemistry/PillComponent.cs b/Content.Server/GameObjects/Components/Chemistry/PillComponent.cs index a5f2551dae..e4e8a622d7 100644 --- a/Content.Server/GameObjects/Components/Chemistry/PillComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/PillComponent.cs @@ -8,10 +8,9 @@ using Content.Shared.GameObjects.Components.Body; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Prototypes; diff --git a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs b/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs index eb62004809..9f78867b43 100644 --- a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Server.Utility; using Content.Shared.Chemistry; @@ -16,14 +15,9 @@ using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.GameObjects.Verbs; using JetBrains.Annotations; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Prototypes; diff --git a/Content.Server/GameObjects/Components/Chemistry/RehydratableComponent.cs b/Content.Server/GameObjects/Components/Chemistry/RehydratableComponent.cs index 59d95f2054..789ee73f54 100644 --- a/Content.Server/GameObjects/Components/Chemistry/RehydratableComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/RehydratableComponent.cs @@ -3,7 +3,6 @@ using Content.Server.Utility; using Content.Shared.Chemistry; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; -using Content.Shared.Utility; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Chemistry/SmokeSolutionAreaEffectComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SmokeSolutionAreaEffectComponent.cs index f916725ad6..43cd9a58aa 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SmokeSolutionAreaEffectComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SmokeSolutionAreaEffectComponent.cs @@ -7,7 +7,6 @@ using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects.Components.Chemistry { diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectComponent.cs index 682cfac522..55df244278 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectComponent.cs @@ -6,12 +6,9 @@ using Content.Server.Utility; using Content.Shared.Chemistry; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs index 36ff877874..bfb464c99d 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs @@ -1,20 +1,6 @@ #nullable enable -using Content.Server.Administration; -using Content.Server.Eui; -using Content.Server.GameObjects.Components.GUI; -using Content.Shared.Administration; -using Content.Shared.Chemistry; -using Content.Shared.Eui; using Content.Shared.GameObjects.Components.Chemistry; -using Content.Shared.GameObjects.EntitySystems; -using Content.Shared.GameObjects.EntitySystems.ActionBlocker; -using Content.Shared.GameObjects.Verbs; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Localization; namespace Content.Server.GameObjects.Components.Chemistry { diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionTransferComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionTransferComponent.cs index b0f43572eb..37f9aa7323 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionTransferComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionTransferComponent.cs @@ -5,7 +5,6 @@ using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionTransferVerbs.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionTransferVerbs.cs index 8715ed027a..fadbf82ee6 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionTransferVerbs.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionTransferVerbs.cs @@ -8,9 +8,9 @@ using Content.Shared.Eui; using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Server.Player; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs b/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs index 208cfd658f..040bf9eb92 100644 --- a/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs @@ -4,9 +4,6 @@ using Content.Shared.GameObjects.Components; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Physics; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs b/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs index 858a10d3e3..0bf27eb1fd 100644 --- a/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs @@ -4,12 +4,9 @@ using Content.Server.GameObjects.EntitySystems; 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; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/ComputerComponent.cs b/Content.Server/GameObjects/Components/ComputerComponent.cs index 9ab1995b1b..b6a5cc6cee 100644 --- a/Content.Server/GameObjects/Components/ComputerComponent.cs +++ b/Content.Server/GameObjects/Components/ComputerComponent.cs @@ -1,12 +1,8 @@ using Content.Server.GameObjects.Components.Construction; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Shared.GameObjects.Components; -using JetBrains.Annotations; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Log; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/ConfigurationComponent.cs b/Content.Server/GameObjects/Components/ConfigurationComponent.cs index a7e7e4f6b4..8bc3e39a93 100644 --- a/Content.Server/GameObjects/Components/ConfigurationComponent.cs +++ b/Content.Server/GameObjects/Components/ConfigurationComponent.cs @@ -1,18 +1,12 @@ using Content.Server.GameObjects.Components.Interactable; -using Content.Server.GameObjects.Components.Mobs; using Content.Server.Utility; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Interactable; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.Console; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; @@ -21,6 +15,7 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; +using Robust.Server.GameObjects; namespace Content.Server.GameObjects.Components { diff --git a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.Verbs.cs b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.Verbs.cs index 04a1d0c739..1a12e37d85 100644 --- a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.Verbs.cs +++ b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.Verbs.cs @@ -1,12 +1,8 @@ -using Content.Shared.GameObjects.EntitySystems; -using Content.Shared.GameObjects.EntitySystems.ActionBlocker; +using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; -using Robust.Shared.Log; namespace Content.Server.GameObjects.Components.Construction { diff --git a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs index 6f5ef1de1f..4bf6cbbfc7 100644 --- a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs @@ -11,12 +11,8 @@ using Content.Shared.Construction; using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; diff --git a/Content.Server/GameObjects/Components/Construction/MachineComponent.cs b/Content.Server/GameObjects/Components/Construction/MachineComponent.cs index bd5bf3a0de..a6976d3314 100644 --- a/Content.Server/GameObjects/Components/Construction/MachineComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/MachineComponent.cs @@ -1,11 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; using Content.Server.Construction; using Content.Server.Interfaces.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Containers; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Construction/MachineFrameComponent.cs b/Content.Server/GameObjects/Components/Construction/MachineFrameComponent.cs index 4f0e8ce9a6..2fdd994d2d 100644 --- a/Content.Server/GameObjects/Components/Construction/MachineFrameComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/MachineFrameComponent.cs @@ -1,17 +1,13 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.Construction; using Content.Server.GameObjects.Components.Stack; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Construction; -using Content.Shared.GameObjects.Components.Power; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/ContainerExt/ContainerExt.cs b/Content.Server/GameObjects/Components/ContainerExt/ContainerExt.cs index 8263cca814..6c21723356 100644 --- a/Content.Server/GameObjects/Components/ContainerExt/ContainerExt.cs +++ b/Content.Server/GameObjects/Components/ContainerExt/ContainerExt.cs @@ -1,4 +1,4 @@ -using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects; namespace Content.Server.GameObjects.Components.ContainerExt { diff --git a/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs b/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs index af7e06a591..363e935724 100644 --- a/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs +++ b/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs @@ -1,22 +1,13 @@ #nullable enable -using System.Threading.Tasks; -using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.MachineLinking; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Shared.GameObjects.Components.Conveyor; -using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.GameObjects.Components.MachineLinking; -using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Physics; -using Content.Shared.Utility; using Robust.Server.GameObjects; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/CrayonComponent.cs b/Content.Server/GameObjects/Components/CrayonComponent.cs index d44644999a..ce2443207f 100644 --- a/Content.Server/GameObjects/Components/CrayonComponent.cs +++ b/Content.Server/GameObjects/Components/CrayonComponent.cs @@ -6,11 +6,7 @@ using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/Culinary/SliceableFoodComponent.cs b/Content.Server/GameObjects/Components/Culinary/SliceableFoodComponent.cs index 24fafff61e..1ecfa1c8ac 100644 --- a/Content.Server/GameObjects/Components/Culinary/SliceableFoodComponent.cs +++ b/Content.Server/GameObjects/Components/Culinary/SliceableFoodComponent.cs @@ -6,8 +6,7 @@ using Content.Server.GameObjects.Components.Nutrition; using Content.Server.GameObjects.Components.Chemistry; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Containers; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Culinary/UtensilComponent.cs b/Content.Server/GameObjects/Components/Culinary/UtensilComponent.cs index 01eaeb5068..f23fc9b744 100644 --- a/Content.Server/GameObjects/Components/Culinary/UtensilComponent.cs +++ b/Content.Server/GameObjects/Components/Culinary/UtensilComponent.cs @@ -5,12 +5,9 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Nutrition; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Random; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs b/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs index db8079cf51..5d98dd7bc0 100644 --- a/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs @@ -3,16 +3,12 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Audio; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Random; using Robust.Shared.Serialization; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.Components.Damage { diff --git a/Content.Server/GameObjects/Components/Destructible/DestructibleComponent.cs b/Content.Server/GameObjects/Components/Destructible/DestructibleComponent.cs index a63ec55721..a5924a7ce0 100644 --- a/Content.Server/GameObjects/Components/Destructible/DestructibleComponent.cs +++ b/Content.Server/GameObjects/Components/Destructible/DestructibleComponent.cs @@ -4,8 +4,6 @@ using Content.Server.GameObjects.Components.Destructible.Thresholds; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Damage; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs index 88bcace306..e892fb75e7 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs @@ -2,8 +2,7 @@ using System; using Content.Server.GameObjects.Components.Construction; using Content.Server.GameObjects.EntitySystems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/DoActsBehavior.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/DoActsBehavior.cs index 62a228bcc1..a87cd294eb 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/DoActsBehavior.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/DoActsBehavior.cs @@ -1,8 +1,7 @@ using System; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/GibBehavior.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/GibBehavior.cs index 44ce9f2039..bbb76e255d 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/GibBehavior.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/GibBehavior.cs @@ -1,8 +1,7 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Body; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs index 20e06e3687..1b5e9ad12a 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.EntitySystems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors { diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs index 3c78658a31..4cc6932b11 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs @@ -1,8 +1,7 @@ using System; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Audio; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundCollectionBehavior.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundCollectionBehavior.cs index be44aeb2b6..028477ad0a 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundCollectionBehavior.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundCollectionBehavior.cs @@ -1,8 +1,7 @@ using System; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Audio; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs index 9a97733d86..87a9ce7c85 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Utility; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpillBehavior.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpillBehavior.cs index 66c49932a7..7d3712aa39 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpillBehavior.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpillBehavior.cs @@ -3,8 +3,7 @@ using Content.Server.GameObjects.Components.Chemistry; using Content.Server.GameObjects.Components.Fluids; using Content.Server.GameObjects.EntitySystems; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/MinMax.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/MinMax.cs index a6293f40ae..ed7be9adc4 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/MinMax.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/MinMax.cs @@ -1,5 +1,4 @@ using System; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Threshold.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Threshold.cs index 1370847a21..046b075e20 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Threshold.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Threshold.cs @@ -4,8 +4,7 @@ using Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors; using Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Damage; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/AndTrigger.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/AndTrigger.cs index a97145ace1..f478fffb7f 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/AndTrigger.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/AndTrigger.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Damage; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageClassTrigger.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageClassTrigger.cs index 9d46a15302..fe48c1ea56 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageClassTrigger.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageClassTrigger.cs @@ -3,7 +3,6 @@ using System; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTrigger.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTrigger.cs index 81653ac303..bca3121211 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTrigger.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTrigger.cs @@ -2,7 +2,6 @@ using System; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Damage; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs index 7546d0f4f4..25d50ee341 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs @@ -3,7 +3,6 @@ using System; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/IThresholdTrigger.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/IThresholdTrigger.cs index 88742fdd4e..69e0a61f17 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/IThresholdTrigger.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/IThresholdTrigger.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Damage; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers { diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/OrTrigger.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/OrTrigger.cs index eaf234c9bc..6eea78fc5b 100644 --- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/OrTrigger.cs +++ b/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/OrTrigger.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Damage; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs index 21a2409908..ceb5e0bd4a 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs @@ -1,7 +1,6 @@ using System; using System.Linq; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalHolderComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalHolderComponent.cs index 4adfffbfcc..e71444b706 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalHolderComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalHolderComponent.cs @@ -6,11 +6,9 @@ using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.Interfaces; using Content.Shared.Atmos; using Content.Shared.GameObjects.Components.Body; -using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalJunctionComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalJunctionComponent.cs index 0fa5940c45..92c2da865d 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalJunctionComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalJunctionComponent.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs index 072c584b04..fa6f82876e 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs @@ -20,22 +20,14 @@ using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; using Timer = Robust.Shared.Timers.Timer; diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalRouterComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalRouterComponent.cs index 5a72ff74e4..d4d9f1519e 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalRouterComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalRouterComponent.cs @@ -2,25 +2,17 @@ using System; using System.Collections.Generic; using System.Text; -using Content.Server.GameObjects.Components.Mobs; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Server.Utility; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.Console; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalTaggerComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalTaggerComponent.cs index 41d90e1664..8f56e45b44 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalTaggerComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalTaggerComponent.cs @@ -1,27 +1,19 @@ #nullable enable -using Content.Server.GameObjects.Components.Mobs; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Server.Utility; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.Console; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.ViewVariables; -using System; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; +using Robust.Server.GameObjects; +using Robust.Server.Player; using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalTaggerComponent; namespace Content.Server.GameObjects.Components.Disposal diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs index 853d4bab77..d73e9cd348 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs @@ -7,19 +7,12 @@ using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Robust.Server.Console; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Disposal diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs index e28183d4b3..769a8ad613 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs @@ -22,24 +22,15 @@ using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; +using Robust.Shared.Random; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Disposal diff --git a/Content.Server/GameObjects/Components/Disposal/IDisposalTubeComponent.cs b/Content.Server/GameObjects/Components/Disposal/IDisposalTubeComponent.cs index 5077e7abbb..a7580d6393 100644 --- a/Content.Server/GameObjects/Components/Disposal/IDisposalTubeComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/IDisposalTubeComponent.cs @@ -1,6 +1,6 @@ -#nullable enable -using Robust.Server.GameObjects.Components.Container; -using Robust.Shared.Interfaces.GameObjects; +#nullable enable +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; namespace Content.Server.GameObjects.Components.Disposal diff --git a/Content.Server/GameObjects/Components/DoAfterComponent.cs b/Content.Server/GameObjects/Components/DoAfterComponent.cs index 550bce58e9..c467b6541c 100644 --- a/Content.Server/GameObjects/Components/DoAfterComponent.cs +++ b/Content.Server/GameObjects/Components/DoAfterComponent.cs @@ -4,7 +4,6 @@ using Content.Server.GameObjects.EntitySystems.DoAfter; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Damage; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects.Components { diff --git a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs index e0750db8fb..4e46957268 100644 --- a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs @@ -10,18 +10,12 @@ using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.SharedWiresComponent; using static Content.Shared.GameObjects.Components.SharedWiresComponent.WiresAction; -using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.GameObjects.Components.Doors { diff --git a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs index 47949d6227..1680c2c679 100644 --- a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs @@ -18,13 +18,8 @@ using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.GameObjects.Components.Movement; 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.Components; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Explosion/ClusterFlashComponent.cs b/Content.Server/GameObjects/Components/Explosion/ClusterFlashComponent.cs index bd2f90f054..5b20361569 100644 --- a/Content.Server/GameObjects/Components/Explosion/ClusterFlashComponent.cs +++ b/Content.Server/GameObjects/Components/Explosion/ClusterFlashComponent.cs @@ -3,8 +3,6 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Server.GameObjects.Components.Explosion; using Robust.Shared.GameObjects; using System.Threading.Tasks; -using Robust.Server.GameObjects.Components.Container; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using System; using System.Diagnostics.CodeAnalysis; @@ -12,8 +10,6 @@ using Content.Server.GameObjects.Components.Trigger.TimerTrigger; using Content.Server.Throw; using Robust.Server.GameObjects; using Content.Shared.GameObjects.Components.Explosion; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs b/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs index 47355f5942..3b2a6300c6 100644 --- a/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs +++ b/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs @@ -2,10 +2,9 @@ using Content.Server.GameObjects.Components.Weapon; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Explosion diff --git a/Content.Server/GameObjects/Components/ExtinguisherCabinetComponent.cs b/Content.Server/GameObjects/Components/ExtinguisherCabinetComponent.cs index e5a715f045..98cc23b9d7 100644 --- a/Content.Server/GameObjects/Components/ExtinguisherCabinetComponent.cs +++ b/Content.Server/GameObjects/Components/ExtinguisherCabinetComponent.cs @@ -8,10 +8,7 @@ using Content.Shared.GameObjects.Components; 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.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs b/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs index 516e03eb95..ee8cfcb1e3 100644 --- a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs @@ -5,9 +5,8 @@ using Content.Server.GameObjects.Components.Chemistry; using Content.Shared.Chemistry; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; 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 11fda8a54a..102438f664 100644 --- a/Content.Server/GameObjects/Components/Fluids/MopComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/MopComponent.cs @@ -4,12 +4,11 @@ using Content.Shared.Chemistry; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Localization; using Robust.Shared.Serialization; using System.Threading.Tasks; +using Robust.Server.GameObjects; namespace Content.Server.GameObjects.Components.Fluids { diff --git a/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs b/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs index 9221cd60a0..90104dde43 100644 --- a/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs @@ -10,18 +10,12 @@ using Content.Shared.Maps; using Content.Shared.Physics; using Content.Shared.Utility; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Fluids/SpillExtensions.cs b/Content.Server/GameObjects/Components/Fluids/SpillExtensions.cs index 6bbcb72f5f..ee800441c0 100644 --- a/Content.Server/GameObjects/Components/Fluids/SpillExtensions.cs +++ b/Content.Server/GameObjects/Components/Fluids/SpillExtensions.cs @@ -2,11 +2,8 @@ using System.Diagnostics.CodeAnalysis; using Content.Server.Utility; using Content.Shared.Chemistry; -using Content.Shared.GameObjects; -using Robust.Server.GameObjects.EntitySystems.TileLookup; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/GameObjects/Components/Fluids/SpillableComponent.cs b/Content.Server/GameObjects/Components/Fluids/SpillableComponent.cs index 5026ede0e4..55e71cc63e 100644 --- a/Content.Server/GameObjects/Components/Fluids/SpillableComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/SpillableComponent.cs @@ -4,7 +4,6 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; namespace Content.Server.GameObjects.Components.Fluids diff --git a/Content.Server/GameObjects/Components/Fluids/SprayComponent.cs b/Content.Server/GameObjects/Components/Fluids/SprayComponent.cs index 0d82752b64..698adf5268 100644 --- a/Content.Server/GameObjects/Components/Fluids/SprayComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/SprayComponent.cs @@ -6,24 +6,16 @@ using Content.Shared.Chemistry; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Fluids; using Content.Shared.GameObjects.Components.Items; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Log; -using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Fluids diff --git a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs index 2c7aad758e..0c0e2a4cae 100644 --- a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs @@ -13,20 +13,12 @@ using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Body.Part; using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Pulling; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces; using Content.Shared.Physics.Pull; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystemMessages; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; @@ -34,6 +26,7 @@ using Robust.Shared.Maths; using Robust.Shared.Players; using Robust.Shared.ViewVariables; using Robust.Shared.Map; +using Robust.Shared.Network; namespace Content.Server.GameObjects.Components.GUI { diff --git a/Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs b/Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs index dc7a2a69f5..007f93c55e 100644 --- a/Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs @@ -1,10 +1,7 @@ using Content.Server.GameObjects.Components.Items.Storage; -using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; -using Robust.Shared.Timers; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; namespace Content.Server.GameObjects.Components.GUI diff --git a/Content.Server/GameObjects/Components/GUI/IInventoryController.cs b/Content.Server/GameObjects/Components/GUI/IInventoryController.cs index e3071e2d6a..a9d9c3075c 100644 --- a/Content.Server/GameObjects/Components/GUI/IInventoryController.cs +++ b/Content.Server/GameObjects/Components/GUI/IInventoryController.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; namespace Content.Server.GameObjects.Components.GUI diff --git a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs index b402e587ae..354fab4f21 100644 --- a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs @@ -14,18 +14,15 @@ using Content.Shared.GameObjects.EntitySystems.EffectBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Robust.Server.Console; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; +using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.Server/GameObjects/Components/GUI/StrippableComponent.cs b/Content.Server/GameObjects/Components/GUI/StrippableComponent.cs index 7d0e01bd1c..4ff91f8059 100644 --- a/Content.Server/GameObjects/Components/GUI/StrippableComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/StrippableComponent.cs @@ -6,17 +6,13 @@ using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.EntitySystems.DoAfter; using Content.Server.Utility; using Content.Shared.GameObjects.Components.GUI; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs b/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs index c8ec2c1651..95e356f1c2 100644 --- a/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs +++ b/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs @@ -1,6 +1,5 @@ #nullable enable using System.Threading.Tasks; -using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.Utility; @@ -11,11 +10,8 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs b/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs index c31a79bd07..14ee2ab1e7 100644 --- a/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs +++ b/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs @@ -3,14 +3,12 @@ using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Shared.Chat; using Content.Shared.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Network; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs b/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs index 990e6da091..5a8f478a6d 100644 --- a/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs +++ b/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs @@ -9,15 +9,11 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Localization; +using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs index 7529820fb4..fd06ac4001 100644 --- a/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs @@ -3,16 +3,12 @@ using Content.Server.GameObjects.Components.Items.Clothing; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Sound; using Content.Shared.GameObjects.Components; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; 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.ViewVariables; namespace Content.Server.GameObjects.Components.Interactable diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs index ead9d5c48b..82b7f132d0 100644 --- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs @@ -1,13 +1,9 @@ #nullable enable using System.Threading.Tasks; -using Content.Server.GameObjects.Components.Atmos; -using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Clothing; using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Power; using Content.Shared.Actions; -using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.EntitySystems; @@ -18,13 +14,7 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Interactable/MatchstickComponent.cs b/Content.Server/GameObjects/Components/Interactable/MatchstickComponent.cs index f172f71f2e..cbe44e559b 100644 --- a/Content.Server/GameObjects/Components/Interactable/MatchstickComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/MatchstickComponent.cs @@ -4,12 +4,7 @@ using Content.Shared.Audio; using Content.Shared.GameObjects.Components; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs b/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs index 39879e2a02..14710189b6 100644 --- a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs @@ -3,10 +3,7 @@ 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.Serialization; 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 18746fa094..d6d49ead72 100644 --- a/Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs @@ -3,8 +3,6 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Maps; using Content.Shared.Utility; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs b/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs index 49047e4897..3b2ff9ccac 100644 --- a/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs @@ -4,12 +4,9 @@ using System.Threading.Tasks; using Content.Server.GameObjects.EntitySystems.DoAfter; using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Interactable; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs b/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs index 854f93a6ea..91a5c21057 100644 --- a/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs @@ -17,10 +17,7 @@ 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.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/Items/Clothing/ClothingComponent.cs b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs index b7a7065276..521b59fa66 100644 --- a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs @@ -8,7 +8,6 @@ using Content.Shared.GameObjects.Components.Storage; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.Server/GameObjects/Components/Items/DiceComponent.cs b/Content.Server/GameObjects/Components/Items/DiceComponent.cs index 2eaab93c14..a2a251fca0 100644 --- a/Content.Server/GameObjects/Components/Items/DiceComponent.cs +++ b/Content.Server/GameObjects/Components/Items/DiceComponent.cs @@ -2,11 +2,8 @@ using Content.Shared.GameObjects.EntitySystems; 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.Random; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Prototypes; diff --git a/Content.Server/GameObjects/Components/Items/FireExtinguisherComponent.cs b/Content.Server/GameObjects/Components/Items/FireExtinguisherComponent.cs index 3edcd5b392..d4adbf7207 100644 --- a/Content.Server/GameObjects/Components/Items/FireExtinguisherComponent.cs +++ b/Content.Server/GameObjects/Components/Items/FireExtinguisherComponent.cs @@ -4,9 +4,8 @@ using Content.Shared.Chemistry; using Content.Shared.GameObjects.Components.Chemistry; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Localization; #nullable enable diff --git a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs index a65215e12b..be10b279fd 100644 --- a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs @@ -3,16 +3,14 @@ using Content.Shared.Audio; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Maps; using Content.Shared.Utility; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; using System.Collections.Generic; using System.Threading.Tasks; +using Robust.Server.GameObjects; namespace Content.Server.GameObjects.Components.Items { diff --git a/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs b/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs index f344dbf98b..d1f8128909 100644 --- a/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs +++ b/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs @@ -7,13 +7,8 @@ using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Maps; using Content.Shared.Utility; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -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; diff --git a/Content.Server/GameObjects/Components/Items/Storage/CursedEntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/CursedEntityStorageComponent.cs index a7d6b836ae..57d3fa4faa 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/CursedEntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/CursedEntityStorageComponent.cs @@ -1,10 +1,8 @@ using System.Linq; using Content.Shared.Audio; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs index 7d1bc4a495..4ea38ef3da 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs @@ -1,7 +1,6 @@ #nullable enable using System; using System.Linq; -using System.Threading; using System.Threading.Tasks; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Interactable; @@ -14,17 +13,12 @@ using Content.Shared.GameObjects.Verbs; 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.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Items.Storage diff --git a/Content.Server/GameObjects/Components/Items/Storage/IStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/IStorageComponent.cs index b46ea0e1de..7a992ca82e 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/IStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/IStorageComponent.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Items.Storage { diff --git a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs index 08b328e1da..9423c51eb3 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs @@ -1,4 +1,4 @@ -using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.GUI; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Server.Throw; using Content.Shared.GameObjects; @@ -9,11 +9,9 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Items/Storage/SecretStashComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/SecretStashComponent.cs index b2255dee11..6cd5e64b70 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/SecretStashComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/SecretStashComponent.cs @@ -3,9 +3,8 @@ using Content.Server.GameObjects.Components.GUI; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; -using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs index 5e4f9076fa..42c9b3ed6d 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs @@ -1,18 +1,13 @@ using Content.Server.GameObjects.Components.Access; using Content.Shared.GameObjects.Components.Storage; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; 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.Localization; -using Robust.Shared.Log; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs index b50a23bb4d..bb622edfe7 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs @@ -14,19 +14,13 @@ using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystemMessages; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; using Robust.Shared.Audio; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Log; using Robust.Shared.Map; +using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs index cdd5c50890..5c9029db69 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs @@ -1,10 +1,7 @@ -using System; +using System; using System.Collections.Generic; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Random; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Items/ToysComponent.cs b/Content.Server/GameObjects/Components/Items/ToysComponent.cs index 0a22581f3c..5d55567bd2 100644 --- a/Content.Server/GameObjects/Components/Items/ToysComponent.cs +++ b/Content.Server/GameObjects/Components/Items/ToysComponent.cs @@ -1,10 +1,8 @@ using Content.Shared.Audio; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/Kitchen/ButcherableComponent.cs b/Content.Server/GameObjects/Components/Kitchen/ButcherableComponent.cs index 0e7d7b3dbc..f785fba921 100644 --- a/Content.Server/GameObjects/Components/Kitchen/ButcherableComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/ButcherableComponent.cs @@ -1,5 +1,4 @@ #nullable enable -using System; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Kitchen/KitchenSpikeComponent.cs b/Content.Server/GameObjects/Components/Kitchen/KitchenSpikeComponent.cs index 7765aa00b5..66f2e5ac39 100644 --- a/Content.Server/GameObjects/Components/Kitchen/KitchenSpikeComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/KitchenSpikeComponent.cs @@ -7,8 +7,6 @@ using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; namespace Content.Server.GameObjects.Components.Kitchen diff --git a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs index 83869ceef3..02fe067ce7 100644 --- a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs @@ -21,15 +21,8 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Kitchen; using Content.Shared.Prototypes.Kitchen; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -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/Kitchen/ReagentGrinderComponent.cs b/Content.Server/GameObjects/Components/Kitchen/ReagentGrinderComponent.cs index 6f14519d17..cda3e918d3 100644 --- a/Content.Server/GameObjects/Components/Kitchen/ReagentGrinderComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/ReagentGrinderComponent.cs @@ -14,15 +14,8 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Kitchen; using Content.Shared.Utility; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/MachineLinking/ISignalReceiver.cs b/Content.Server/GameObjects/Components/MachineLinking/ISignalReceiver.cs index 412e0570d3..721bdcc910 100644 --- a/Content.Server/GameObjects/Components/MachineLinking/ISignalReceiver.cs +++ b/Content.Server/GameObjects/Components/MachineLinking/ISignalReceiver.cs @@ -1,6 +1,4 @@ -using System; - -namespace Content.Server.GameObjects.Components.MachineLinking +namespace Content.Server.GameObjects.Components.MachineLinking { public interface ISignalReceiver { diff --git a/Content.Server/GameObjects/Components/MachineLinking/SignalButtonComponent.cs b/Content.Server/GameObjects/Components/MachineLinking/SignalButtonComponent.cs index a88f51a17a..8b220f62f6 100644 --- a/Content.Server/GameObjects/Components/MachineLinking/SignalButtonComponent.cs +++ b/Content.Server/GameObjects/Components/MachineLinking/SignalButtonComponent.cs @@ -2,7 +2,6 @@ using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; namespace Content.Server.GameObjects.Components.MachineLinking diff --git a/Content.Server/GameObjects/Components/MachineLinking/SignalReceiverComponent.cs b/Content.Server/GameObjects/Components/MachineLinking/SignalReceiverComponent.cs index b45277d771..8b70ee18da 100644 --- a/Content.Server/GameObjects/Components/MachineLinking/SignalReceiverComponent.cs +++ b/Content.Server/GameObjects/Components/MachineLinking/SignalReceiverComponent.cs @@ -5,13 +5,8 @@ using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; -using Robust.Shared.Utility; namespace Content.Server.GameObjects.Components.MachineLinking { diff --git a/Content.Server/GameObjects/Components/MachineLinking/SignalSwitchComponent.cs b/Content.Server/GameObjects/Components/MachineLinking/SignalSwitchComponent.cs index 26e6ff1089..01fbc8f6cf 100644 --- a/Content.Server/GameObjects/Components/MachineLinking/SignalSwitchComponent.cs +++ b/Content.Server/GameObjects/Components/MachineLinking/SignalSwitchComponent.cs @@ -1,11 +1,9 @@ -using Content.Shared.GameObjects.EntitySystems; -using Content.Shared.GameObjects.EntitySystems.ActionBlocker; +using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; 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.Localization; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/MachineLinking/SignalTransmitterComponent.cs b/Content.Server/GameObjects/Components/MachineLinking/SignalTransmitterComponent.cs index ba933710ec..bee6a01384 100644 --- a/Content.Server/GameObjects/Components/MachineLinking/SignalTransmitterComponent.cs +++ b/Content.Server/GameObjects/Components/MachineLinking/SignalTransmitterComponent.cs @@ -5,12 +5,8 @@ using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.MachineLinking diff --git a/Content.Server/GameObjects/Components/MachineLinking/SignalTwoWayLeverComponent.cs b/Content.Server/GameObjects/Components/MachineLinking/SignalTwoWayLeverComponent.cs index b85c37f29d..bf450d9a18 100644 --- a/Content.Server/GameObjects/Components/MachineLinking/SignalTwoWayLeverComponent.cs +++ b/Content.Server/GameObjects/Components/MachineLinking/SignalTwoWayLeverComponent.cs @@ -1,13 +1,9 @@ #nullable enable -using System; -using Content.Server.GameObjects.Components.MachineLinking.Signals; -using Content.Shared.GameObjects.Components.Conveyor; using Content.Shared.GameObjects.Components.MachineLinking; 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.Localization; namespace Content.Server.GameObjects.Components.MachineLinking diff --git a/Content.Server/GameObjects/Components/MagbootsComponent.cs b/Content.Server/GameObjects/Components/MagbootsComponent.cs index 89e99b5e64..fcc21bda21 100644 --- a/Content.Server/GameObjects/Components/MagbootsComponent.cs +++ b/Content.Server/GameObjects/Components/MagbootsComponent.cs @@ -14,9 +14,6 @@ using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/MagicMirrorComponent.cs b/Content.Server/GameObjects/Components/MagicMirrorComponent.cs index 2468817ee5..ad33d8d8da 100644 --- a/Content.Server/GameObjects/Components/MagicMirrorComponent.cs +++ b/Content.Server/GameObjects/Components/MagicMirrorComponent.cs @@ -5,8 +5,7 @@ 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; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs b/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs index 91be22ebab..674bffeac5 100644 --- a/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs @@ -2,13 +2,12 @@ using System; using System.Collections.Generic; using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Random; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs b/Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs index c96f9637e0..6b870bf103 100644 --- a/Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs @@ -2,14 +2,10 @@ using System.Collections.Generic; using System.Threading; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.GameObjects.Components.Markers { diff --git a/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs b/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs index 384fbb38a5..25ca65473b 100644 --- a/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs @@ -1,7 +1,5 @@ using System.Collections.Generic; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/Medical/CloningPodComponent.cs b/Content.Server/GameObjects/Components/Medical/CloningPodComponent.cs index b6bc1a763a..d2113c7951 100644 --- a/Content.Server/GameObjects/Components/Medical/CloningPodComponent.cs +++ b/Content.Server/GameObjects/Components/Medical/CloningPodComponent.cs @@ -8,20 +8,13 @@ using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Server.Mobs; using Content.Server.Utility; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Medical; -using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs.State; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Preferences; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Network; diff --git a/Content.Server/GameObjects/Components/Medical/HealingComponent.cs b/Content.Server/GameObjects/Components/Medical/HealingComponent.cs index bdacd030c8..56e265edf3 100644 --- a/Content.Server/GameObjects/Components/Medical/HealingComponent.cs +++ b/Content.Server/GameObjects/Components/Medical/HealingComponent.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Stack; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs b/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs index b31617302e..1477fcc0fb 100644 --- a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs +++ b/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs @@ -1,14 +1,11 @@ #nullable enable using System; using System.Collections.Generic; -using System.Linq; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.EntitySystems; -using Content.Server.Players; using Content.Server.Utility; using Content.Shared.Damage; -using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Medical; using Content.Shared.GameObjects.Components.Mobs.State; @@ -17,17 +14,11 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.UserInterface; -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.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Medical diff --git a/Content.Server/GameObjects/Components/Metabolism/MetabolismComponent.cs b/Content.Server/GameObjects/Components/Metabolism/MetabolismComponent.cs index b9f98a6ec4..9e4fc39497 100644 --- a/Content.Server/GameObjects/Components/Metabolism/MetabolismComponent.cs +++ b/Content.Server/GameObjects/Components/Metabolism/MetabolismComponent.cs @@ -12,19 +12,14 @@ using Content.Shared.Atmos; using Content.Shared.Chemistry; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Body; -using Content.Shared.GameObjects.Components.Body.Mechanism; using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs.State; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces; using Content.Shared.Interfaces.Chemistry; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Log; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs b/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs index 0e1b9fbaca..c3e1f1ae9f 100644 --- a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs +++ b/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs @@ -4,11 +4,8 @@ using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; 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.Random; using Robust.Shared.IoC; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/Mobs/ClumsyComponent.cs b/Content.Server/GameObjects/Components/Mobs/ClumsyComponent.cs index 02a278a29b..e1a57b9eff 100644 --- a/Content.Server/GameObjects/Components/Mobs/ClumsyComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/ClumsyComponent.cs @@ -1,6 +1,4 @@ using Robust.Shared.GameObjects; -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/MindComponent.cs b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs index 649bee206f..da955ac992 100644 --- a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs @@ -1,20 +1,11 @@ #nullable enable -using Content.Server.Commands.Observer; -using Content.Server.GameObjects.Components.Medical; using Content.Server.GameObjects.Components.Observer; using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; using Content.Server.Mobs; -using Content.Server.Utility; -using Content.Shared.GameObjects.Components; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs.State; using Content.Shared.GameObjects.EntitySystems; -using Robust.Server.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; diff --git a/Content.Server/GameObjects/Components/Mobs/ServerActionsComponent.cs b/Content.Server/GameObjects/Components/Mobs/ServerActionsComponent.cs index ffaebf02f8..ff71cf9b85 100644 --- a/Content.Server/GameObjects/Components/Mobs/ServerActionsComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/ServerActionsComponent.cs @@ -2,16 +2,14 @@ using System; using Content.Shared.Actions; using Content.Shared.GameObjects.Components.Mobs; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Players; namespace Content.Server.GameObjects.Components.Mobs diff --git a/Content.Server/GameObjects/Components/Mobs/ServerAlertsComponent.cs b/Content.Server/GameObjects/Components/Mobs/ServerAlertsComponent.cs index e80232120c..c182fa2bb8 100644 --- a/Content.Server/GameObjects/Components/Mobs/ServerAlertsComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/ServerAlertsComponent.cs @@ -3,9 +3,8 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.Alert; using Content.Shared.GameObjects.Components.Mobs; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Log; +using Robust.Shared.Network; using Robust.Shared.Players; namespace Content.Server.GameObjects.Components.Mobs diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/AccentManager.cs b/Content.Server/GameObjects/Components/Mobs/Speech/AccentManager.cs index 804aee06e1..d43cf149b1 100644 --- a/Content.Server/GameObjects/Components/Mobs/Speech/AccentManager.cs +++ b/Content.Server/GameObjects/Components/Mobs/Speech/AccentManager.cs @@ -1,6 +1,6 @@ using System.Text.RegularExpressions; using Content.Server.Interfaces.Chat; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.GameObjects.Components.Mobs.Speech diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/IAccentComponent.cs b/Content.Server/GameObjects/Components/Mobs/Speech/IAccentComponent.cs index 92efa89b8d..71d0df287c 100644 --- a/Content.Server/GameObjects/Components/Mobs/Speech/IAccentComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/Speech/IAccentComponent.cs @@ -1,10 +1,4 @@ #nullable enable -using Content.Shared.GameObjects.Components.Mobs.Speech; -using Content.Shared.GameObjects.EntitySystems.ActionBlocker; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Serialization; - namespace Content.Server.GameObjects.Components.Mobs.Speech { internal interface IAccentComponent diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/OwOAccentComponent.cs b/Content.Server/GameObjects/Components/Mobs/Speech/OwOAccentComponent.cs index af6e60c33c..f9a9a58a33 100644 --- a/Content.Server/GameObjects/Components/Mobs/Speech/OwOAccentComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/Speech/OwOAccentComponent.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/Mobs/State/CriticalMobState.cs b/Content.Server/GameObjects/Components/Mobs/State/CriticalMobState.cs index cae7cd53e7..5ad63dc6dc 100644 --- a/Content.Server/GameObjects/Components/Mobs/State/CriticalMobState.cs +++ b/Content.Server/GameObjects/Components/Mobs/State/CriticalMobState.cs @@ -1,11 +1,8 @@ using Content.Server.GameObjects.EntitySystems; -using Content.Shared.Alert; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs.State; using Robust.Server.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Mobs.State { diff --git a/Content.Server/GameObjects/Components/Mobs/State/DeadMobState.cs b/Content.Server/GameObjects/Components/Mobs/State/DeadMobState.cs index 26ca90cd14..27e4dee466 100644 --- a/Content.Server/GameObjects/Components/Mobs/State/DeadMobState.cs +++ b/Content.Server/GameObjects/Components/Mobs/State/DeadMobState.cs @@ -1,12 +1,9 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.Alert; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs.State; using Robust.Server.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Mobs.State { diff --git a/Content.Server/GameObjects/Components/Mobs/State/NormalMobState.cs b/Content.Server/GameObjects/Components/Mobs/State/NormalMobState.cs index 54a5435404..4ce8b0c3a3 100644 --- a/Content.Server/GameObjects/Components/Mobs/State/NormalMobState.cs +++ b/Content.Server/GameObjects/Components/Mobs/State/NormalMobState.cs @@ -5,8 +5,7 @@ using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs.State; using Robust.Server.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Mobs.State { diff --git a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs index 6d9970f114..e29da76bfb 100644 --- a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs @@ -3,23 +3,15 @@ using Content.Server.Interfaces.GameObjects; using Content.Server.Utility; using Content.Shared.Alert; using Content.Shared.Audio; -using Content.Shared.Chemistry; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.Interfaces; -using Content.Shared.Interfaces.GameObjects.Components; -using NFluidsynth; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Random; -using Robust.Shared.Timers; -using Logger = Robust.Shared.Log.Logger; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.Components.Mobs { diff --git a/Content.Server/GameObjects/Components/Morgue/BodyBagEntityStorageComponent.cs b/Content.Server/GameObjects/Components/Morgue/BodyBagEntityStorageComponent.cs index e4731b2f7f..34d0e60a2b 100644 --- a/Content.Server/GameObjects/Components/Morgue/BodyBagEntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Morgue/BodyBagEntityStorageComponent.cs @@ -11,11 +11,7 @@ using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Morgue/CrematoriumEntityStorageComponent.cs b/Content.Server/GameObjects/Components/Morgue/CrematoriumEntityStorageComponent.cs index 197b92e6e6..493cdc22f1 100644 --- a/Content.Server/GameObjects/Components/Morgue/CrematoriumEntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Morgue/CrematoriumEntityStorageComponent.cs @@ -3,25 +3,21 @@ using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameObjects; using Content.Server.Utility; -using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Morgue; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; 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.Localization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; using System.Threading; using Content.Server.Interfaces.GameTicking; using Content.Server.Players; +using Robust.Server.GameObjects; using Robust.Server.Player; -using Robust.Shared.GameObjects.Components.Timers; using Robust.Shared.IoC; namespace Content.Server.GameObjects.Components.Morgue diff --git a/Content.Server/GameObjects/Components/Morgue/MorgueEntityStorageComponent.cs b/Content.Server/GameObjects/Components/Morgue/MorgueEntityStorageComponent.cs index 2dd2b6673f..5b553b4fc9 100644 --- a/Content.Server/GameObjects/Components/Morgue/MorgueEntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Morgue/MorgueEntityStorageComponent.cs @@ -9,12 +9,7 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Physics; using Content.Shared.Utility; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Morgue/MorgueTrayComponent.cs b/Content.Server/GameObjects/Components/Morgue/MorgueTrayComponent.cs index 7e314b7c37..cb37297c3c 100644 --- a/Content.Server/GameObjects/Components/Morgue/MorgueTrayComponent.cs +++ b/Content.Server/GameObjects/Components/Morgue/MorgueTrayComponent.cs @@ -1,6 +1,5 @@ using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Morgue diff --git a/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs b/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs index 7dad25f40a..26c5553f9c 100644 --- a/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs @@ -4,11 +4,7 @@ using Content.Server.GameObjects.EntitySystems.AI; using Content.Server.Interfaces.GameTicking; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.Roles; -using Content.Shared.Preferences; -using Robust.Server.AI; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs b/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs index 0b6e78f4f7..bc85f07eb5 100644 --- a/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs @@ -1,22 +1,15 @@ using System; -using Content.Server.GameObjects.Components.Body; using Content.Server.GameObjects.EntitySystems.DoAfter; using Content.Server.Utility; using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Body.Part; using Content.Shared.GameObjects.Components.Movement; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; -using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs b/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs index a924f93d96..72d6d72a6b 100644 --- a/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs @@ -3,7 +3,6 @@ using Content.Shared.GameObjects.Components.Buckle; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.Physics; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Maths; namespace Content.Server.GameObjects.Components.Movement diff --git a/Content.Server/GameObjects/Components/Movement/NoSlipComponent.cs b/Content.Server/GameObjects/Components/Movement/NoSlipComponent.cs index 0e40b39bed..57991581e4 100644 --- a/Content.Server/GameObjects/Components/Movement/NoSlipComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/NoSlipComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.EffectBlocker; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs b/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs index 5660f28d57..5cdadde4cd 100644 --- a/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs @@ -2,14 +2,10 @@ using Content.Server.GameObjects.Components.Buckle; using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Alert; -using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Strap; using Content.Shared.Physics; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; diff --git a/Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs b/Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs index d6f81a0ebf..01d2b90de1 100644 --- a/Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs @@ -1,8 +1,7 @@ using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Movement; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeContainerComponent.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeContainerComponent.cs index 4915b51958..16c85aa58c 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeContainerComponent.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeContainerComponent.cs @@ -4,8 +4,6 @@ using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs index 113463ca47..1531dd4d57 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs @@ -5,8 +5,7 @@ using System.Linq; using Content.Server.Explosions; using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.GameObjects.Components.Power.AME; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.Random; +using Robust.Shared.GameObjects; using Robust.Shared.Random; using Robust.Shared.IoC; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs index a44f1ae476..7b5204ca98 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs @@ -4,7 +4,7 @@ using Content.Server.Atmos; using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs index f39d08a1cf..8dc923f728 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Reflection; using Content.Server.GameObjects.Components.NodeContainer.Nodes; - using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; + using Robust.Shared.Reflection; - namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups +namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups { public interface INodeGroupFactory { diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs index 4e1735ac2e..07b0bcda68 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs @@ -1,6 +1,6 @@ #nullable enable using System.Collections.Generic; -using Robust.Shared.GameObjects.Components.Transform; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.NodeContainer.Nodes { diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/IRotatableNode.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/IRotatableNode.cs index b03f98c99e..6d7c0cd11c 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/IRotatableNode.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/IRotatableNode.cs @@ -1,4 +1,4 @@ -using Robust.Shared.GameObjects.Components.Transform; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.NodeContainer.Nodes { diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs index 8e784963cb..7f0deb81e8 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs @@ -3,9 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs index 6991d99fa7..ded93418c0 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs @@ -4,9 +4,7 @@ using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Content.Server.Interfaces; using Content.Shared.GameObjects.Components.Atmos; using Robust.Server.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Maths; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Nutrition/CreamPieComponent.cs b/Content.Server/GameObjects/Components/Nutrition/CreamPieComponent.cs index 60c46c8e50..179c58615f 100644 --- a/Content.Server/GameObjects/Components/Nutrition/CreamPieComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/CreamPieComponent.cs @@ -2,9 +2,8 @@ using Content.Server.GameObjects.Components.Fluids; using Content.Shared.Audio; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.Components.Nutrition { diff --git a/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs b/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs index db9dd812fd..2e68624b5b 100644 --- a/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs @@ -8,7 +8,6 @@ using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.ViewVariables; -using Serilog; namespace Content.Server.GameObjects.Components.Nutrition { diff --git a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs index 698bb6e0c8..604b2f3821 100644 --- a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs @@ -13,12 +13,8 @@ using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using JetBrains.Annotations; 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; using Robust.Shared.Prototypes; diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs index 0cb8436e11..55e5d863f7 100644 --- a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs @@ -13,10 +13,9 @@ using Content.Shared.GameObjects.Components.Body; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Prototypes; diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs b/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs index aa0d7e71a4..fd2aa64b78 100644 --- a/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs @@ -6,9 +6,8 @@ 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; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; +using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs b/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs index 2c24a5dbb7..8af1490c51 100644 --- a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs @@ -8,9 +8,9 @@ using Content.Shared.GameObjects.Components.Mobs.State; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Nutrition; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Nutrition/SmokingComponent.cs b/Content.Server/GameObjects/Components/Nutrition/SmokingComponent.cs index 224e9757ae..361d59c851 100644 --- a/Content.Server/GameObjects/Components/Nutrition/SmokingComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/SmokingComponent.cs @@ -5,8 +5,6 @@ using Content.Shared.GameObjects.Components; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Components.Timers; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs b/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs index 2c4fc1e90a..2de91d269b 100644 --- a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs @@ -8,9 +8,9 @@ using Content.Shared.GameObjects.Components.Mobs.State; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Nutrition; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Observer/AcceptCloningEui.cs b/Content.Server/GameObjects/Components/Observer/AcceptCloningEui.cs index fda157ed76..0a8c8d17aa 100644 --- a/Content.Server/GameObjects/Components/Observer/AcceptCloningEui.cs +++ b/Content.Server/GameObjects/Components/Observer/AcceptCloningEui.cs @@ -1,12 +1,9 @@ #nullable enable using Content.Server.Eui; -using Content.Server.GameObjects.Components.Mobs; using Content.Server.Players; using Content.Shared.Eui; using Content.Shared.GameObjects.Components.Observer; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Log; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Observer { diff --git a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs b/Content.Server/GameObjects/Components/Observer/GhostComponent.cs index 15b909435b..41ee838a36 100644 --- a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs +++ b/Content.Server/GameObjects/Components/Observer/GhostComponent.cs @@ -6,20 +6,17 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.Mobs; using Content.Shared.GameObjects.Components.Observer; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Players; using Robust.Shared.ViewVariables; using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.Utility; using Robust.Shared.Localization; -using Robust.Shared.Interfaces.Timing; using System; +using Robust.Server.Player; +using Robust.Shared.Network; +using Robust.Shared.Timing; #nullable enable namespace Content.Server.GameObjects.Components.Observer diff --git a/Content.Server/GameObjects/Components/Observer/GhostOnMoveComponent.cs b/Content.Server/GameObjects/Components/Observer/GhostOnMoveComponent.cs index 3ba9cc3a16..3a21cb8cd3 100644 --- a/Content.Server/GameObjects/Components/Observer/GhostOnMoveComponent.cs +++ b/Content.Server/GameObjects/Components/Observer/GhostOnMoveComponent.cs @@ -2,7 +2,6 @@ using System; using Content.Server.Commands.Observer; using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Movement; using Robust.Server.Console; using Robust.Shared.Console; diff --git a/Content.Server/GameObjects/Components/Observer/IGhostOnMove.cs b/Content.Server/GameObjects/Components/Observer/IGhostOnMove.cs index 5ba726d2f1..8d06aaec7d 100644 --- a/Content.Server/GameObjects/Components/Observer/IGhostOnMove.cs +++ b/Content.Server/GameObjects/Components/Observer/IGhostOnMove.cs @@ -1,5 +1,3 @@ -using Content.Shared.GameObjects.Components.Movement; - namespace Content.Server.GameObjects.Components.Observer { public interface IGhostOnMove diff --git a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs index d490417fa0..75c3a9163c 100644 --- a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs +++ b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs @@ -9,14 +9,10 @@ using Content.Server.GameObjects.Components.Power.PowerNetComponents; using Content.Server.GameObjects.Components.VendingMachines; using Content.Server.Utility; using Content.Shared.GameObjects.Components; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorEmitterComponent.cs b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorEmitterComponent.cs index 1fcb0d71df..23359f88ee 100644 --- a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorEmitterComponent.cs +++ b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorEmitterComponent.cs @@ -1,7 +1,5 @@ using Content.Shared.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorPartComponent.cs b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorPartComponent.cs index 6c549c050b..20bb7e7f1f 100644 --- a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorPartComponent.cs +++ b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorPartComponent.cs @@ -1,9 +1,5 @@ #nullable enable -using Content.Server.Utility; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Log; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs b/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs index 5f24db47f7..77d3707ecf 100644 --- a/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs @@ -1,12 +1,9 @@ -using System; -using Content.Server.GameObjects.Components.Projectiles; +using Content.Server.GameObjects.Components.Projectiles; using Content.Server.GameObjects.Components.Singularity; using Content.Shared.GameObjects.Components; using Content.Shared.Physics; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Timers; diff --git a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs b/Content.Server/GameObjects/Components/PDA/PDAComponent.cs index 5d0862189c..b15cf858a8 100644 --- a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs +++ b/Content.Server/GameObjects/Components/PDA/PDAComponent.cs @@ -13,19 +13,12 @@ using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Server.Interfaces.PDA; using Content.Server.Utility; using Content.Shared.GameObjects.Components.PDA; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.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/Paper/PaperComponent.cs b/Content.Server/GameObjects/Components/Paper/PaperComponent.cs index b7610a8fdb..9c81f9fe60 100644 --- a/Content.Server/GameObjects/Components/Paper/PaperComponent.cs +++ b/Content.Server/GameObjects/Components/Paper/PaperComponent.cs @@ -5,8 +5,6 @@ using Content.Shared.GameObjects.Components; 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; using Robust.Shared.GameObjects; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs b/Content.Server/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs index 67632cab22..c004112240 100644 --- a/Content.Server/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs +++ b/Content.Server/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs @@ -3,12 +3,8 @@ using System.Linq; using Content.Server.Explosions; using Content.Shared.GameObjects.Components.Pointing; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; 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; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/Portal/PortalComponent.cs b/Content.Server/GameObjects/Components/Portal/PortalComponent.cs index 604208a91a..7ee57942f0 100644 --- a/Content.Server/GameObjects/Components/Portal/PortalComponent.cs +++ b/Content.Server/GameObjects/Components/Portal/PortalComponent.cs @@ -3,14 +3,8 @@ using System; using System.Collections.Generic; using Content.Shared.GameObjects.Components.Portal; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; -using Robust.Shared.Timers; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Portal diff --git a/Content.Server/GameObjects/Components/Portal/TeleporterComponent.cs b/Content.Server/GameObjects/Components/Portal/TeleporterComponent.cs index b92632aa3b..3b5f33bc3a 100644 --- a/Content.Server/GameObjects/Components/Portal/TeleporterComponent.cs +++ b/Content.Server/GameObjects/Components/Portal/TeleporterComponent.cs @@ -5,19 +5,12 @@ using System.Threading.Tasks; using Content.Shared.GameObjects.Components.Portal; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Timers; -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.Maths; +using Robust.Shared.Random; using Robust.Shared.Serialization; -using Robust.Shared.Timers; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Portal diff --git a/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs b/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs index 288fa0242d..a90786bae8 100644 --- a/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs +++ b/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs @@ -1,14 +1,10 @@ using System.Threading.Tasks; -using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.Interfaces.GameObjects.Components.Items; 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.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Localization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Power/AME/AMEControllerComponent.cs b/Content.Server/GameObjects/Components/Power/AME/AMEControllerComponent.cs index c42007437d..8778417d22 100644 --- a/Content.Server/GameObjects/Components/Power/AME/AMEControllerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/AME/AMEControllerComponent.cs @@ -10,19 +10,12 @@ using Content.Server.GameObjects.Components.Power.PowerNetComponents; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Server.Utility; using Content.Shared.GameObjects.Components.Power.AME; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs b/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs index 5817fe5882..2c39dc78ff 100644 --- a/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs +++ b/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs @@ -6,14 +6,11 @@ using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Map; namespace Content.Server.GameObjects.Components.Power.AME { diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs index c2a2b6b431..11ff7fe509 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs @@ -8,16 +8,11 @@ using Content.Shared.GameObjects.Components.Power; using Content.Shared.Interfaces; 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.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Power.ApcNetComponents diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerProviderComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerProviderComponent.cs index 96c2b5e9e9..08c17258ef 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerProviderComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerProviderComponent.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs index c20495e5b1..a933be6cb6 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs @@ -4,11 +4,7 @@ using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs index 09d6046037..2ad077044f 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs @@ -5,15 +5,12 @@ using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; using Content.Shared.GameObjects.Components.Power; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs index 55684c95a7..108cc3b2ad 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs index a485289f99..53f5a34ed5 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs @@ -4,10 +4,7 @@ using Content.Shared.Audio; using Content.Shared.GameObjects.EntitySystems; 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.Random; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs index ad205fac64..38b324dc0a 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs @@ -1,7 +1,6 @@ #nullable enable using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers { diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs index 2261b354f3..f469c9c834 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs @@ -11,17 +11,12 @@ using Content.Shared.GameObjects.Components.Damage; 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.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs index 5d03d47973..480d5c2a8c 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs @@ -2,7 +2,6 @@ using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers { diff --git a/Content.Server/GameObjects/Components/Power/PowerCellSlotComponent.cs b/Content.Server/GameObjects/Components/Power/PowerCellSlotComponent.cs index 79366c366c..e87ae5b806 100644 --- a/Content.Server/GameObjects/Components/Power/PowerCellSlotComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerCellSlotComponent.cs @@ -6,12 +6,8 @@ using Content.Shared.Audio; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryDischargerComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryDischargerComponent.cs index 332b2abcbb..e6b2d15038 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryDischargerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryDischargerComponent.cs @@ -1,9 +1,7 @@ #nullable enable using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System; namespace Content.Server.GameObjects.Components.Power.PowerNetComponents { diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryStorageComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryStorageComponent.cs index e87ccb96f8..6ef26d5cca 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryStorageComponent.cs @@ -1,6 +1,5 @@ #nullable enable using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/RadiationCollectorComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNetComponents/RadiationCollectorComponent.cs index e93c3ffe10..de97b82fdf 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/RadiationCollectorComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNetComponents/RadiationCollectorComponent.cs @@ -7,12 +7,9 @@ using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.Components.Power.PowerNetComponents { diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SmesComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SmesComponent.cs index bc7829a9a6..c9e1dc9105 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SmesComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SmesComponent.cs @@ -4,8 +4,8 @@ using Content.Shared.GameObjects.Components.Power; using Content.Shared.Utility; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.Components.Power.PowerNetComponents { diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs index 6eefdc32af..ca64b51557 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs @@ -4,10 +4,8 @@ using Content.Server.GameObjects.EntitySystems; using Content.Server.Utility; 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.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs index 89fca08196..86abbbc9d7 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs @@ -4,8 +4,8 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Power.PowerNetComponents diff --git a/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs b/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs index e653160b5f..596748c16a 100644 --- a/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs @@ -3,12 +3,11 @@ using Content.Server.GameObjects.Components.Stack; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using System.Threading.Tasks; +using Robust.Shared.Map; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Projectiles/ChemicalInjectionProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ChemicalInjectionProjectileComponent.cs index bc4ede4b00..f5e0fd90a5 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ChemicalInjectionProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ChemicalInjectionProjectileComponent.cs @@ -2,8 +2,6 @@ using Content.Server.GameObjects.Components.Chemistry; using Content.Shared.Chemistry; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using System; diff --git a/Content.Server/GameObjects/Components/Projectiles/EmitterBoltComponent.cs b/Content.Server/GameObjects/Components/Projectiles/EmitterBoltComponent.cs index 83f489818a..95ce080262 100644 --- a/Content.Server/GameObjects/Components/Projectiles/EmitterBoltComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/EmitterBoltComponent.cs @@ -1,7 +1,4 @@ -using Content.Server.GameObjects.Components.Singularity; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects.Components.Projectiles { diff --git a/Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs index 3d9768f7a6..5a76b11d28 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs @@ -1,7 +1,5 @@ using Content.Server.GameObjects.Components.Explosion; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects.Components.Projectiles { diff --git a/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs index aece1dcb86..84475b77f5 100644 --- a/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs @@ -1,7 +1,5 @@ using Content.Server.GameObjects.Components.Weapon; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Projectiles diff --git a/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs b/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs index 1a30f4886a..28ee924f96 100644 --- a/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs @@ -1,19 +1,14 @@ using System; using Content.Shared.Damage; using Content.Shared.Physics; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Physics; using Robust.Shared.Serialization; -using Robust.Shared.Timers; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.Components.Projectiles { diff --git a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs index 3c0669ba18..fa45883333 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs @@ -3,11 +3,8 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Projectiles; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Projectiles/StunnableProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/StunnableProjectileComponent.cs index 7c4c078208..d8ce946c24 100644 --- a/Content.Server/GameObjects/Components/Projectiles/StunnableProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/StunnableProjectileComponent.cs @@ -1,8 +1,5 @@ using Content.Server.GameObjects.Components.Mobs; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Log; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Projectiles diff --git a/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs index fb5f23ca4b..31899d5fed 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs @@ -1,18 +1,11 @@ using Content.Server.GameObjects.EntitySystems.Click; -using Content.Shared.Damage; using Content.Shared.GameObjects; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.Physics; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.IoC; using Robust.Shared.Maths; -using Robust.Shared.Timers; +using Robust.Shared.Physics; namespace Content.Server.GameObjects.Components.Projectiles { diff --git a/Content.Server/GameObjects/Components/Pulling/PullableComponent.cs b/Content.Server/GameObjects/Components/Pulling/PullableComponent.cs index 5d4668718f..53a1c9b059 100644 --- a/Content.Server/GameObjects/Components/Pulling/PullableComponent.cs +++ b/Content.Server/GameObjects/Components/Pulling/PullableComponent.cs @@ -3,10 +3,7 @@ using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Pulling; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.Verbs; -using Content.Shared.Physics.Pull; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; namespace Content.Server.GameObjects.Components.Pulling diff --git a/Content.Server/GameObjects/Components/Radio/HandheldRadioComponent.cs b/Content.Server/GameObjects/Components/Radio/HandheldRadioComponent.cs index 9d3963116e..c85e2f53b8 100644 --- a/Content.Server/GameObjects/Components/Radio/HandheldRadioComponent.cs +++ b/Content.Server/GameObjects/Components/Radio/HandheldRadioComponent.cs @@ -6,8 +6,6 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; 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/RandomPottedPlantComponent.cs b/Content.Server/GameObjects/Components/RandomPottedPlantComponent.cs index 1492fd8b7c..0db4787b8c 100644 --- a/Content.Server/GameObjects/Components/RandomPottedPlantComponent.cs +++ b/Content.Server/GameObjects/Components/RandomPottedPlantComponent.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; using JetBrains.Annotations; using Robust.Server.GameObjects; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Random; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/RandomSpriteColorComponent.cs b/Content.Server/GameObjects/Components/RandomSpriteColorComponent.cs index 1f59a971c0..aaaf167bf5 100644 --- a/Content.Server/GameObjects/Components/RandomSpriteColorComponent.cs +++ b/Content.Server/GameObjects/Components/RandomSpriteColorComponent.cs @@ -1,8 +1,6 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Robust.Server.GameObjects; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/RandomSpriteStateComponent.cs b/Content.Server/GameObjects/Components/RandomSpriteStateComponent.cs index 75a7539ad7..0651329a35 100644 --- a/Content.Server/GameObjects/Components/RandomSpriteStateComponent.cs +++ b/Content.Server/GameObjects/Components/RandomSpriteStateComponent.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Random; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs b/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs index 3e023eff7c..3b34e50b79 100644 --- a/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs +++ b/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs @@ -9,7 +9,6 @@ using Content.Server.Interfaces.GameTicking; using Content.Server.Players; using Content.Server.Utility; using Content.Shared.GameObjects.Components.Body; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Recycling; using Content.Shared.Interfaces; using Content.Shared.Physics; @@ -17,9 +16,6 @@ using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/Research/LatheComponent.cs b/Content.Server/GameObjects/Components/Research/LatheComponent.cs index 8de75b94db..d8b01907ad 100644 --- a/Content.Server/GameObjects/Components/Research/LatheComponent.cs +++ b/Content.Server/GameObjects/Components/Research/LatheComponent.cs @@ -12,12 +12,8 @@ using Content.Shared.GameObjects.Components.Research; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Research; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.Timers; using Robust.Shared.ViewVariables; 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 44a5069dcf..25b485e692 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs @@ -3,11 +3,9 @@ using Content.Server.GameObjects.EntitySystems; 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; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs index 07bcdab005..dcea97a0a5 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs @@ -5,14 +5,10 @@ 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; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs index 269cffc827..785735594b 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs @@ -3,7 +3,6 @@ using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Research; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Rotatable/FlippableComponent.cs b/Content.Server/GameObjects/Components/Rotatable/FlippableComponent.cs index ff95843d07..0ff258fd57 100644 --- a/Content.Server/GameObjects/Components/Rotatable/FlippableComponent.cs +++ b/Content.Server/GameObjects/Components/Rotatable/FlippableComponent.cs @@ -1,11 +1,8 @@ #nullable enable -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs b/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs index 18613346ad..877c8bdbc5 100644 --- a/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs +++ b/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs @@ -1,10 +1,7 @@ -using Content.Shared.GameObjects.EntitySystems; -using Content.Shared.GameObjects.EntitySystems.ActionBlocker; +using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldComponent.cs b/Content.Server/GameObjects/Components/Singularity/ContainmentFieldComponent.cs index 2a85124e49..14702fa091 100644 --- a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldComponent.cs +++ b/Content.Server/GameObjects/Components/Singularity/ContainmentFieldComponent.cs @@ -1,11 +1,5 @@ #nullable enable -using System; -using Content.Shared.Physics; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Maths; -using Robust.Shared.Physics; namespace Content.Server.GameObjects.Components.Singularity { diff --git a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldConnection.cs b/Content.Server/GameObjects/Components/Singularity/ContainmentFieldConnection.cs index 26bb2d1e4e..515d101eca 100644 --- a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldConnection.cs +++ b/Content.Server/GameObjects/Components/Singularity/ContainmentFieldConnection.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Threading; using Content.Shared.Physics; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldGeneratorComponent.cs b/Content.Server/GameObjects/Components/Singularity/ContainmentFieldGeneratorComponent.cs index d06732e2ee..7dc05478bf 100644 --- a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldGeneratorComponent.cs +++ b/Content.Server/GameObjects/Components/Singularity/ContainmentFieldGeneratorComponent.cs @@ -6,10 +6,6 @@ using Content.Server.GameObjects.Components.Projectiles; using Content.Server.Utility; using Content.Shared.Physics; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs b/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs index 1707e94086..c4a60933ed 100644 --- a/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs +++ b/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs @@ -11,13 +11,7 @@ using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Physics; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Components; -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.Log; diff --git a/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs b/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs index a21601b660..bc6f5b8f06 100644 --- a/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs +++ b/Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs @@ -6,20 +6,15 @@ using Content.Server.GameObjects.Components.Observer; using Content.Shared.GameObjects; using Content.Shared.Physics; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Map; using Robust.Shared.Physics; +using Robust.Shared.Random; using Robust.Shared.Timers; namespace Content.Server.GameObjects.Components.Singularity diff --git a/Content.Server/GameObjects/Components/Singularity/SingularityGenerator.cs b/Content.Server/GameObjects/Components/Singularity/SingularityGenerator.cs index 7cb11986d9..14bbf23cb1 100644 --- a/Content.Server/GameObjects/Components/Singularity/SingularityGenerator.cs +++ b/Content.Server/GameObjects/Components/Singularity/SingularityGenerator.cs @@ -1,5 +1,4 @@ using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.GameObjects.Components.Singularity diff --git a/Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs b/Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs index 9a56b64e16..931f275ec9 100644 --- a/Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs +++ b/Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs @@ -1,9 +1,8 @@ using Content.Shared.Audio; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Sound diff --git a/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs b/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs index 5fdc929f18..b95752eaac 100644 --- a/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs +++ b/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs @@ -1,9 +1,8 @@ using Content.Shared.Audio; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs b/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs index dc6c2eebd9..73c4d28bd6 100644 --- a/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs +++ b/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs @@ -1,9 +1,7 @@ using Content.Shared.Audio; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/Sound/LoopingLoopingSoundComponent.cs b/Content.Server/GameObjects/Components/Sound/LoopingLoopingSoundComponent.cs index 9313a6b70c..2a76ae833a 100644 --- a/Content.Server/GameObjects/Components/Sound/LoopingLoopingSoundComponent.cs +++ b/Content.Server/GameObjects/Components/Sound/LoopingLoopingSoundComponent.cs @@ -1,7 +1,7 @@ using Content.Shared.GameObjects.Components.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.Network; namespace Content.Server.GameObjects.Components.Sound { diff --git a/Content.Server/GameObjects/Components/Stack/StackComponent.cs b/Content.Server/GameObjects/Components/Stack/StackComponent.cs index 4dc2ef7e55..afb4ac4407 100644 --- a/Content.Server/GameObjects/Components/Stack/StackComponent.cs +++ b/Content.Server/GameObjects/Components/Stack/StackComponent.cs @@ -7,8 +7,6 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/StationEvents/RadiationPulseComponent.cs b/Content.Server/GameObjects/Components/StationEvents/RadiationPulseComponent.cs index df2453b4ce..9d169c75ac 100644 --- a/Content.Server/GameObjects/Components/StationEvents/RadiationPulseComponent.cs +++ b/Content.Server/GameObjects/Components/StationEvents/RadiationPulseComponent.cs @@ -1,13 +1,11 @@ using System; using Content.Shared.GameObjects.Components; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Random; using Robust.Shared.Serialization; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.Components.StationEvents { diff --git a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs index 2642207c28..c34e009225 100644 --- a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs +++ b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs @@ -4,15 +4,12 @@ using System.Linq; using Content.Server.GameObjects.Components.Buckle; using Content.Shared.Alert; using Content.Shared.GameObjects.Components.Strap; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs b/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs index c436c06b12..9c655841dd 100644 --- a/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs +++ b/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs @@ -12,8 +12,6 @@ using Content.Shared.GameObjects.Components.Suspicion; using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs b/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs index 8b59293975..4536d0625c 100644 --- a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs +++ b/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs @@ -1,13 +1,10 @@ using System; -using System.Diagnostics; using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Alert; using Content.Shared.Atmos; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; -using Content.Shared.GameObjects.Components.Mobs; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs b/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs index 8c2ba42bbc..5775efbba9 100644 --- a/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs +++ b/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs @@ -2,12 +2,10 @@ using System.Threading; using Content.Shared.GameObjects.Components.Items; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; -using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.GameObjects.Components.Timing { diff --git a/Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchRedemptionComponent.cs b/Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchRedemptionComponent.cs index a4d942776c..400f5acc7f 100644 --- a/Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchRedemptionComponent.cs +++ b/Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchRedemptionComponent.cs @@ -1,28 +1,13 @@ #nullable enable -using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.PDA; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Mobs; -using Content.Server.Mobs.Roles; -using Content.Server.Mobs.Roles.Suspicion; -using Content.Server.Interfaces.GameObjects; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Inventory; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; -using Robust.Shared.Utility; -using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.TraitorDeathMatch { diff --git a/Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchReliableOwnerTagComponent.cs b/Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchReliableOwnerTagComponent.cs index 31a43e4239..735dcecb6b 100644 --- a/Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchReliableOwnerTagComponent.cs +++ b/Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchReliableOwnerTagComponent.cs @@ -1,10 +1,5 @@ #nullable enable -using Robust.Server.GameObjects; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Utility; using Robust.Shared.Network; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs b/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs index e65cbfac74..df1c143af3 100644 --- a/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs +++ b/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs @@ -5,8 +5,6 @@ using Content.Shared.GameObjects.Components.Trigger; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Trigger.TimerTrigger diff --git a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs b/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs index fb97efb2ac..07c9400021 100644 --- a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs @@ -10,15 +10,8 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.VendingMachines; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -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; diff --git a/Content.Server/GameObjects/Components/Watercloset/ToiletComponent.cs b/Content.Server/GameObjects/Components/Watercloset/ToiletComponent.cs index 59f96c62db..a641342a90 100644 --- a/Content.Server/GameObjects/Components/Watercloset/ToiletComponent.cs +++ b/Content.Server/GameObjects/Components/Watercloset/ToiletComponent.cs @@ -14,12 +14,7 @@ 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.Server.Interfaces.GameObjects; 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.Random; diff --git a/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs b/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs index 4ac0c3d026..91ba89dba2 100644 --- a/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs @@ -1,11 +1,10 @@ using System; using Content.Shared.GameObjects.Components.Weapons; using Content.Shared.Utility; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.Components.Weapon { diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs index 5749eeb1f3..96d57e1ef2 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs @@ -1,24 +1,13 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Mobs; -using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; -using Content.Shared.Network.NetMessages; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.Player; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; -using Robust.Shared.Timers; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeChemicalInjectorComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeChemicalInjectorComponent.cs index 93770f40a1..2bd4c1d466 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeChemicalInjectorComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeChemicalInjectorComponent.cs @@ -2,7 +2,6 @@ using Content.Server.GameObjects.Components.Chemistry; using Content.Shared.Chemistry; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using System; diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs index ccc1f99b0c..c1ccbf089c 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs @@ -7,15 +7,13 @@ using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Items; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Physics; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Maths; +using Robust.Shared.Physics; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Weapon.Melee diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs index 75167d3d16..d57d2dab44 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs @@ -1,25 +1,16 @@ #nullable enable using System.Collections.Generic; using System.Threading.Tasks; -using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Power; -using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.Audio; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; -using Content.Shared.GameObjects.Verbs; 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.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.Random; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs index 267cffbcf9..e19e3d618b 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.GameObjects.Components.GUI; @@ -11,10 +11,7 @@ using Content.Shared.GameObjects.Verbs; 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; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs index 2550aed3fc..d5e63eebf8 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs @@ -2,18 +2,14 @@ using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/ChemicalAmmoComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/ChemicalAmmoComponent.cs index 1d7fb042b3..bf3c1defb7 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/ChemicalAmmoComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/ChemicalAmmoComponent.cs @@ -1,8 +1,6 @@ using Content.Server.GameObjects.Components.Chemistry; using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; -using Content.Shared.Chemistry; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using System.Collections.Generic; using System.Linq; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs index 123182560a..9f50e9b2b2 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.GameObjects.Components.GUI; @@ -9,10 +9,7 @@ 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.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs index 5ddf430552..3b3fd65af6 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; @@ -7,10 +7,7 @@ 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; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs index ebd5c16eb8..0689a1b819 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs @@ -9,14 +9,9 @@ using Content.Shared.GameObjects.Verbs; 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.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; 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 06bde9964c..0ee9ba49fd 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs @@ -7,13 +7,8 @@ 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.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; 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 0037bd7343..a9e7fe8455 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs @@ -3,22 +3,17 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; 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.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.Map; +using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs index eecee54097..d2da01a17d 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs @@ -12,12 +12,8 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs index 1f2b7acba8..5fbf6563af 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs @@ -13,13 +13,9 @@ using Content.Shared.GameObjects.Verbs; 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.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs index a00464c424..aedb113b28 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs @@ -11,23 +11,19 @@ using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Physics; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Physics; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs index 7f554a5eed..bdbfc17415 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs @@ -5,27 +5,22 @@ using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Weapons.Ranged; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; 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.Interfaces.Network; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.Random; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Weapon.Ranged diff --git a/Content.Server/GameObjects/Components/WindowComponent.cs b/Content.Server/GameObjects/Components/WindowComponent.cs index 46b8dc26e9..4e3a57a353 100644 --- a/Content.Server/GameObjects/Components/WindowComponent.cs +++ b/Content.Server/GameObjects/Components/WindowComponent.cs @@ -1,6 +1,5 @@ #nullable enable using System; -using System.Linq; using Content.Server.Utility; using Content.Shared.Audio; using Content.Shared.GameObjects.Components; @@ -11,10 +10,7 @@ using Content.Server.GameObjects.Components.Destructible; using Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers; using Content.Shared.Utility; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/WiresComponent.cs b/Content.Server/GameObjects/Components/WiresComponent.cs index 7038c7dcb4..8e8f01e66a 100644 --- a/Content.Server/GameObjects/Components/WiresComponent.cs +++ b/Content.Server/GameObjects/Components/WiresComponent.cs @@ -16,13 +16,8 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using JetBrains.Annotations; 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.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/ContainerSlot.cs b/Content.Server/GameObjects/ContainerSlot.cs index 61c22cfb0c..78ea80deff 100644 --- a/Content.Server/GameObjects/ContainerSlot.cs +++ b/Content.Server/GameObjects/ContainerSlot.cs @@ -1,8 +1,7 @@ -using System; +using System; using System.Collections.Generic; -using Robust.Server.GameObjects.Components.Container; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects diff --git a/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs index acfb7c0277..9e6b06a4b7 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.AI; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems.AI { diff --git a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs index d069a9a0f5..3098ef00a1 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs @@ -2,22 +2,16 @@ using System; using System.Collections.Generic; using Content.Server.AI.Utility.AiLogic; -using Content.Server.Administration; using Content.Server.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Mobs.State; using Content.Shared; -using Content.Shared.Administration; -using Content.Shared.GameObjects.Components.Movement; using JetBrains.Annotations; using Robust.Server.AI; -using Robust.Server.Interfaces.Player; +using Robust.Shared.Configuration; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Reflection; using Robust.Shared.Utility; namespace Content.Server.GameObjects.EntitySystems.AI diff --git a/Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionSystem.cs index f49260384c..bb913e1556 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionSystem.cs @@ -1,6 +1,6 @@ using System.Threading; using Content.Server.GameObjects.EntitySystems.JobQueues.Queues; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems.AI.LoadBalancer { diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs index d61fdc6761..77fc851348 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs @@ -6,14 +6,11 @@ using Content.Shared.AI; using Content.Shared.GameTicking; using JetBrains.Annotations; using Robust.Server.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/BFSPathfinder.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/BFSPathfinder.cs index 28e01bd0c8..dc4c9d8f1d 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/BFSPathfinder.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/BFSPathfinder.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/ReachableArgs.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/ReachableArgs.cs index af8efa2b11..51efb703ae 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/ReachableArgs.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/ReachableArgs.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Access; using Content.Server.GameObjects.Components.Movement; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible { diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs index 50d16a4e79..7ca1c25ab9 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs @@ -2,12 +2,10 @@ using System; using System.Collections.Generic; using System.Linq; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding { diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs index 9fd03e38d2..af3b19c996 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs @@ -2,8 +2,7 @@ using System; using System.Collections.Generic; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs index 06beb0224d..ca371983c0 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Access; using Content.Server.GameObjects.Components.Doors; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs index 4c39b8b4fe..20f70c30e5 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs @@ -7,11 +7,7 @@ using Content.Server.GameObjects.EntitySystems.JobQueues; using Content.Server.GameObjects.EntitySystems.JobQueues.Queues; using Content.Shared.GameTicking; using Content.Shared.Physics; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/ServerPathfindingDebugSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/ServerPathfindingDebugSystem.cs index 18d1c97a45..fc0b361726 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/ServerPathfindingDebugSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/ServerPathfindingDebugSystem.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders; using Content.Shared.AI; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Maths; namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding diff --git a/Content.Server/GameObjects/EntitySystems/AI/ServerAiDebugSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/ServerAiDebugSystem.cs index 95faa68447..478f0f03ef 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/ServerAiDebugSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/ServerAiDebugSystem.cs @@ -1,7 +1,7 @@ using Content.Server.GameObjects.EntitySystems.AI.LoadBalancer; using Content.Shared.AI; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems.AI { diff --git a/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs index 2350ccb47b..5a3793fc23 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs @@ -7,14 +7,10 @@ using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders; using Content.Server.GameObjects.EntitySystems.JobQueues; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Utility; -using Robust.Server.Interfaces.Timing; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Server.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/EntitySystems/AI/Steering/EntityTargetSteeringRequest.cs b/Content.Server/GameObjects/EntitySystems/AI/Steering/EntityTargetSteeringRequest.cs index ee777a175c..96f2048e36 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Steering/EntityTargetSteeringRequest.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Steering/EntityTargetSteeringRequest.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.Server.GameObjects.EntitySystems.AI.Steering diff --git a/Content.Server/GameObjects/EntitySystems/AI/Steering/GridTargetSteeringRequest.cs b/Content.Server/GameObjects/EntitySystems/AI/Steering/GridTargetSteeringRequest.cs index 615589d45e..4c7d227126 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Steering/GridTargetSteeringRequest.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Steering/GridTargetSteeringRequest.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/GameObjects/EntitySystems/AntimatterEngineSystem.cs b/Content.Server/GameObjects/EntitySystems/AntimatterEngineSystem.cs index 0c73f45322..7f70d44beb 100644 --- a/Content.Server/GameObjects/EntitySystems/AntimatterEngineSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AntimatterEngineSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Power.AME; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/Atmos/AtmosDebugOverlaySystem.cs b/Content.Server/GameObjects/EntitySystems/Atmos/AtmosDebugOverlaySystem.cs index c663740a83..f555c6c25a 100644 --- a/Content.Server/GameObjects/EntitySystems/Atmos/AtmosDebugOverlaySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Atmos/AtmosDebugOverlaySystem.cs @@ -6,14 +6,13 @@ using Content.Shared; using Content.Shared.Atmos; using Content.Shared.GameObjects.EntitySystems.Atmos; using JetBrains.Annotations; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; +using Robust.Shared.Configuration; using Robust.Shared.Enums; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.EntitySystems.Atmos { diff --git a/Content.Server/GameObjects/EntitySystems/Atmos/GasTileOverlaySystem.cs b/Content.Server/GameObjects/EntitySystems/Atmos/GasTileOverlaySystem.cs index b0fda14f08..f7857c917b 100644 --- a/Content.Server/GameObjects/EntitySystems/Atmos/GasTileOverlaySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Atmos/GasTileOverlaySystem.cs @@ -9,14 +9,11 @@ using Content.Shared.Atmos; using Content.Shared.GameObjects.EntitySystems.Atmos; using Content.Shared.GameTicking; using JetBrains.Annotations; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; using Robust.Shared; +using Robust.Shared.Configuration; using Robust.Shared.Enums; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; // ReSharper disable once RedundantUsingDirective using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/GameObjects/EntitySystems/AtmosExposedSystem.cs b/Content.Server/GameObjects/EntitySystems/AtmosExposedSystem.cs index 8dad965d5e..92c5ace6f2 100644 --- a/Content.Server/GameObjects/EntitySystems/AtmosExposedSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AtmosExposedSystem.cs @@ -1,9 +1,7 @@ using Content.Server.Atmos; using Content.Server.GameObjects.Components.Atmos; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs index 71b0856e99..bb2e6e6725 100644 --- a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs @@ -10,15 +10,10 @@ using Content.Shared.Atmos; using Content.Shared.GameObjects.EntitySystems.Atmos; using Content.Shared.Maps; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems.TileLookup; -using Robust.Server.Interfaces.Timing; +using Robust.Server.GameObjects; +using Robust.Server.Timing; +using Robust.Shared.Configuration; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/EntitySystems/BlockGameSystem.cs b/Content.Server/GameObjects/EntitySystems/BlockGameSystem.cs index 5ebfe7dc5c..e7dd4c211e 100644 --- a/Content.Server/GameObjects/EntitySystems/BlockGameSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/BlockGameSystem.cs @@ -1,10 +1,8 @@ -using System; -using System.Collections; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Arcade; using Content.Shared.Arcade; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/Body/Surgery/SurgeryToolSystem.cs b/Content.Server/GameObjects/EntitySystems/Body/Surgery/SurgeryToolSystem.cs index 6e7d65b03b..e63268b58c 100644 --- a/Content.Server/GameObjects/EntitySystems/Body/Surgery/SurgeryToolSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Body/Surgery/SurgeryToolSystem.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Body.Surgery; using Content.Server.GameObjects.Components.Body.Surgery.Messages; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameTicking; using Content.Shared.Utility; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems.Body.Surgery { diff --git a/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs b/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs index 596aa1c319..81aee0d17d 100644 --- a/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs @@ -3,11 +3,9 @@ using Content.Server.GameObjects.Components.Buckle; using Content.Server.GameObjects.Components.Strap; using Content.Server.GameObjects.EntitySystems.Click; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystemMessages; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.Containers; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/CargoConsoleSystem.cs b/Content.Server/GameObjects/EntitySystems/CargoConsoleSystem.cs index c30bd6052f..00d227a02e 100644 --- a/Content.Server/GameObjects/EntitySystems/CargoConsoleSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/CargoConsoleSystem.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using Robust.Shared.GameObjects.Systems; using Content.Shared.Prototypes.Cargo; using Content.Shared.GameTicking; using Content.Server.Cargo; using Content.Server.GameObjects.Components.Cargo; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/ChemicalReactionSystem.cs b/Content.Server/GameObjects/EntitySystems/ChemicalReactionSystem.cs index 5d4ad7c567..59eba6b1b1 100644 --- a/Content.Server/GameObjects/EntitySystems/ChemicalReactionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ChemicalReactionSystem.cs @@ -1,8 +1,8 @@ #nullable enable using Content.Shared.Chemistry; using Content.Shared.GameObjects.EntitySystems; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems.NewFolder { diff --git a/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs index a0d2c658c5..09afc6198d 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs @@ -1,9 +1,8 @@ using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.GameObjects.EntitySystems; using JetBrains.Annotations; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index 40ee427b78..8c5e1a8562 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -1,7 +1,6 @@ using System; using System.Linq; using System.Threading.Tasks; -using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Pulling; @@ -17,14 +16,11 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Server.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Input; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; diff --git a/Content.Server/GameObjects/EntitySystems/ClimbSystem.cs b/Content.Server/GameObjects/EntitySystems/ClimbSystem.cs index 7f0a0a3857..7036b5acae 100644 --- a/Content.Server/GameObjects/EntitySystems/ClimbSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ClimbSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Movement; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/CloningSystem.cs b/Content.Server/GameObjects/EntitySystems/CloningSystem.cs index 438d26269d..83ddd8bb0a 100644 --- a/Content.Server/GameObjects/EntitySystems/CloningSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/CloningSystem.cs @@ -3,7 +3,7 @@ using System.Linq; using Content.Server.GameObjects.Components.Medical; using Content.Server.Mobs; using Content.Shared.GameTicking; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs b/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs index 41640fa5b9..da8d0d3309 100644 --- a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System.Collections.Generic; using System.IO; using System.Linq; @@ -9,22 +9,20 @@ using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.EntitySystems.DoAfter; using Content.Shared.Construction; -using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces; using Content.Shared.Utility; using JetBrains.Annotations; -using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Players; using Robust.Shared.Prototypes; +using Robust.Shared.Random; using Robust.Shared.Timers; diff --git a/Content.Server/GameObjects/EntitySystems/ConveyorSystem.cs b/Content.Server/GameObjects/EntitySystems/ConveyorSystem.cs index 30a61761bf..265606c1e0 100644 --- a/Content.Server/GameObjects/EntitySystems/ConveyorSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ConveyorSystem.cs @@ -1,8 +1,6 @@ -using System.Collections.Generic; -using Content.Server.GameObjects.Components.Conveyor; -using Content.Shared.GameObjects.Components.Conveyor; +using Content.Server.GameObjects.Components.Conveyor; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/DestructibleSystem.cs b/Content.Server/GameObjects/EntitySystems/DestructibleSystem.cs index e9449cde08..3390cee803 100644 --- a/Content.Server/GameObjects/EntitySystems/DestructibleSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/DestructibleSystem.cs @@ -1,9 +1,9 @@ using Content.Shared.GameObjects.EntitySystems; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Random; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Random; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/DeviceNetworkSystem.cs b/Content.Server/GameObjects/EntitySystems/DeviceNetworkSystem.cs index 7ccc81f96d..8d717ffcf5 100644 --- a/Content.Server/GameObjects/EntitySystems/DeviceNetworkSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/DeviceNetworkSystem.cs @@ -1,6 +1,6 @@ using Content.Server.Interfaces; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/DisposableSystem.cs b/Content.Server/GameObjects/EntitySystems/DisposableSystem.cs index eef8d319e8..9148a683ee 100644 --- a/Content.Server/GameObjects/EntitySystems/DisposableSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/DisposableSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Disposal; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs index 5d496ee038..db84d76b84 100644 --- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs +++ b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs @@ -4,9 +4,9 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Mobs; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.EntitySystems.DoAfter { diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs index e3063e3a43..6e9f51a1f1 100644 --- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs +++ b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs @@ -3,7 +3,7 @@ using System; using System.Threading; using Content.Shared.Physics; using Content.Shared.Utility; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; // ReSharper disable UnassignedReadonlyField diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs index 3dc45ffb13..fe2eda58c5 100644 --- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Threading.Tasks; using Content.Server.GameObjects.Components; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems.DoAfter { diff --git a/Content.Server/GameObjects/EntitySystems/DoorSystem.cs b/Content.Server/GameObjects/EntitySystems/DoorSystem.cs index 3f39c302a5..7b2b587a13 100644 --- a/Content.Server/GameObjects/EntitySystems/DoorSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/DoorSystem.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Doors; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/EmergencyLightSystem.cs b/Content.Server/GameObjects/EntitySystems/EmergencyLightSystem.cs index 0b9c65c9f0..61cec70900 100644 --- a/Content.Server/GameObjects/EntitySystems/EmergencyLightSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/EmergencyLightSystem.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs b/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs index 36c9c3ab87..c5a19e2493 100644 --- a/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Interactable; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionEndTimerSystem.cs b/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionEndTimerSystem.cs index 9e46b5c3a3..b1e040a8ab 100644 --- a/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionEndTimerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionEndTimerSystem.cs @@ -4,12 +4,11 @@ using Content.Server.Interfaces.GameTicking; using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.GameTicking; using JetBrains.Annotations; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; using Robust.Shared.Enums; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Timing; #nullable enable diff --git a/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionRoleSystem.cs b/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionRoleSystem.cs index e805bab473..31c052eab9 100644 --- a/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionRoleSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionRoleSystem.cs @@ -2,7 +2,7 @@ using Content.Server.GameObjects.Components.Suspicion; using Content.Shared.GameTicking; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems.GameMode { diff --git a/Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs b/Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs index d0a65cfa6e..e82322b8e7 100644 --- a/Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Atmos; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs b/Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs index b94b2fed60..f895b706e0 100644 --- a/Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs @@ -1,7 +1,6 @@ using Content.Server.GameObjects.Components.Atmos; -using Content.Server.GameObjects.Components.Recycling; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/GasTankSystem.cs b/Content.Server/GameObjects/EntitySystems/GasTankSystem.cs index 657e618c1f..0633e3e632 100644 --- a/Content.Server/GameObjects/EntitySystems/GasTankSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GasTankSystem.cs @@ -1,10 +1,6 @@ -using System; using Content.Server.GameObjects.Components.Atmos; using JetBrains.Annotations; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Timing; -using Robust.Shared.IoC; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/GodmodeSystem.cs b/Content.Server/GameObjects/EntitySystems/GodmodeSystem.cs index 2bb274a75e..ada6f7dace 100644 --- a/Content.Server/GameObjects/EntitySystems/GodmodeSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GodmodeSystem.cs @@ -4,8 +4,7 @@ using Content.Server.GameObjects.Components.Atmos; using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameTicking; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs b/Content.Server/GameObjects/EntitySystems/GravitySystem.cs index ca0b8572a5..5355439e79 100644 --- a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GravitySystem.cs @@ -5,11 +5,9 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Gravity; using Content.Shared.GameObjects.EntitySystemMessages.Gravity; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.Player; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Random; +using Robust.Server.GameObjects; +using Robust.Server.Player; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs b/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs index 6ccfa9d180..d056b7b196 100644 --- a/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Interactable; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs b/Content.Server/GameObjects/EntitySystems/HandsSystem.cs index 0450d0e459..8ee5925390 100644 --- a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/HandsSystem.cs @@ -10,13 +10,10 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Input; using Content.Shared.Interfaces; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystemMessages; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/EntitySystems/HungerSystem.cs b/Content.Server/GameObjects/EntitySystems/HungerSystem.cs index 18a34dbae3..6961ceb730 100644 --- a/Content.Server/GameObjects/EntitySystems/HungerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/HungerSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Nutrition; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/InstrumentSystem.cs b/Content.Server/GameObjects/EntitySystems/InstrumentSystem.cs index a62c9b2962..3fb9bb852d 100644 --- a/Content.Server/GameObjects/EntitySystems/InstrumentSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/InstrumentSystem.cs @@ -1,8 +1,8 @@ using Content.Server.GameObjects.Components.Instruments; using Content.Shared; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Configuration; +using Robust.Shared.Configuration; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/LatheSystem.cs b/Content.Server/GameObjects/EntitySystems/LatheSystem.cs index 7fc92095be..9e2e0cb6e9 100644 --- a/Content.Server/GameObjects/EntitySystems/LatheSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/LatheSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Research; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs b/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs index 6b6a42a357..784ffc8c35 100644 --- a/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs @@ -1,7 +1,6 @@ using Content.Server.Interfaces; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs b/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs index d7f00b8437..cdfb84bd89 100644 --- a/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Medical; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/MeleeWeaponSystem.cs b/Content.Server/GameObjects/EntitySystems/MeleeWeaponSystem.cs index edeb316154..71d5167875 100644 --- a/Content.Server/GameObjects/EntitySystems/MeleeWeaponSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MeleeWeaponSystem.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; using Content.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/MetabolismSystem.cs b/Content.Server/GameObjects/EntitySystems/MetabolismSystem.cs index 80c6d099cf..835dddc205 100644 --- a/Content.Server/GameObjects/EntitySystems/MetabolismSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MetabolismSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Metabolism; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs b/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs index 5e789493e2..521fc1a120 100644 --- a/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Kitchen; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/MorgueSystem.cs b/Content.Server/GameObjects/EntitySystems/MorgueSystem.cs index 0692438de1..3574f27c2e 100644 --- a/Content.Server/GameObjects/EntitySystems/MorgueSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MorgueSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Morgue; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs index f2cce28e84..0cfd50770e 100644 --- a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs @@ -1,9 +1,7 @@ #nullable enable -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.Components.Sound; using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Inventory; @@ -13,14 +11,7 @@ using Content.Shared.Maps; using Content.Shared.Physics; using JetBrains.Annotations; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Timing; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Random; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; diff --git a/Content.Server/GameObjects/EntitySystems/NodeContainerSystem.cs b/Content.Server/GameObjects/EntitySystems/NodeContainerSystem.cs index 2c60a40bed..130ed3b30a 100644 --- a/Content.Server/GameObjects/EntitySystems/NodeContainerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/NodeContainerSystem.cs @@ -2,8 +2,7 @@ using Content.Server.GameObjects.Components.NodeContainer; using Content.Server.GameObjects.Components.NodeContainer.Nodes; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/NodeGroupSystem.cs b/Content.Server/GameObjects/EntitySystems/NodeGroupSystem.cs index 12a2d10161..5c51fd0b2e 100644 --- a/Content.Server/GameObjects/EntitySystems/NodeGroupSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/NodeGroupSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/ParticleAcceleratorPartSystem.cs b/Content.Server/GameObjects/EntitySystems/ParticleAcceleratorPartSystem.cs index 114028e9b1..13c6ffef50 100644 --- a/Content.Server/GameObjects/EntitySystems/ParticleAcceleratorPartSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ParticleAcceleratorPartSystem.cs @@ -2,8 +2,6 @@ using Content.Server.GameObjects.Components.PA; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/PlantSystem.cs b/Content.Server/GameObjects/EntitySystems/PlantSystem.cs index 5b43f9d1a0..0604ae8ec1 100644 --- a/Content.Server/GameObjects/EntitySystems/PlantSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PlantSystem.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.Botany; using Content.Server.GameObjects.Components.Botany; using Content.Shared.GameTicking; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Server/GameObjects/EntitySystems/PointingSystem.cs b/Content.Server/GameObjects/EntitySystems/PointingSystem.cs index 797171d780..96cda4f1f8 100644 --- a/Content.Server/GameObjects/EntitySystems/PointingSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PointingSystem.cs @@ -4,27 +4,22 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Observer; using Content.Server.GameObjects.Components.Pointing; using Content.Server.Players; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Input; using Content.Shared.Interfaces; using Content.Shared.Utility; using JetBrains.Annotations; -using Robust.Server.GameObjects.Components; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Players; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/Power/BaseChargerSystem.cs b/Content.Server/GameObjects/EntitySystems/Power/BaseChargerSystem.cs index 9b5ec578a4..79eb632671 100644 --- a/Content.Server/GameObjects/EntitySystems/Power/BaseChargerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Power/BaseChargerSystem.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/Power/BatteryDischargerSystem.cs b/Content.Server/GameObjects/EntitySystems/Power/BatteryDischargerSystem.cs index 8980ff8948..2598449300 100644 --- a/Content.Server/GameObjects/EntitySystems/Power/BatteryDischargerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Power/BatteryDischargerSystem.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.GameObjects.Components.Power.PowerNetComponents; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/Power/BatteryStorageSystem.cs b/Content.Server/GameObjects/EntitySystems/Power/BatteryStorageSystem.cs index 725ac2ed9e..c1b9d24353 100644 --- a/Content.Server/GameObjects/EntitySystems/Power/BatteryStorageSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Power/BatteryStorageSystem.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.GameObjects.Components.Power.PowerNetComponents; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/Power/BatterySystem.cs b/Content.Server/GameObjects/EntitySystems/Power/BatterySystem.cs index 92eb658962..c5088146e5 100644 --- a/Content.Server/GameObjects/EntitySystems/Power/BatterySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Power/BatterySystem.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.GameObjects.Components.Power; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerApcSystem.cs b/Content.Server/GameObjects/EntitySystems/Power/PowerApcSystem.cs index da177056dd..b977d0e80a 100644 --- a/Content.Server/GameObjects/EntitySystems/Power/PowerApcSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Power/PowerApcSystem.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerNetSystem.cs b/Content.Server/GameObjects/EntitySystems/Power/PowerNetSystem.cs index 944e801028..4bb61a4c93 100644 --- a/Content.Server/GameObjects/EntitySystems/Power/PowerNetSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Power/PowerNetSystem.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.GameObjects.Components.Power.PowerNetComponents; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerSmesSystem.cs b/Content.Server/GameObjects/EntitySystems/Power/PowerSmesSystem.cs index a1922d2288..2097e1acf5 100644 --- a/Content.Server/GameObjects/EntitySystems/Power/PowerSmesSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Power/PowerSmesSystem.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.GameObjects.Components.Power.PowerNetComponents; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerSolarControlConsoleSystem.cs b/Content.Server/GameObjects/EntitySystems/Power/PowerSolarControlConsoleSystem.cs index 226b40c788..fb34cbb4f1 100644 --- a/Content.Server/GameObjects/EntitySystems/Power/PowerSolarControlConsoleSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Power/PowerSolarControlConsoleSystem.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.GameObjects.Components.Power.PowerNetComponents; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerSolarSystem.cs b/Content.Server/GameObjects/EntitySystems/Power/PowerSolarSystem.cs index b2a8dfa5c3..cc4d789560 100644 --- a/Content.Server/GameObjects/EntitySystems/Power/PowerSolarSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Power/PowerSolarSystem.cs @@ -4,13 +4,12 @@ using System.Linq; using Content.Server.GameObjects.Components.Power.PowerNetComponents; using Content.Shared.Physics; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; +using Robust.Shared.Physics; +using Robust.Shared.Random; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs b/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs index 5c8483866c..8d196875e8 100644 --- a/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Projectiles; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs b/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs index 6b8f6ab87e..803ec4cb8f 100644 --- a/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs @@ -1,8 +1,6 @@ using Content.Server.GameObjects.Components.Fluids; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/GameObjects/EntitySystems/RadioSystem.cs b/Content.Server/GameObjects/EntitySystems/RadioSystem.cs index 7915ea6056..e79c1b633c 100644 --- a/Content.Server/GameObjects/EntitySystems/RadioSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/RadioSystem.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/GameObjects/EntitySystems/ReagentGrinderSystem.cs index 0122a7e18f..e80e958144 100644 --- a/Content.Server/GameObjects/EntitySystems/ReagentGrinderSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ReagentGrinderSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Kitchen; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/RecyclerSystem.cs b/Content.Server/GameObjects/EntitySystems/RecyclerSystem.cs index bea76c6e49..22e5eb4c17 100644 --- a/Content.Server/GameObjects/EntitySystems/RecyclerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/RecyclerSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Recycling; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/ResearchSystem.cs b/Content.Server/GameObjects/EntitySystems/ResearchSystem.cs index 61f0c3bef5..c5c78e9d2d 100644 --- a/Content.Server/GameObjects/EntitySystems/ResearchSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ResearchSystem.cs @@ -1,8 +1,6 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Research; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/RoguePointingSystem.cs b/Content.Server/GameObjects/EntitySystems/RoguePointingSystem.cs index e4fa11b019..63717ee514 100644 --- a/Content.Server/GameObjects/EntitySystems/RoguePointingSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/RoguePointingSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Pointing; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs b/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs index 69fecf41f2..78ee2f25f6 100644 --- a/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs @@ -3,11 +3,11 @@ using System.Threading; using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameTicking; using Content.Shared.GameTicking; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Timing; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Timing; using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs b/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs index 2a97408946..f955f8d787 100644 --- a/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs @@ -2,7 +2,6 @@ using Content.Server.GameObjects.Components.MachineLinking; using Content.Server.GameObjects.EntitySystems.Click; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Input; using Robust.Shared.Input.Binding; using Robust.Shared.Map; diff --git a/Content.Server/GameObjects/EntitySystems/SingularitySystem.cs b/Content.Server/GameObjects/EntitySystems/SingularitySystem.cs index 55cad3de26..d0983f55aa 100644 --- a/Content.Server/GameObjects/EntitySystems/SingularitySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/SingularitySystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Singularity; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/SolutionAreaEffectSystem.cs b/Content.Server/GameObjects/EntitySystems/SolutionAreaEffectSystem.cs index 79062a6d2a..0b47246f99 100644 --- a/Content.Server/GameObjects/EntitySystems/SolutionAreaEffectSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/SolutionAreaEffectSystem.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.GameObjects.Components.Chemistry; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/StandingStateSystem.cs b/Content.Server/GameObjects/EntitySystems/StandingStateSystem.cs index 13974c76e4..bc89e19e76 100644 --- a/Content.Server/GameObjects/EntitySystems/StandingStateSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/StandingStateSystem.cs @@ -4,8 +4,7 @@ using Content.Shared.GameObjects.Components.Rotation; using Content.Shared.GameObjects.EntitySystems; using JetBrains.Annotations; using Robust.Server.GameObjects; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs b/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs index db4e2db866..a47f393ce3 100644 --- a/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs @@ -1,9 +1,7 @@ using Content.Server.GameObjects.Components.StationEvents; -using Content.Shared.GameObjects.Components.Body; using Content.Shared.Interfaces.GameObjects.Components; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.Server.GameObjects.EntitySystems.StationEvents diff --git a/Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs b/Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs index 0d5e79c6d8..d5cbc2fdc4 100644 --- a/Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs @@ -11,15 +11,15 @@ using Content.Shared.GameTicking; using Content.Shared.Network.NetMessages; using JetBrains.Annotations; using Robust.Server.Console; -using Robust.Server.Interfaces.Player; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Timing; +using Robust.Server.Player; +using Robust.Shared.Configuration; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Network; +using Robust.Shared.Random; +using Robust.Shared.Reflection; +using Robust.Shared.Timing; namespace Content.Server.GameObjects.EntitySystems.StationEvents { diff --git a/Content.Server/GameObjects/EntitySystems/StorageSystem.cs b/Content.Server/GameObjects/EntitySystems/StorageSystem.cs index d3dc608ce3..ebd38acb4d 100644 --- a/Content.Server/GameObjects/EntitySystems/StorageSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/StorageSystem.cs @@ -2,9 +2,9 @@ using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.EntitySystems.Click; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystemMessages; -using Robust.Server.Interfaces.Player; -using Robust.Shared.GameObjects.Systems; +using Robust.Server.GameObjects; +using Robust.Server.Player; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/StressTestMovementSystem.cs b/Content.Server/GameObjects/EntitySystems/StressTestMovementSystem.cs index ed941c83c5..19c4702e23 100644 --- a/Content.Server/GameObjects/EntitySystems/StressTestMovementSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/StressTestMovementSystem.cs @@ -1,7 +1,7 @@ using System; using Content.Server.GameObjects.Components; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/StunSystem.cs b/Content.Server/GameObjects/EntitySystems/StunSystem.cs index 05ce68c119..7b76d61b05 100644 --- a/Content.Server/GameObjects/EntitySystems/StunSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/StunSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Mobs; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs b/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs index 64a057d791..cb2537f04e 100644 --- a/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Nutrition; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs b/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs index 4519a54b7b..fd4eeede5c 100644 --- a/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs @@ -1,8 +1,7 @@ using System; using System.Linq; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Timers; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/VaporSystem.cs b/Content.Server/GameObjects/EntitySystems/VaporSystem.cs index 7dc8155f5f..20805e4d8a 100644 --- a/Content.Server/GameObjects/EntitySystems/VaporSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/VaporSystem.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Chemistry; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs index cfd3809972..4e7cf8e3f1 100644 --- a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs @@ -4,11 +4,9 @@ using System.Reflection; using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.GameObjects.Verbs; using Content.Shared.GameTicking; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using static Content.Shared.GameObjects.EntitySystemMessages.VerbSystemMessages; diff --git a/Content.Server/GameObjects/EntitySystems/WeightlessSystem.cs b/Content.Server/GameObjects/EntitySystems/WeightlessSystem.cs index 794b6df840..399c706c92 100644 --- a/Content.Server/GameObjects/EntitySystems/WeightlessSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/WeightlessSystem.cs @@ -1,14 +1,10 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Alert; -using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.EntitySystemMessages.Gravity; using Content.Shared.GameTicking; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Components.Map; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Utility; diff --git a/Content.Server/GameObjects/EntitySystems/WelderSystem.cs b/Content.Server/GameObjects/EntitySystems/WelderSystem.cs index 5d86e0c9cb..6e0be0bdec 100644 --- a/Content.Server/GameObjects/EntitySystems/WelderSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/WelderSystem.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Interactable; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/WireHackingSystem.cs b/Content.Server/GameObjects/EntitySystems/WireHackingSystem.cs index 03c5235c20..3235bee8c4 100644 --- a/Content.Server/GameObjects/EntitySystems/WireHackingSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/WireHackingSystem.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Content.Shared.GameTicking; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.SharedWiresComponent; diff --git a/Content.Server/GameTicking/GamePreset.cs b/Content.Server/GameTicking/GamePreset.cs index 478a3953b8..273918da31 100644 --- a/Content.Server/GameTicking/GamePreset.cs +++ b/Content.Server/GameTicking/GamePreset.cs @@ -1,19 +1,15 @@ #nullable enable annotations using System.Collections.Generic; using Content.Shared.Preferences; -using Content.Server.Administration; -using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Observer; using Content.Server.Interfaces.GameTicking; -using Content.Server.Players; using Content.Server.Mobs; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; -using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs.State; +using Robust.Server.Player; +using Robust.Shared.GameObjects; using Robust.Shared.Network; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; using Robust.Shared.IoC; namespace Content.Server.GameTicking diff --git a/Content.Server/GameTicking/GamePresets/PresetDeathMatch.cs b/Content.Server/GameTicking/GamePresets/PresetDeathMatch.cs index 163f3a0d85..87368f6834 100644 --- a/Content.Server/GameTicking/GamePresets/PresetDeathMatch.cs +++ b/Content.Server/GameTicking/GamePresets/PresetDeathMatch.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Content.Server.GameTicking.GameRules; using Content.Server.Interfaces.GameTicking; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.IoC; namespace Content.Server.GameTicking.GamePresets diff --git a/Content.Server/GameTicking/GamePresets/PresetSandbox.cs b/Content.Server/GameTicking/GamePresets/PresetSandbox.cs index 4c8c61267a..4f370a9159 100644 --- a/Content.Server/GameTicking/GamePresets/PresetSandbox.cs +++ b/Content.Server/GameTicking/GamePresets/PresetSandbox.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Content.Server.Sandbox; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.IoC; namespace Content.Server.GameTicking.GamePresets diff --git a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs index 9db545d19d..045ac396e3 100644 --- a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs +++ b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs @@ -13,10 +13,9 @@ using Content.Shared; using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.Components.PDA; using Content.Shared.Roles; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; +using Robust.Shared.Configuration; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; diff --git a/Content.Server/GameTicking/GamePresets/PresetTraitor.cs b/Content.Server/GameTicking/GamePresets/PresetTraitor.cs index 5b4ebc7879..6ee10df25c 100644 --- a/Content.Server/GameTicking/GamePresets/PresetTraitor.cs +++ b/Content.Server/GameTicking/GamePresets/PresetTraitor.cs @@ -14,9 +14,8 @@ using Content.Shared; using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.Components.PDA; using Content.Shared.Prototypes; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Random; +using Robust.Server.Player; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; diff --git a/Content.Server/GameTicking/GamePresets/PresetTraitorDeathMatch.cs b/Content.Server/GameTicking/GamePresets/PresetTraitorDeathMatch.cs index 00cb00d88f..6ae9e41904 100644 --- a/Content.Server/GameTicking/GamePresets/PresetTraitorDeathMatch.cs +++ b/Content.Server/GameTicking/GamePresets/PresetTraitorDeathMatch.cs @@ -18,15 +18,14 @@ using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.Components.PDA; using Content.Shared.GameObjects.Components.Mobs.State; using Content.Shared; +using Robust.Server.Player; +using Robust.Shared.Configuration; using Robust.Shared.Map; -using Robust.Server.Interfaces.Player; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Random; using Robust.Shared.Log; +using Robust.Shared.Random; namespace Content.Server.GameTicking.GamePresets { diff --git a/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs b/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs index d72873f16b..d71cac99eb 100644 --- a/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs +++ b/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs @@ -5,12 +5,10 @@ using Content.Server.Interfaces.GameTicking; using Content.Shared; using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs.State; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; +using Robust.Shared.Configuration; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Timer = Robust.Shared.Timers.Timer; diff --git a/Content.Server/GameTicking/GameRules/RuleInactivityTimeRestart.cs b/Content.Server/GameTicking/GameRules/RuleInactivityTimeRestart.cs index ebcea5cde7..e46378645d 100644 --- a/Content.Server/GameTicking/GameRules/RuleInactivityTimeRestart.cs +++ b/Content.Server/GameTicking/GameRules/RuleInactivityTimeRestart.cs @@ -3,7 +3,6 @@ using System; using System.Threading; using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameTicking; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs b/Content.Server/GameTicking/GameRules/RuleSuspicion.cs index f1d66028b7..c2c9809997 100644 --- a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs +++ b/Content.Server/GameTicking/GameRules/RuleSuspicion.cs @@ -9,15 +9,14 @@ using Content.Server.Mobs.Roles.Suspicion; using Content.Server.Players; using Content.Shared; using Content.Shared.GameObjects.Components.Mobs.State; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.Audio; +using Robust.Shared.Configuration; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Timing; using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.GameTicking.GameRules diff --git a/Content.Server/GameTicking/GameRules/RuleTraitor.cs b/Content.Server/GameTicking/GameRules/RuleTraitor.cs index 69fe11807d..7ca6614cd4 100644 --- a/Content.Server/GameTicking/GameRules/RuleTraitor.cs +++ b/Content.Server/GameTicking/GameRules/RuleTraitor.cs @@ -1,10 +1,10 @@ using Content.Server.Interfaces.Chat; using Content.Server.Mobs.Roles.Traitor; using Content.Server.Players; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; +using Robust.Server.Player; using Robust.Shared.Audio; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/GameTicking/GameRules/RuleTraitorDeathMatch.cs b/Content.Server/GameTicking/GameRules/RuleTraitorDeathMatch.cs index f7f3a76d7b..d97cdd4fbd 100644 --- a/Content.Server/GameTicking/GameRules/RuleTraitorDeathMatch.cs +++ b/Content.Server/GameTicking/GameRules/RuleTraitorDeathMatch.cs @@ -1,14 +1,4 @@ -using Content.Server.Interfaces.Chat; -using Content.Server.Mobs.Roles.Traitor; -using Content.Server.Players; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Audio; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.IoC; -using Robust.Shared.Localization; - -namespace Content.Server.GameTicking.GameRules +namespace Content.Server.GameTicking.GameRules { public class RuleTraitorDeathMatch : GameRule { diff --git a/Content.Server/GameTicking/GameTicker.JobController.cs b/Content.Server/GameTicking/GameTicker.JobController.cs index 1051af0f65..835097fd5a 100644 --- a/Content.Server/GameTicking/GameTicker.JobController.cs +++ b/Content.Server/GameTicking/GameTicker.JobController.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Linq; using Content.Shared.Preferences; using Content.Shared.Roles; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Localization; using Robust.Shared.Network; using Robust.Shared.Random; diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 9d7800bb1f..d99c96c61f 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -25,19 +25,13 @@ using Content.Shared.Preferences; using Content.Shared.Roles; using Content.Shared.Utility; using Prometheus; -using Robust.Server.Interfaces; -using Robust.Server.Interfaces.Maps; -using Robust.Server.Interfaces.Player; +using Robust.Server; +using Robust.Server.Maps; using Robust.Server.Player; using Robust.Server.ServerStatus; +using Robust.Shared.Configuration; using Robust.Shared.Enums; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; diff --git a/Content.Server/GameTicking/GameTickerBase.cs b/Content.Server/GameTicking/GameTickerBase.cs index cf50f91ca4..2a83a6f17e 100644 --- a/Content.Server/GameTicking/GameTickerBase.cs +++ b/Content.Server/GameTicking/GameTickerBase.cs @@ -1,7 +1,5 @@ using Content.Server.Players; -using Content.Shared; using Content.Shared.GameTicking; -using Robust.Server.Interfaces.Player; using Robust.Server.Player; using Robust.Shared.Enums; using Robust.Shared.IoC; diff --git a/Content.Server/GlobalVerbs/AttachToGrandparentVerb.cs b/Content.Server/GlobalVerbs/AttachToGrandparentVerb.cs index fc65d18d8c..3faca5bf95 100644 --- a/Content.Server/GlobalVerbs/AttachToGrandparentVerb.cs +++ b/Content.Server/GlobalVerbs/AttachToGrandparentVerb.cs @@ -1,8 +1,8 @@ using Content.Shared.GameObjects.Verbs; using Content.Shared.Utility; using Robust.Server.Console; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/GlobalVerbs/AttachToGridVerb.cs b/Content.Server/GlobalVerbs/AttachToGridVerb.cs index 932597c2ba..8b6f678750 100644 --- a/Content.Server/GlobalVerbs/AttachToGridVerb.cs +++ b/Content.Server/GlobalVerbs/AttachToGridVerb.cs @@ -1,7 +1,7 @@ using Content.Shared.GameObjects.Verbs; using Robust.Server.Console; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/GlobalVerbs/AttachToSelf.cs b/Content.Server/GlobalVerbs/AttachToSelf.cs index d0bfab494b..d10fffff6d 100644 --- a/Content.Server/GlobalVerbs/AttachToSelf.cs +++ b/Content.Server/GlobalVerbs/AttachToSelf.cs @@ -1,7 +1,7 @@ using Content.Shared.GameObjects.Verbs; using Robust.Server.Console; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/GlobalVerbs/ControlMobVerb.cs b/Content.Server/GlobalVerbs/ControlMobVerb.cs index 48e226a855..59973d577b 100644 --- a/Content.Server/GlobalVerbs/ControlMobVerb.cs +++ b/Content.Server/GlobalVerbs/ControlMobVerb.cs @@ -3,8 +3,8 @@ using Content.Server.GameObjects.Components.Observer; using Content.Server.Players; using Content.Shared.GameObjects.Verbs; using Robust.Server.Console; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/GlobalVerbs/InRangeUnoccludedVerb.cs b/Content.Server/GlobalVerbs/InRangeUnoccludedVerb.cs index b15ef0516a..b5776980ba 100644 --- a/Content.Server/GlobalVerbs/InRangeUnoccludedVerb.cs +++ b/Content.Server/GlobalVerbs/InRangeUnoccludedVerb.cs @@ -2,8 +2,8 @@ using Content.Shared.Interfaces; using Content.Shared.Utility; using Robust.Server.Console; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/GlobalVerbs/MakeSentientVerb.cs b/Content.Server/GlobalVerbs/MakeSentientVerb.cs index ff040dbb9b..be2727bb6d 100644 --- a/Content.Server/GlobalVerbs/MakeSentientVerb.cs +++ b/Content.Server/GlobalVerbs/MakeSentientVerb.cs @@ -2,9 +2,9 @@ using Content.Server.Commands; using Content.Server.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Verbs; using Robust.Server.Console; -using Robust.Server.Interfaces.GameObjects; +using Robust.Server.GameObjects; using Robust.Shared.Console; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/GlobalVerbs/PointingVerb.cs b/Content.Server/GlobalVerbs/PointingVerb.cs index 3dd52e6941..04d49ec8d7 100644 --- a/Content.Server/GlobalVerbs/PointingVerb.cs +++ b/Content.Server/GlobalVerbs/PointingVerb.cs @@ -1,9 +1,8 @@ using Content.Server.GameObjects.Components.Pointing; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Verbs; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; namespace Content.Server.GlobalVerbs diff --git a/Content.Server/GlobalVerbs/RejuvenateVerb.cs b/Content.Server/GlobalVerbs/RejuvenateVerb.cs index aec9e54783..6b9da5867b 100644 --- a/Content.Server/GlobalVerbs/RejuvenateVerb.cs +++ b/Content.Server/GlobalVerbs/RejuvenateVerb.cs @@ -5,8 +5,8 @@ using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs.State; using Content.Shared.GameObjects.Verbs; using Robust.Server.Console; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/GlobalVerbs/SetAnchorVerb.cs b/Content.Server/GlobalVerbs/SetAnchorVerb.cs index 1fa2246d7d..aeec799e13 100644 --- a/Content.Server/GlobalVerbs/SetAnchorVerb.cs +++ b/Content.Server/GlobalVerbs/SetAnchorVerb.cs @@ -1,11 +1,8 @@ #nullable enable -using Content.Server.GameObjects.Components.Nutrition; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Verbs; using Robust.Server.Console; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.GlobalVerbs diff --git a/Content.Server/Interfaces/Chat/IChatManager.cs b/Content.Server/Interfaces/Chat/IChatManager.cs index 0edfff50cd..2480d243d8 100644 --- a/Content.Server/Interfaces/Chat/IChatManager.cs +++ b/Content.Server/Interfaces/Chat/IChatManager.cs @@ -1,5 +1,5 @@ -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.Player; +using Robust.Shared.GameObjects; namespace Content.Server.Interfaces.Chat { diff --git a/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs b/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs index c5fd4c9865..58173ca102 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs +++ b/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs @@ -1,14 +1,12 @@ -#nullable enable +#nullable enable using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Content.Server.GameObjects.Components.Items.Storage; using Content.Shared.GameObjects.Components.Items; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystemMessages; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.Server.Interfaces.GameObjects.Components.Items diff --git a/Content.Server/Interfaces/GameObjects/IDisarmedAct.cs b/Content.Server/Interfaces/GameObjects/IDisarmedAct.cs index 089b152eed..f09be5245d 100644 --- a/Content.Server/Interfaces/GameObjects/IDisarmedAct.cs +++ b/Content.Server/Interfaces/GameObjects/IDisarmedAct.cs @@ -1,6 +1,6 @@ using System; using Robust.Shared.Analyzers; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Interfaces.GameObjects { diff --git a/Content.Server/Interfaces/GameObjects/ISuicideAct.cs b/Content.Server/Interfaces/GameObjects/ISuicideAct.cs index a8b3dcac4b..809b4c8e5f 100644 --- a/Content.Server/Interfaces/GameObjects/ISuicideAct.cs +++ b/Content.Server/Interfaces/GameObjects/ISuicideAct.cs @@ -1,6 +1,6 @@ using Content.Server.Interfaces.Chat; using Robust.Shared.Analyzers; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Interfaces.GameObjects { diff --git a/Content.Server/Interfaces/GameTicking/IGameTicker.cs b/Content.Server/Interfaces/GameTicking/IGameTicker.cs index 0e84bf73cd..404070aba9 100644 --- a/Content.Server/Interfaces/GameTicking/IGameTicker.cs +++ b/Content.Server/Interfaces/GameTicking/IGameTicker.cs @@ -4,8 +4,8 @@ using Content.Server.GameTicking; using Content.Server.Mobs; using Content.Shared.Roles; using Content.Shared.Preferences; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.Player; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Timing; diff --git a/Content.Server/Interfaces/IDeviceNetwork.cs b/Content.Server/Interfaces/IDeviceNetwork.cs index 242abd51ec..a3c85a4e18 100644 --- a/Content.Server/Interfaces/IDeviceNetwork.cs +++ b/Content.Server/Interfaces/IDeviceNetwork.cs @@ -1,5 +1,4 @@ -using System; -using Content.Server.GameObjects.EntitySystems.DeviceNetwork; +using Content.Server.GameObjects.EntitySystems.DeviceNetwork; namespace Content.Server.Interfaces { diff --git a/Content.Server/Interfaces/IDeviceNetworkConnection.cs b/Content.Server/Interfaces/IDeviceNetworkConnection.cs index 854acf78db..e23749f1d3 100644 --- a/Content.Server/Interfaces/IDeviceNetworkConnection.cs +++ b/Content.Server/Interfaces/IDeviceNetworkConnection.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; namespace Content.Server.Interfaces { diff --git a/Content.Server/Interfaces/IGasReactionEffect.cs b/Content.Server/Interfaces/IGasReactionEffect.cs index 819ede8b91..52fada8f21 100644 --- a/Content.Server/Interfaces/IGasReactionEffect.cs +++ b/Content.Server/Interfaces/IGasReactionEffect.cs @@ -1,9 +1,8 @@ -#nullable enable +#nullable enable using Content.Server.Atmos; using Content.Server.Atmos.Reactions; -using Robust.Server.GameObjects.EntitySystems.TileLookup; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Server.GameObjects; +using Robust.Shared.Serialization; namespace Content.Server.Interfaces { diff --git a/Content.Server/Interfaces/IListen.cs b/Content.Server/Interfaces/IListen.cs index b5913dd94a..ebc2c362e1 100644 --- a/Content.Server/Interfaces/IListen.cs +++ b/Content.Server/Interfaces/IListen.cs @@ -1,8 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Map; -using System; -using System.Collections.Generic; -using System.Text; +using Robust.Shared.GameObjects; namespace Content.Server.Interfaces { diff --git a/Content.Server/Interfaces/IRadio.cs b/Content.Server/Interfaces/IRadio.cs index 510a7723ad..a31a998622 100644 --- a/Content.Server/Interfaces/IRadio.cs +++ b/Content.Server/Interfaces/IRadio.cs @@ -1,7 +1,5 @@ -using Robust.Shared.Interfaces.GameObjects; -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; +using Robust.Shared.GameObjects; namespace Content.Server.Interfaces { diff --git a/Content.Server/Interfaces/IServerPreferencesManager.cs b/Content.Server/Interfaces/IServerPreferencesManager.cs index ef8256d25f..2a85600825 100644 --- a/Content.Server/Interfaces/IServerPreferencesManager.cs +++ b/Content.Server/Interfaces/IServerPreferencesManager.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Content.Shared.Preferences; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Network; namespace Content.Server.Interfaces diff --git a/Content.Server/Interfaces/PDA/IPDAUplinkManager.cs b/Content.Server/Interfaces/PDA/IPDAUplinkManager.cs index 0b9f78dba3..889d079381 100644 --- a/Content.Server/Interfaces/PDA/IPDAUplinkManager.cs +++ b/Content.Server/Interfaces/PDA/IPDAUplinkManager.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Content.Shared.GameObjects.Components.PDA; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.Server.Interfaces.PDA diff --git a/Content.Server/Jobs/ClownSpecial.cs b/Content.Server/Jobs/ClownSpecial.cs index 29e64304e2..543706999b 100644 --- a/Content.Server/Jobs/ClownSpecial.cs +++ b/Content.Server/Jobs/ClownSpecial.cs @@ -1,7 +1,7 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Roles; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Jobs { diff --git a/Content.Server/MoMMILink.cs b/Content.Server/MoMMILink.cs index fb944a5525..e6cdc66211 100644 --- a/Content.Server/MoMMILink.cs +++ b/Content.Server/MoMMILink.cs @@ -7,9 +7,9 @@ using Content.Server.Interfaces; using Content.Server.Interfaces.Chat; using Content.Shared; using Newtonsoft.Json; -using Robust.Server.Interfaces.ServerStatus; +using Robust.Server.ServerStatus; using Robust.Shared.Asynchronous; -using Robust.Shared.Interfaces.Configuration; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Log; diff --git a/Content.Server/Mobs/Mind.cs b/Content.Server/Mobs/Mind.cs index 98d313c6ed..1c157fee65 100644 --- a/Content.Server/Mobs/Mind.cs +++ b/Content.Server/Mobs/Mind.cs @@ -5,9 +5,9 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.Mobs.Roles; using Content.Server.Objectives; using Content.Server.Players; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Server.Player; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Network; using Robust.Shared.ViewVariables; diff --git a/Content.Server/Mobs/MindHelpers.cs b/Content.Server/Mobs/MindHelpers.cs index 017de12ff5..654a37b1ff 100644 --- a/Content.Server/Mobs/MindHelpers.cs +++ b/Content.Server/Mobs/MindHelpers.cs @@ -1,7 +1,7 @@ using Content.Server.Interfaces.GameTicking; using Content.Server.Players; using Robust.Server.Player; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Mobs diff --git a/Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs b/Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs index 62cff5cc11..8e4d71c2f8 100644 --- a/Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs +++ b/Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs @@ -4,8 +4,7 @@ using Content.Server.Mobs; using Content.Server.Objectives.Interfaces; using Content.Shared.GameObjects.Components.Mobs.State; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Random; diff --git a/Content.Server/Objectives/Conditions/StealCondition.cs b/Content.Server/Objectives/Conditions/StealCondition.cs index 44c01f1598..914e1326ef 100644 --- a/Content.Server/Objectives/Conditions/StealCondition.cs +++ b/Content.Server/Objectives/Conditions/StealCondition.cs @@ -4,9 +4,7 @@ using Content.Server.GameObjects.Components.ContainerExt; using Content.Server.Mobs; using Content.Server.Objectives.Interfaces; using JetBrains.Annotations; -using Robust.Server.GameObjects.Components.Container; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Server.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; diff --git a/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs b/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs index c55dd516c1..7ae83801c9 100644 --- a/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs +++ b/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs @@ -1,7 +1,6 @@ #nullable enable using System; using Content.Server.Mobs; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Server/Objectives/Interfaces/IObjectiveRequirement.cs b/Content.Server/Objectives/Interfaces/IObjectiveRequirement.cs index 7615c8a0a3..ede3737858 100644 --- a/Content.Server/Objectives/Interfaces/IObjectiveRequirement.cs +++ b/Content.Server/Objectives/Interfaces/IObjectiveRequirement.cs @@ -1,5 +1,5 @@ using Content.Server.Mobs; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.Serialization; namespace Content.Server.Objectives.Interfaces { diff --git a/Content.Server/Objectives/ObjectivesManager.cs b/Content.Server/Objectives/ObjectivesManager.cs index be44b1431a..1a955b23d5 100644 --- a/Content.Server/Objectives/ObjectivesManager.cs +++ b/Content.Server/Objectives/ObjectivesManager.cs @@ -3,11 +3,9 @@ using System.Collections.Generic; using System.Linq; using Content.Server.Mobs; using Content.Server.Objectives.Interfaces; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Random; -using Robust.Shared.Utility; namespace Content.Server.Objectives { diff --git a/Content.Server/Objectives/Requirements/IncompatibleConditionsRequirement.cs b/Content.Server/Objectives/Requirements/IncompatibleConditionsRequirement.cs index 06d8a1ff0a..dededce877 100644 --- a/Content.Server/Objectives/Requirements/IncompatibleConditionsRequirement.cs +++ b/Content.Server/Objectives/Requirements/IncompatibleConditionsRequirement.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using Content.Server.Mobs; using Content.Server.Objectives.Interfaces; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.Objectives.Requirements diff --git a/Content.Server/Objectives/Requirements/IncompatibleObjectivesRequirement.cs b/Content.Server/Objectives/Requirements/IncompatibleObjectivesRequirement.cs index 893bc5504c..b9290adde0 100644 --- a/Content.Server/Objectives/Requirements/IncompatibleObjectivesRequirement.cs +++ b/Content.Server/Objectives/Requirements/IncompatibleObjectivesRequirement.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using Content.Server.Mobs; using Content.Server.Objectives.Interfaces; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.Objectives.Requirements diff --git a/Content.Server/Objectives/Requirements/TraitorRequirement.cs b/Content.Server/Objectives/Requirements/TraitorRequirement.cs index 87abf57237..307c8a5242 100644 --- a/Content.Server/Objectives/Requirements/TraitorRequirement.cs +++ b/Content.Server/Objectives/Requirements/TraitorRequirement.cs @@ -2,7 +2,6 @@ using Content.Server.Mobs.Roles.Traitor; using Content.Server.Objectives.Interfaces; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Server.Objectives.Requirements diff --git a/Content.Server/PDA/PDAUplinkManager.cs b/Content.Server/PDA/PDAUplinkManager.cs index b4d96e6980..7a7f788fd4 100644 --- a/Content.Server/PDA/PDAUplinkManager.cs +++ b/Content.Server/PDA/PDAUplinkManager.cs @@ -1,14 +1,11 @@ #nullable enable using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Linq; -using Content.Server.GameObjects.Components.GUI; -using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Mobs; using Content.Server.Interfaces.PDA; using Content.Shared.GameObjects.Components.PDA; using Content.Shared.Prototypes.PDA; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Prototypes; diff --git a/Content.Server/Players/PlayerData.cs b/Content.Server/Players/PlayerData.cs index d398d87747..e2d24582a2 100644 --- a/Content.Server/Players/PlayerData.cs +++ b/Content.Server/Players/PlayerData.cs @@ -1,6 +1,6 @@ #nullable enable using Content.Server.Mobs; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; using Robust.Shared.Network; using Robust.Shared.ViewVariables; diff --git a/Content.Server/Players/PlayerSessionExt.cs b/Content.Server/Players/PlayerSessionExt.cs index 3b06788869..feb3869836 100644 --- a/Content.Server/Players/PlayerSessionExt.cs +++ b/Content.Server/Players/PlayerSessionExt.cs @@ -1,5 +1,5 @@ using Content.Shared.Network.NetMessages; -using Robust.Server.Interfaces.Player; +using Robust.Server.Player; namespace Content.Server.Players { diff --git a/Content.Server/Preferences/ServerPreferencesManager.cs b/Content.Server/Preferences/ServerPreferencesManager.cs index 96a0cf2d8c..2ef846fd6a 100644 --- a/Content.Server/Preferences/ServerPreferencesManager.cs +++ b/Content.Server/Preferences/ServerPreferencesManager.cs @@ -8,9 +8,8 @@ using Content.Shared; using Content.Shared.Network.NetMessages; using Content.Shared.Preferences; using Content.Shared.Roles; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Network; +using Robust.Server.Player; +using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Network; diff --git a/Content.Server/Sandbox/SandboxManager.cs b/Content.Server/Sandbox/SandboxManager.cs index 4bdc3a366a..412519dbef 100644 --- a/Content.Server/Sandbox/SandboxManager.cs +++ b/Content.Server/Sandbox/SandboxManager.cs @@ -9,13 +9,12 @@ using Content.Shared.Access; using Content.Shared.Sandbox; using Robust.Server.Console; using Robust.Server.GameObjects; -using Robust.Server.Interfaces.Placement; -using Robust.Server.Interfaces.Player; +using Robust.Server.Placement; using Robust.Server.Player; using Robust.Shared.Enums; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Network; using Robust.Shared.Prototypes; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.Server/ServerContentIoC.cs b/Content.Server/ServerContentIoC.cs index 89469b58ce..b3c5630a2c 100644 --- a/Content.Server/ServerContentIoC.cs +++ b/Content.Server/ServerContentIoC.cs @@ -1,7 +1,6 @@ using Content.Server.Administration; using Content.Server.AI.Utility.Considerations; using Content.Server.AI.WorldState; -using Content.Server.Cargo; using Content.Server.Chat; using Content.Server.Database; using Content.Server.Eui; diff --git a/Content.Server/ServerNotifyManager.cs b/Content.Server/ServerNotifyManager.cs index 9c00fa92e1..f3772b4fde 100644 --- a/Content.Server/ServerNotifyManager.cs +++ b/Content.Server/ServerNotifyManager.cs @@ -1,16 +1,10 @@ -using Content.Server.Administration; using Content.Server.Interfaces; using Content.Shared; -using Content.Shared.Network.NetMessages; -using Content.Shared.Administration; -using Content.Shared.Interfaces; -using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Interfaces.Player; +using Robust.Server.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Map; +using Robust.Shared.Network; using Robust.Shared.Utility; namespace Content.Server diff --git a/Content.Server/SetOutfitEui.cs b/Content.Server/SetOutfitEui.cs index 3acbe72e23..d2c32c3e01 100644 --- a/Content.Server/SetOutfitEui.cs +++ b/Content.Server/SetOutfitEui.cs @@ -1,13 +1,10 @@ using Content.Server.Administration; -using Content.Server.Database; using Content.Server.Eui; using Content.Shared.Administration; using Content.Shared.Eui; using JetBrains.Annotations; -using Robust.Server.Interfaces.Player; using Robust.Shared.IoC; -using System; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server { diff --git a/Content.Server/StationEvents/FalseAlarm.cs b/Content.Server/StationEvents/FalseAlarm.cs index 70db0cc7bb..3864af28a4 100644 --- a/Content.Server/StationEvents/FalseAlarm.cs +++ b/Content.Server/StationEvents/FalseAlarm.cs @@ -1,7 +1,7 @@ #nullable enable using JetBrains.Annotations; using Content.Server.GameObjects.EntitySystems.StationEvents; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Server.StationEvents { diff --git a/Content.Server/StationEvents/PowerGridCheck.cs b/Content.Server/StationEvents/PowerGridCheck.cs index 90226c356e..45d8218a95 100644 --- a/Content.Server/StationEvents/PowerGridCheck.cs +++ b/Content.Server/StationEvents/PowerGridCheck.cs @@ -3,12 +3,11 @@ using System.Collections.Generic; using System.Threading; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Random; using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.StationEvents diff --git a/Content.Server/StationEvents/RadiationStorm.cs b/Content.Server/StationEvents/RadiationStorm.cs index 46c66e2423..47b2a66d8b 100644 --- a/Content.Server/StationEvents/RadiationStorm.cs +++ b/Content.Server/StationEvents/RadiationStorm.cs @@ -1,14 +1,10 @@ #nullable enable using JetBrains.Annotations; -using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.StationEvents; using Content.Server.Interfaces.GameTicking; -using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.Utility; -using Robust.Server.Interfaces.Timing; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Random; +using Robust.Server.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; diff --git a/Content.Server/StationEvents/StationEvent.cs b/Content.Server/StationEvents/StationEvent.cs index b4deed65ac..f298bc9690 100644 --- a/Content.Server/StationEvents/StationEvent.cs +++ b/Content.Server/StationEvents/StationEvent.cs @@ -1,8 +1,8 @@ #nullable enable using Content.Server.Interfaces.Chat; -using Robust.Shared.GameObjects.Systems; -using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects; using Robust.Shared.Audio; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.StationEvents diff --git a/Content.Server/StatusShell.cs b/Content.Server/StatusShell.cs index 78054c8a25..33ac8473dc 100644 --- a/Content.Server/StatusShell.cs +++ b/Content.Server/StatusShell.cs @@ -2,9 +2,9 @@ using System; using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; using Newtonsoft.Json.Linq; -using Robust.Server.Interfaces; -using Robust.Server.Interfaces.Player; -using Robust.Server.Interfaces.ServerStatus; +using Robust.Server; +using Robust.Server.Player; +using Robust.Server.ServerStatus; using Robust.Shared.IoC; namespace Content.Server diff --git a/Content.Server/Throw/ThrowHelper.cs b/Content.Server/Throw/ThrowHelper.cs index a0ab566592..359a73f2f0 100644 --- a/Content.Server/Throw/ThrowHelper.cs +++ b/Content.Server/Throw/ThrowHelper.cs @@ -1,19 +1,15 @@ using System; using Content.Server.GameObjects.Components.Projectiles; using Content.Shared.GameObjects.Components.Movement; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Physics; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Interfaces.Timing; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Physics; using Robust.Shared.Random; +using Robust.Shared.Timing; namespace Content.Server.Throw { diff --git a/Content.Server/Utility/GridTileLookupHelpers.cs b/Content.Server/Utility/GridTileLookupHelpers.cs index d6597a51e1..41e2a8ea27 100644 --- a/Content.Server/Utility/GridTileLookupHelpers.cs +++ b/Content.Server/Utility/GridTileLookupHelpers.cs @@ -1,12 +1,8 @@ -#nullable enable +#nullable enable using System.Collections.Generic; -using System.Linq; using System.Runtime.CompilerServices; -using Content.Shared.Maps; -using Robust.Server.GameObjects.EntitySystems.TileLookup; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/Utility/InventoryHelpers.cs b/Content.Server/Utility/InventoryHelpers.cs index f178ea8e11..43135b9779 100644 --- a/Content.Server/Utility/InventoryHelpers.cs +++ b/Content.Server/Utility/InventoryHelpers.cs @@ -1,6 +1,5 @@ using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; -using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.Server/Utility/NotifyExtensions.cs b/Content.Server/Utility/NotifyExtensions.cs index ef076ce1aa..7fa24c95d3 100644 --- a/Content.Server/Utility/NotifyExtensions.cs +++ b/Content.Server/Utility/NotifyExtensions.cs @@ -1,6 +1,6 @@ using Content.Shared.Interfaces; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.Player; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Utility diff --git a/Content.Server/Utility/SnapgridHelper.cs b/Content.Server/Utility/SnapgridHelper.cs index 41bd5dfe9d..e2420b4883 100644 --- a/Content.Server/Utility/SnapgridHelper.cs +++ b/Content.Server/Utility/SnapgridHelper.cs @@ -1,11 +1,7 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; -using Robust.Shared.Maths; namespace Content.Server.Utility { diff --git a/Content.Server/Utility/UserInterfaceHelpers.cs b/Content.Server/Utility/UserInterfaceHelpers.cs index 2c87ebdfc5..d3147f4fa9 100644 --- a/Content.Server/Utility/UserInterfaceHelpers.cs +++ b/Content.Server/Utility/UserInterfaceHelpers.cs @@ -1,6 +1,6 @@ #nullable enable -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Utility { diff --git a/Content.Shared/Actions/BaseActionPrototype.cs b/Content.Shared/Actions/BaseActionPrototype.cs index 669ee18254..2cfd90b624 100644 --- a/Content.Shared/Actions/BaseActionPrototype.cs +++ b/Content.Shared/Actions/BaseActionPrototype.cs @@ -1,8 +1,6 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -using Content.Shared.Interfaces; -using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/Actions/IActionBehavior.cs b/Content.Shared/Actions/IActionBehavior.cs index fad5518d77..60dec460ae 100644 --- a/Content.Shared/Actions/IActionBehavior.cs +++ b/Content.Shared/Actions/IActionBehavior.cs @@ -1,7 +1,7 @@ using System; using Content.Shared.GameObjects.Components.Mobs; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.Actions { diff --git a/Content.Shared/Actions/IInstantAction.cs b/Content.Shared/Actions/IInstantAction.cs index 73c24f1a67..b71e066569 100644 --- a/Content.Shared/Actions/IInstantAction.cs +++ b/Content.Shared/Actions/IInstantAction.cs @@ -1,6 +1,4 @@ -using System; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; namespace Content.Shared.Actions { diff --git a/Content.Shared/Actions/IInstantItemAction.cs b/Content.Shared/Actions/IInstantItemAction.cs index 74ac02c28d..8b7dd62d39 100644 --- a/Content.Shared/Actions/IInstantItemAction.cs +++ b/Content.Shared/Actions/IInstantItemAction.cs @@ -1,6 +1,4 @@ -using System; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; namespace Content.Shared.Actions { diff --git a/Content.Shared/Actions/IItemActionBehavior.cs b/Content.Shared/Actions/IItemActionBehavior.cs index dd1ee99b3d..3056f682e6 100644 --- a/Content.Shared/Actions/IItemActionBehavior.cs +++ b/Content.Shared/Actions/IItemActionBehavior.cs @@ -1,7 +1,7 @@ using System; using Content.Shared.GameObjects.Components.Mobs; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.Actions { diff --git a/Content.Shared/Actions/ITargetEntityAction.cs b/Content.Shared/Actions/ITargetEntityAction.cs index 44266bd0ea..538da92843 100644 --- a/Content.Shared/Actions/ITargetEntityAction.cs +++ b/Content.Shared/Actions/ITargetEntityAction.cs @@ -1,7 +1,4 @@ -using System; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.Map; +using Robust.Shared.GameObjects; namespace Content.Shared.Actions { diff --git a/Content.Shared/Actions/ITargetEntityItemAction.cs b/Content.Shared/Actions/ITargetEntityItemAction.cs index 388ea55414..b12c0f81ef 100644 --- a/Content.Shared/Actions/ITargetEntityItemAction.cs +++ b/Content.Shared/Actions/ITargetEntityItemAction.cs @@ -1,7 +1,4 @@ -using System; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.Map; +using Robust.Shared.GameObjects; namespace Content.Shared.Actions { diff --git a/Content.Shared/Actions/ITargetPointAction.cs b/Content.Shared/Actions/ITargetPointAction.cs index 7e78cefebf..d4a566438c 100644 --- a/Content.Shared/Actions/ITargetPointAction.cs +++ b/Content.Shared/Actions/ITargetPointAction.cs @@ -1,5 +1,4 @@ -using System; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.Shared.Actions diff --git a/Content.Shared/Actions/ITargetPointItemAction.cs b/Content.Shared/Actions/ITargetPointItemAction.cs index 5a7c2384f9..a1d4ec6b24 100644 --- a/Content.Shared/Actions/ITargetPointItemAction.cs +++ b/Content.Shared/Actions/ITargetPointItemAction.cs @@ -1,5 +1,4 @@ -using System; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.Shared.Actions diff --git a/Content.Shared/Actions/IToggleAction.cs b/Content.Shared/Actions/IToggleAction.cs index d20b576ea3..8d5b4b76ac 100644 --- a/Content.Shared/Actions/IToggleAction.cs +++ b/Content.Shared/Actions/IToggleAction.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Actions { diff --git a/Content.Shared/Actions/IToggleItemAction.cs b/Content.Shared/Actions/IToggleItemAction.cs index 7930dce933..aaded89c2c 100644 --- a/Content.Shared/Actions/IToggleItemAction.cs +++ b/Content.Shared/Actions/IToggleItemAction.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Actions { diff --git a/Content.Shared/Alert/IAlertClick.cs b/Content.Shared/Alert/IAlertClick.cs index b6240edde5..2629385b4c 100644 --- a/Content.Shared/Alert/IAlertClick.cs +++ b/Content.Shared/Alert/IAlertClick.cs @@ -1,6 +1,6 @@ using System; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.Alert { diff --git a/Content.Shared/Arcade/BlockGameMessages.cs b/Content.Shared/Arcade/BlockGameMessages.cs index 3110edd8dc..a1729edb96 100644 --- a/Content.Shared/Arcade/BlockGameMessages.cs +++ b/Content.Shared/Arcade/BlockGameMessages.cs @@ -1,7 +1,7 @@ #nullable enable using System; using System.Collections.Generic; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.Arcade diff --git a/Content.Shared/Atmos/AtmosCommandUtils.cs b/Content.Shared/Atmos/AtmosCommandUtils.cs index 4190efbbf7..f23a13224b 100644 --- a/Content.Shared/Atmos/AtmosCommandUtils.cs +++ b/Content.Shared/Atmos/AtmosCommandUtils.cs @@ -1,6 +1,5 @@ #nullable enable using System; -using Content.Shared.Atmos; namespace Content.Shared.Atmos { diff --git a/Content.Shared/Audio/AudioHelpers.cs b/Content.Shared/Audio/AudioHelpers.cs index d03114e6f1..a8a47fbdf5 100644 --- a/Content.Shared/Audio/AudioHelpers.cs +++ b/Content.Shared/Audio/AudioHelpers.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.Audio; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs b/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs index 6378613687..88ebf85e2f 100644 --- a/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs +++ b/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs @@ -1,5 +1,4 @@ -using Lidgren.Network; -using Robust.Shared.Interfaces.Network; +using Lidgren.Network; using Robust.Shared.Network; namespace Content.Shared.Chat diff --git a/Content.Shared/Chat/MsgChatMessage.cs b/Content.Shared/Chat/MsgChatMessage.cs index 049024ccf4..ff117d22ce 100644 --- a/Content.Shared/Chat/MsgChatMessage.cs +++ b/Content.Shared/Chat/MsgChatMessage.cs @@ -1,6 +1,5 @@ using Lidgren.Network; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; namespace Content.Shared.Chat diff --git a/Content.Shared/Chemistry/DefaultMetabolizable.cs b/Content.Shared/Chemistry/DefaultMetabolizable.cs index 0ebdc0b01f..0d33b258cb 100644 --- a/Content.Shared/Chemistry/DefaultMetabolizable.cs +++ b/Content.Shared/Chemistry/DefaultMetabolizable.cs @@ -1,6 +1,5 @@ using Content.Shared.Interfaces.Chemistry; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.Chemistry diff --git a/Content.Shared/Chemistry/ReactionPrototype.cs b/Content.Shared/Chemistry/ReactionPrototype.cs index 211627999e..fa6b8280f1 100644 --- a/Content.Shared/Chemistry/ReactionPrototype.cs +++ b/Content.Shared/Chemistry/ReactionPrototype.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using Content.Server.Interfaces.Chemistry; using Content.Shared.Interfaces; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/Chemistry/ReagentPrototype.cs b/Content.Shared/Chemistry/ReagentPrototype.cs index 2c27e6f824..2773f8df5d 100644 --- a/Content.Shared/Chemistry/ReagentPrototype.cs +++ b/Content.Shared/Chemistry/ReagentPrototype.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Content.Shared.Interfaces; using Content.Shared.Interfaces.Chemistry; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Shared/Chemistry/ReagentUnit.cs b/Content.Shared/Chemistry/ReagentUnit.cs index f19553cd6b..9cbe0db9b0 100644 --- a/Content.Shared/Chemistry/ReagentUnit.cs +++ b/Content.Shared/Chemistry/ReagentUnit.cs @@ -1,7 +1,7 @@ using System; using System.Globalization; using System.Linq; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.Serialization; namespace Content.Shared.Chemistry { diff --git a/Content.Shared/Chemistry/Solution.cs b/Content.Shared/Chemistry/Solution.cs index 86449e552d..6623adea11 100644 --- a/Content.Shared/Chemistry/Solution.cs +++ b/Content.Shared/Chemistry/Solution.cs @@ -3,10 +3,8 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; -using Robust.Shared.Analyzers; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Construction/ComponentConstructionGraphStep.cs b/Content.Shared/Construction/ComponentConstructionGraphStep.cs index 46ef6ac3f5..88192d341a 100644 --- a/Content.Shared/Construction/ComponentConstructionGraphStep.cs +++ b/Content.Shared/Construction/ComponentConstructionGraphStep.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Shared/Construction/ConstructionConditions/LowWallInTile.cs b/Content.Shared/Construction/ConstructionConditions/LowWallInTile.cs index 77af29be78..c20bb66cbd 100644 --- a/Content.Shared/Construction/ConstructionConditions/LowWallInTile.cs +++ b/Content.Shared/Construction/ConstructionConditions/LowWallInTile.cs @@ -1,9 +1,7 @@ -using System; -using Content.Shared.GameObjects.Components; +using Content.Shared.GameObjects.Components; using Content.Shared.Maps; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Shared/Construction/ConstructionConditions/NoWindowsInTile.cs b/Content.Shared/Construction/ConstructionConditions/NoWindowsInTile.cs index 1be93dd164..6a980e2c0c 100644 --- a/Content.Shared/Construction/ConstructionConditions/NoWindowsInTile.cs +++ b/Content.Shared/Construction/ConstructionConditions/NoWindowsInTile.cs @@ -1,9 +1,7 @@ -using System; -using Content.Shared.GameObjects.Components; +using Content.Shared.GameObjects.Components; using Content.Shared.Maps; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Shared/Construction/ConstructionConditions/TileNotBlocked.cs b/Content.Shared/Construction/ConstructionConditions/TileNotBlocked.cs index 666537a177..1c908be097 100644 --- a/Content.Shared/Construction/ConstructionConditions/TileNotBlocked.cs +++ b/Content.Shared/Construction/ConstructionConditions/TileNotBlocked.cs @@ -1,7 +1,6 @@ using Content.Shared.Maps; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Shared/Construction/ConstructionConditions/TileType.cs b/Content.Shared/Construction/ConstructionConditions/TileType.cs index b445c129e6..7978eceb78 100644 --- a/Content.Shared/Construction/ConstructionConditions/TileType.cs +++ b/Content.Shared/Construction/ConstructionConditions/TileType.cs @@ -1,11 +1,10 @@ using Content.Shared.Maps; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; using System.Collections.Generic; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; namespace Content.Shared.Construction.ConstructionConditions { diff --git a/Content.Shared/Construction/ConstructionConditions/WallmountCondition.cs b/Content.Shared/Construction/ConstructionConditions/WallmountCondition.cs index 22de54c69f..80afe9976c 100644 --- a/Content.Shared/Construction/ConstructionConditions/WallmountCondition.cs +++ b/Content.Shared/Construction/ConstructionConditions/WallmountCondition.cs @@ -2,14 +2,13 @@ using Content.Shared.GameObjects.Components.Tag; using Content.Shared.Physics; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; using System.Linq; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Physics; namespace Content.Shared.Construction.ConstructionConditions { diff --git a/Content.Shared/Construction/ConstructionGraphEdge.cs b/Content.Shared/Construction/ConstructionGraphEdge.cs index ea76f32109..f117f41106 100644 --- a/Content.Shared/Construction/ConstructionGraphEdge.cs +++ b/Content.Shared/Construction/ConstructionGraphEdge.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using System.IO; -using Content.Shared.GameObjects.Components.Power; using Content.Shared.Interfaces; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Shared/Construction/ConstructionGraphStep.cs b/Content.Shared/Construction/ConstructionGraphStep.cs index 273615df5f..45cd240009 100644 --- a/Content.Shared/Construction/ConstructionGraphStep.cs +++ b/Content.Shared/Construction/ConstructionGraphStep.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Content.Shared.Interfaces; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Shared/Construction/ConstructionPrototype.cs b/Content.Shared/Construction/ConstructionPrototype.cs index ec78912b3f..17d88a7f9e 100644 --- a/Content.Shared/Construction/ConstructionPrototype.cs +++ b/Content.Shared/Construction/ConstructionPrototype.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Shared/Construction/EntityInsertConstructionGraphStep.cs b/Content.Shared/Construction/EntityInsertConstructionGraphStep.cs index 19c5e3f74e..2c21efb2fc 100644 --- a/Content.Shared/Construction/EntityInsertConstructionGraphStep.cs +++ b/Content.Shared/Construction/EntityInsertConstructionGraphStep.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.Construction diff --git a/Content.Shared/Construction/IConstructionCondition.cs b/Content.Shared/Construction/IConstructionCondition.cs index d80c566444..57cde5223c 100644 --- a/Content.Shared/Construction/IConstructionCondition.cs +++ b/Content.Shared/Construction/IConstructionCondition.cs @@ -1,7 +1,7 @@ -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Serialization; namespace Content.Shared.Construction { diff --git a/Content.Shared/Construction/IEdgeCondition.cs b/Content.Shared/Construction/IEdgeCondition.cs index 4f2d9c7bef..524f409280 100644 --- a/Content.Shared/Construction/IEdgeCondition.cs +++ b/Content.Shared/Construction/IEdgeCondition.cs @@ -1,7 +1,6 @@ using System.Threading.Tasks; -using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; using Robust.Shared.Utility; namespace Content.Shared.Construction diff --git a/Content.Shared/Construction/IGraphAction.cs b/Content.Shared/Construction/IGraphAction.cs index e6a7200739..e9dad57844 100644 --- a/Content.Shared/Construction/IGraphAction.cs +++ b/Content.Shared/Construction/IGraphAction.cs @@ -1,8 +1,7 @@ #nullable enable -using System; using System.Threading.Tasks; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.Construction { diff --git a/Content.Shared/Construction/MaterialConstructionGraphStep.cs b/Content.Shared/Construction/MaterialConstructionGraphStep.cs index a41dcfecbc..9ca17db587 100644 --- a/Content.Shared/Construction/MaterialConstructionGraphStep.cs +++ b/Content.Shared/Construction/MaterialConstructionGraphStep.cs @@ -1,9 +1,7 @@ #nullable enable using System.Diagnostics.CodeAnalysis; using Content.Shared.GameObjects.Components; -using Content.Shared.GameObjects.Components.Materials; -using Content.Shared.Materials; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Shared/Construction/NestedConstructionGraphStep.cs b/Content.Shared/Construction/NestedConstructionGraphStep.cs index 1ea8b6e45f..6e077b5f8e 100644 --- a/Content.Shared/Construction/NestedConstructionGraphStep.cs +++ b/Content.Shared/Construction/NestedConstructionGraphStep.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.IO; -using Robust.Shared.Serialization; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Shared/Construction/PrototypeConstructionGraphStep.cs b/Content.Shared/Construction/PrototypeConstructionGraphStep.cs index 635549514b..a8a2236ed5 100644 --- a/Content.Shared/Construction/PrototypeConstructionGraphStep.cs +++ b/Content.Shared/Construction/PrototypeConstructionGraphStep.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Shared/Construction/ToolConstructionGraphStep.cs b/Content.Shared/Construction/ToolConstructionGraphStep.cs index 2f9d590897..1bdca19dfe 100644 --- a/Content.Shared/Construction/ToolConstructionGraphStep.cs +++ b/Content.Shared/Construction/ToolConstructionGraphStep.cs @@ -1,5 +1,4 @@ -using System; -using Content.Shared.GameObjects.Components.Interactable; +using Content.Shared.GameObjects.Components.Interactable; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Shared/Damage/DamageContainer/DamageContainerPrototype.cs b/Content.Shared/Damage/DamageContainer/DamageContainerPrototype.cs index ca4a73935c..b43f800ec9 100644 --- a/Content.Shared/Damage/DamageContainer/DamageContainerPrototype.cs +++ b/Content.Shared/Damage/DamageContainer/DamageContainerPrototype.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/Damage/DamageType.cs b/Content.Shared/Damage/DamageType.cs index a16bc2794a..930d3abd8c 100644 --- a/Content.Shared/Damage/DamageType.cs +++ b/Content.Shared/Damage/DamageType.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using Content.Shared.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Serialization; namespace Content.Shared.Damage diff --git a/Content.Shared/EntryPoint.cs b/Content.Shared/EntryPoint.cs index bbee9f5b2a..f578ace5a0 100644 --- a/Content.Shared/EntryPoint.cs +++ b/Content.Shared/EntryPoint.cs @@ -1,14 +1,14 @@ -using System; +using System; using System.Collections.Generic; using System.Globalization; using Content.Shared.Chemistry; using Content.Shared.Maps; using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Localization.Macros; using Robust.Shared.Log; +using Robust.Shared.Map; using Robust.Shared.Prototypes; namespace Content.Shared @@ -20,16 +20,17 @@ namespace Content.Shared [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private readonly ITextMacroFactory _textMacroFactory = default!; + [Dependency] private readonly IResourceManager _resourceManager = default!; public override void PreInit() { IoCManager.InjectDependencies(this); - var textMacroFactory = IoCManager.Resolve(); - textMacroFactory.DoAutoRegistrations(); + _textMacroFactory.DoAutoRegistrations(); // Default to en-US. - Loc.LoadCulture(new CultureInfo(Culture)); + Loc.LoadCulture(_resourceManager, _textMacroFactory, new CultureInfo(Culture)); } public override void Init() diff --git a/Content.Shared/GameObjects/Components/Access/SharedIdCardConsoleComponent.cs b/Content.Shared/GameObjects/Components/Access/SharedIdCardConsoleComponent.cs index fc4eb9c78c..2209321fe9 100644 --- a/Content.Shared/GameObjects/Components/Access/SharedIdCardConsoleComponent.cs +++ b/Content.Shared/GameObjects/Components/Access/SharedIdCardConsoleComponent.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Access diff --git a/Content.Shared/GameObjects/Components/ActionBlocking/SharedCuffableComponent.cs b/Content.Shared/GameObjects/Components/ActionBlocking/SharedCuffableComponent.cs index 188a3bd555..bff22ccdf6 100644 --- a/Content.Shared/GameObjects/Components/ActionBlocking/SharedCuffableComponent.cs +++ b/Content.Shared/GameObjects/Components/ActionBlocking/SharedCuffableComponent.cs @@ -1,5 +1,4 @@ using System; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Robust.Shared.GameObjects; using Robust.Shared.Maths; diff --git a/Content.Shared/GameObjects/Components/Arcade/SharedSpaceVillainArcadeComponent.cs b/Content.Shared/GameObjects/Components/Arcade/SharedSpaceVillainArcadeComponent.cs index 58abda34ba..b62f6972ed 100644 --- a/Content.Shared/GameObjects/Components/Arcade/SharedSpaceVillainArcadeComponent.cs +++ b/Content.Shared/GameObjects/Components/Arcade/SharedSpaceVillainArcadeComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Arcade diff --git a/Content.Shared/GameObjects/Components/Atmos/GasTank/GasTankBoundUserInterfaceState.cs b/Content.Shared/GameObjects/Components/Atmos/GasTank/GasTankBoundUserInterfaceState.cs index 4c5bf4b02d..c6da80bd11 100644 --- a/Content.Shared/GameObjects/Components/Atmos/GasTank/GasTankBoundUserInterfaceState.cs +++ b/Content.Shared/GameObjects/Components/Atmos/GasTank/GasTankBoundUserInterfaceState.cs @@ -1,5 +1,5 @@ using System; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Atmos.GasTank diff --git a/Content.Shared/GameObjects/Components/Atmos/GasTank/GasTankSetPressureMessage.cs b/Content.Shared/GameObjects/Components/Atmos/GasTank/GasTankSetPressureMessage.cs index 4fbf2bfc84..bf3a786e8c 100644 --- a/Content.Shared/GameObjects/Components/Atmos/GasTank/GasTankSetPressureMessage.cs +++ b/Content.Shared/GameObjects/Components/Atmos/GasTank/GasTankSetPressureMessage.cs @@ -1,5 +1,5 @@ using System; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Atmos.GasTank diff --git a/Content.Shared/GameObjects/Components/Atmos/GasTank/GasTankToggleInternalsMessage.cs b/Content.Shared/GameObjects/Components/Atmos/GasTank/GasTankToggleInternalsMessage.cs index d009450482..f65e47dfbb 100644 --- a/Content.Shared/GameObjects/Components/Atmos/GasTank/GasTankToggleInternalsMessage.cs +++ b/Content.Shared/GameObjects/Components/Atmos/GasTank/GasTankToggleInternalsMessage.cs @@ -1,5 +1,5 @@ using System; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Atmos.GasTank diff --git a/Content.Shared/GameObjects/Components/Atmos/SharedGasCanisterComponent.cs b/Content.Shared/GameObjects/Components/Atmos/SharedGasCanisterComponent.cs index 4d1f0ea6b0..679b6542d9 100644 --- a/Content.Shared/GameObjects/Components/Atmos/SharedGasCanisterComponent.cs +++ b/Content.Shared/GameObjects/Components/Atmos/SharedGasCanisterComponent.cs @@ -1,9 +1,7 @@ #nullable enable annotations using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; namespace Content.Shared.GameObjects.Components.Atmos { diff --git a/Content.Shared/GameObjects/Components/Body/Behavior/IMechanismBehavior.cs b/Content.Shared/GameObjects/Components/Body/Behavior/IMechanismBehavior.cs index 95f6bc689a..e5fb6f3c9f 100644 --- a/Content.Shared/GameObjects/Components/Body/Behavior/IMechanismBehavior.cs +++ b/Content.Shared/GameObjects/Components/Body/Behavior/IMechanismBehavior.cs @@ -1,8 +1,8 @@ #nullable enable using Content.Shared.GameObjects.Components.Body.Mechanism; using Content.Shared.GameObjects.Components.Body.Part; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Body.Behavior { diff --git a/Content.Shared/GameObjects/Components/Body/IBody.cs b/Content.Shared/GameObjects/Components/Body/IBody.cs index 152deb3bb0..b73bc01766 100644 --- a/Content.Shared/GameObjects/Components/Body/IBody.cs +++ b/Content.Shared/GameObjects/Components/Body/IBody.cs @@ -6,7 +6,7 @@ using Content.Shared.GameObjects.Components.Body.Part; using Content.Shared.GameObjects.Components.Body.Part.Property; using Content.Shared.GameObjects.Components.Body.Preset; using Content.Shared.GameObjects.Components.Body.Template; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Body { diff --git a/Content.Shared/GameObjects/Components/Body/Mechanism/IMechanism.cs b/Content.Shared/GameObjects/Components/Body/Mechanism/IMechanism.cs index aabe7dd3e7..2496c9ae18 100644 --- a/Content.Shared/GameObjects/Components/Body/Mechanism/IMechanism.cs +++ b/Content.Shared/GameObjects/Components/Body/Mechanism/IMechanism.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using Content.Shared.GameObjects.Components.Body.Behavior; using Content.Shared.GameObjects.Components.Body.Part; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Body.Mechanism { diff --git a/Content.Shared/GameObjects/Components/Body/Mechanism/SharedMechanismComponent.cs b/Content.Shared/GameObjects/Components/Body/Mechanism/SharedMechanismComponent.cs index f72b2b039f..bdcce7326d 100644 --- a/Content.Shared/GameObjects/Components/Body/Mechanism/SharedMechanismComponent.cs +++ b/Content.Shared/GameObjects/Components/Body/Mechanism/SharedMechanismComponent.cs @@ -6,7 +6,6 @@ using Content.Shared.GameObjects.Components.Body.Behavior; using Content.Shared.GameObjects.Components.Body.Part; using Content.Shared.Interfaces; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Body/Part/IBodyPart.cs b/Content.Shared/GameObjects/Components/Body/Part/IBodyPart.cs index ba8ed2d192..69bfbbc338 100644 --- a/Content.Shared/GameObjects/Components/Body/Part/IBodyPart.cs +++ b/Content.Shared/GameObjects/Components/Body/Part/IBodyPart.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Content.Shared.GameObjects.Components.Body.Mechanism; using Content.Shared.GameObjects.Components.Body.Surgery; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.Shared.GameObjects.Components.Body.Part diff --git a/Content.Shared/GameObjects/Components/Body/Part/IBodyPartAdded.cs b/Content.Shared/GameObjects/Components/Body/Part/IBodyPartAdded.cs index 2e1fad8a4f..0ca26a9a14 100644 --- a/Content.Shared/GameObjects/Components/Body/Part/IBodyPartAdded.cs +++ b/Content.Shared/GameObjects/Components/Body/Part/IBodyPartAdded.cs @@ -1,5 +1,5 @@ using System; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Body.Part { diff --git a/Content.Shared/GameObjects/Components/Body/Part/Property/IBodyPartProperty.cs b/Content.Shared/GameObjects/Components/Body/Part/Property/IBodyPartProperty.cs index 39f8e003fc..d8683f2e58 100644 --- a/Content.Shared/GameObjects/Components/Body/Part/Property/IBodyPartProperty.cs +++ b/Content.Shared/GameObjects/Components/Body/Part/Property/IBodyPartProperty.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Body.Part.Property { diff --git a/Content.Shared/GameObjects/Components/Body/Part/SharedBodyPartComponent.cs b/Content.Shared/GameObjects/Components/Body/Part/SharedBodyPartComponent.cs index ffbd3a0c70..2e24c734e3 100644 --- a/Content.Shared/GameObjects/Components/Body/Part/SharedBodyPartComponent.cs +++ b/Content.Shared/GameObjects/Components/Body/Part/SharedBodyPartComponent.cs @@ -4,9 +4,7 @@ using System.Collections.Generic; using System.Linq; using Content.Shared.GameObjects.Components.Body.Mechanism; using Content.Shared.GameObjects.Components.Body.Surgery; -using Content.Shared.Utility; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Body/Scanner/SharedBodyScannerComponent.cs b/Content.Shared/GameObjects/Components/Body/Scanner/SharedBodyScannerComponent.cs index cf821ab5ff..b1d0e19ebc 100644 --- a/Content.Shared/GameObjects/Components/Body/Scanner/SharedBodyScannerComponent.cs +++ b/Content.Shared/GameObjects/Components/Body/Scanner/SharedBodyScannerComponent.cs @@ -1,7 +1,6 @@ #nullable enable using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Body.Scanner diff --git a/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs b/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs index 0c18eaa0df..6dca869d52 100644 --- a/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs +++ b/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs @@ -1,7 +1,6 @@ #nullable enable using System; using System.Collections.Generic; -using System.ComponentModel; using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Shared.Damage; @@ -12,12 +11,7 @@ using Content.Shared.GameObjects.Components.Body.Template; using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.EntitySystems; -using Content.Shared.Utility; -using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Containers; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Body/Surgery/ISurgeon.cs b/Content.Shared/GameObjects/Components/Body/Surgery/ISurgeon.cs index bc741306de..b329b52c2e 100644 --- a/Content.Shared/GameObjects/Components/Body/Surgery/ISurgeon.cs +++ b/Content.Shared/GameObjects/Components/Body/Surgery/ISurgeon.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Content.Shared.GameObjects.Components.Body.Mechanism; using Content.Shared.GameObjects.Components.Body.Part; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Body.Surgery { diff --git a/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryDataComponent.cs b/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryDataComponent.cs index 4ebdab29a7..9bd4c34a57 100644 --- a/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryDataComponent.cs +++ b/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryDataComponent.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Shared.GameObjects.Components.Body.Mechanism; using Content.Shared.GameObjects.Components.Body.Part; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Body.Surgery { diff --git a/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryUIMessages.cs b/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryUIMessages.cs index 5c9117f3f8..ad18fcbbaa 100644 --- a/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryUIMessages.cs +++ b/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryUIMessages.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Body.Surgery diff --git a/Content.Shared/GameObjects/Components/Buckle/SharedBuckleComponent.cs b/Content.Shared/GameObjects/Components/Buckle/SharedBuckleComponent.cs index e24eea61e5..7cd82a0642 100644 --- a/Content.Shared/GameObjects/Components/Buckle/SharedBuckleComponent.cs +++ b/Content.Shared/GameObjects/Components/Buckle/SharedBuckleComponent.cs @@ -6,9 +6,6 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.GameObjects.EntitySystems.EffectBlocker; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Physics; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/GameObjects/Components/Cargo/SharedCargoConsoleComponent.cs b/Content.Shared/GameObjects/Components/Cargo/SharedCargoConsoleComponent.cs index b8d3088e64..3112c9ee54 100644 --- a/Content.Shared/GameObjects/Components/Cargo/SharedCargoConsoleComponent.cs +++ b/Content.Shared/GameObjects/Components/Cargo/SharedCargoConsoleComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Chemistry/ChemMaster/SharedChemMasterComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/ChemMaster/SharedChemMasterComponent.cs index 11c6437475..0a1da4090a 100644 --- a/Content.Shared/GameObjects/Components/Chemistry/ChemMaster/SharedChemMasterComponent.cs +++ b/Content.Shared/GameObjects/Components/Chemistry/ChemMaster/SharedChemMasterComponent.cs @@ -2,10 +2,8 @@ using System; using System.Collections.Generic; using Content.Shared.Chemistry; -using Content.Shared.GameObjects.Components.Medical; using Content.Shared.GameObjects.Components.Observer; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Chemistry.ChemMaster diff --git a/Content.Shared/GameObjects/Components/Chemistry/ISolutionInteractionsComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/ISolutionInteractionsComponent.cs index c88c46234d..d74afbc84f 100644 --- a/Content.Shared/GameObjects/Components/Chemistry/ISolutionInteractionsComponent.cs +++ b/Content.Shared/GameObjects/Components/Chemistry/ISolutionInteractionsComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Chemistry; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Chemistry { diff --git a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs index c36e8498ff..65c576402a 100644 --- a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs +++ b/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using Content.Shared.Chemistry; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser diff --git a/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs index 0a7d1fe7d2..9f17b97ae2 100644 --- a/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs +++ b/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs @@ -2,8 +2,6 @@ using Content.Shared.Chemistry; using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Appearance; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; diff --git a/Content.Shared/GameObjects/Components/Command/SharedCommunicationsConsoleComponent.cs b/Content.Shared/GameObjects/Components/Command/SharedCommunicationsConsoleComponent.cs index 88fb0168fc..61f9f741e8 100644 --- a/Content.Shared/GameObjects/Components/Command/SharedCommunicationsConsoleComponent.cs +++ b/Content.Shared/GameObjects/Components/Command/SharedCommunicationsConsoleComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Command diff --git a/Content.Shared/GameObjects/Components/Context/HideContextMenuComponent.cs b/Content.Shared/GameObjects/Components/Context/HideContextMenuComponent.cs index dcd7387600..e8650c0466 100644 --- a/Content.Shared/GameObjects/Components/Context/HideContextMenuComponent.cs +++ b/Content.Shared/GameObjects/Components/Context/HideContextMenuComponent.cs @@ -1,6 +1,5 @@ using Content.Shared.GameObjects.Verbs; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.GameObjects.Components.Context { diff --git a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs index 1c202f606b..157c11e29e 100644 --- a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs +++ b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs @@ -8,7 +8,6 @@ using Content.Shared.Damage.ResistanceSet; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Damage/IDamageableComponent.cs b/Content.Shared/GameObjects/Components/Damage/IDamageableComponent.cs index 18f798542d..2bd516d399 100644 --- a/Content.Shared/GameObjects/Components/Damage/IDamageableComponent.cs +++ b/Content.Shared/GameObjects/Components/Damage/IDamageableComponent.cs @@ -1,9 +1,8 @@ #nullable enable -using System; using System.Collections.Generic; using Content.Shared.Damage; using Content.Shared.GameObjects.EntitySystems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Damage { diff --git a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalMailingUnitComponent.cs b/Content.Shared/GameObjects/Components/Disposal/SharedDisposalMailingUnitComponent.cs index da67e8d4d5..e44a59d9d0 100644 --- a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalMailingUnitComponent.cs +++ b/Content.Shared/GameObjects/Components/Disposal/SharedDisposalMailingUnitComponent.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalRouterComponent.cs b/Content.Shared/GameObjects/Components/Disposal/SharedDisposalRouterComponent.cs index 273a71ae5a..c4b38af48d 100644 --- a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalRouterComponent.cs +++ b/Content.Shared/GameObjects/Components/Disposal/SharedDisposalRouterComponent.cs @@ -1,7 +1,6 @@ using System; using System.Text.RegularExpressions; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Disposal diff --git a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalTaggerComponent.cs b/Content.Shared/GameObjects/Components/Disposal/SharedDisposalTaggerComponent.cs index 48b035c1f7..3981ebab86 100644 --- a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalTaggerComponent.cs +++ b/Content.Shared/GameObjects/Components/Disposal/SharedDisposalTaggerComponent.cs @@ -2,7 +2,6 @@ using System; using System.Text.RegularExpressions; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Disposal diff --git a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalUnitComponent.cs b/Content.Shared/GameObjects/Components/Disposal/SharedDisposalUnitComponent.cs index af7a801728..e4899fe1b0 100644 --- a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalUnitComponent.cs +++ b/Content.Shared/GameObjects/Components/Disposal/SharedDisposalUnitComponent.cs @@ -2,15 +2,10 @@ using System; using System.Collections.Generic; using Content.Shared.GameObjects.Components.Body; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs.State; using Content.Shared.GameObjects.Components.Storage; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Physics; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/GameObjects/Components/Explosion/SharedClusterFlashComponent.cs b/Content.Shared/GameObjects/Components/Explosion/SharedClusterFlashComponent.cs index f7822392dd..248c2122d9 100644 --- a/Content.Shared/GameObjects/Components/Explosion/SharedClusterFlashComponent.cs +++ b/Content.Shared/GameObjects/Components/Explosion/SharedClusterFlashComponent.cs @@ -1,6 +1,4 @@ using System; -using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Explosion diff --git a/Content.Shared/GameObjects/Components/GUI/SharedStrippableComponent.cs b/Content.Shared/GameObjects/Components/GUI/SharedStrippableComponent.cs index 77f41e77a4..6e56e3fe31 100644 --- a/Content.Shared/GameObjects/Components/GUI/SharedStrippableComponent.cs +++ b/Content.Shared/GameObjects/Components/GUI/SharedStrippableComponent.cs @@ -1,12 +1,9 @@ using System; using System.Collections.Generic; using Content.Shared.GameObjects.Components.Items; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.Shared/GameObjects/Components/Gravity/SharedGravityGeneratorComponent.cs b/Content.Shared/GameObjects/Components/Gravity/SharedGravityGeneratorComponent.cs index de81cc0053..7163cb07df 100644 --- a/Content.Shared/GameObjects/Components/Gravity/SharedGravityGeneratorComponent.cs +++ b/Content.Shared/GameObjects/Components/Gravity/SharedGravityGeneratorComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Gravity diff --git a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs b/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs index b7561b4f89..790176cff7 100644 --- a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs +++ b/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Content.Shared.GameObjects.Components.Items; using JetBrains.Annotations; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs b/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs index 90dcf2d808..a3fcf59b00 100644 --- a/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs +++ b/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using Content.Shared.GameObjects.Components.Movement; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/GameObjects/Components/Items/IItemComponent.cs b/Content.Shared/GameObjects/Components/Items/IItemComponent.cs index e39d45541c..5272e6b40e 100644 --- a/Content.Shared/GameObjects/Components/Items/IItemComponent.cs +++ b/Content.Shared/GameObjects/Components/Items/IItemComponent.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Items { diff --git a/Content.Shared/GameObjects/Components/Items/ISharedHandsComponent.cs b/Content.Shared/GameObjects/Components/Items/ISharedHandsComponent.cs index d13c57f7ca..5af31899dd 100644 --- a/Content.Shared/GameObjects/Components/Items/ISharedHandsComponent.cs +++ b/Content.Shared/GameObjects/Components/Items/ISharedHandsComponent.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Items { diff --git a/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs b/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs index e3fba91eb5..649a062e91 100644 --- a/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs +++ b/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs @@ -1,7 +1,6 @@ #nullable enable using System; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Materials/MaterialComponent.cs b/Content.Shared/GameObjects/Components/Materials/MaterialComponent.cs index ab44311f6b..f1a26b9b09 100644 --- a/Content.Shared/GameObjects/Components/Materials/MaterialComponent.cs +++ b/Content.Shared/GameObjects/Components/Materials/MaterialComponent.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; using Content.Shared.Materials; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Prototypes; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Shared/GameObjects/Components/Medical/SharedCloningPodComponent.cs b/Content.Shared/GameObjects/Components/Medical/SharedCloningPodComponent.cs index 6c0ed3f87e..d2f24a79cd 100644 --- a/Content.Shared/GameObjects/Components/Medical/SharedCloningPodComponent.cs +++ b/Content.Shared/GameObjects/Components/Medical/SharedCloningPodComponent.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Medical diff --git a/Content.Shared/GameObjects/Components/Medical/SharedMedicalScannerComponent.cs b/Content.Shared/GameObjects/Components/Medical/SharedMedicalScannerComponent.cs index 77f96cda59..7147740d52 100644 --- a/Content.Shared/GameObjects/Components/Medical/SharedMedicalScannerComponent.cs +++ b/Content.Shared/GameObjects/Components/Medical/SharedMedicalScannerComponent.cs @@ -4,7 +4,6 @@ using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Body; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Medical diff --git a/Content.Shared/GameObjects/Components/Mobs/DamageStateVisuals.cs b/Content.Shared/GameObjects/Components/Mobs/DamageStateVisuals.cs index c23adb4987..d48467bb65 100644 --- a/Content.Shared/GameObjects/Components/Mobs/DamageStateVisuals.cs +++ b/Content.Shared/GameObjects/Components/Mobs/DamageStateVisuals.cs @@ -1,5 +1,5 @@ using System; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Mobs diff --git a/Content.Shared/GameObjects/Components/Mobs/IActionAttempt.cs b/Content.Shared/GameObjects/Components/Mobs/IActionAttempt.cs index 3dd493804c..1f4fd820f5 100644 --- a/Content.Shared/GameObjects/Components/Mobs/IActionAttempt.cs +++ b/Content.Shared/GameObjects/Components/Mobs/IActionAttempt.cs @@ -3,7 +3,6 @@ using Content.Shared.Actions; using Robust.Shared.GameObjects; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; namespace Content.Shared.GameObjects.Components.Mobs diff --git a/Content.Shared/GameObjects/Components/Mobs/ItemActionsComponent.cs b/Content.Shared/GameObjects/Components/Mobs/ItemActionsComponent.cs index 719c410cc4..4e46912404 100644 --- a/Content.Shared/GameObjects/Components/Mobs/ItemActionsComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/ItemActionsComponent.cs @@ -6,8 +6,6 @@ using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.Components.Items; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Log; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedActionsComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedActionsComponent.cs index 9fe5df8bf8..aa12668bd0 100644 --- a/Content.Shared/GameObjects/Components/Mobs/SharedActionsComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/SharedActionsComponent.cs @@ -5,11 +5,10 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Shared.Actions; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; namespace Content.Shared.GameObjects.Components.Mobs diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedStunnableComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedStunnableComponent.cs index c4e6395042..034ee2387d 100644 --- a/Content.Shared/GameObjects/Components/Mobs/SharedStunnableComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/SharedStunnableComponent.cs @@ -2,16 +2,13 @@ using System; using System.Threading; using Content.Shared.Alert; using Content.Shared.GameObjects.Components.Movement; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Timers; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Serialization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; -using Timer = Robust.Shared.Timers.Timer; namespace Content.Shared.GameObjects.Components.Mobs { diff --git a/Content.Shared/GameObjects/Components/Mobs/State/BaseMobState.cs b/Content.Shared/GameObjects/Components/Mobs/State/BaseMobState.cs index 02d3cbd586..e7e37684b5 100644 --- a/Content.Shared/GameObjects/Components/Mobs/State/BaseMobState.cs +++ b/Content.Shared/GameObjects/Components/Mobs/State/BaseMobState.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Mobs.State diff --git a/Content.Shared/GameObjects/Components/Mobs/State/IMobState.cs b/Content.Shared/GameObjects/Components/Mobs/State/IMobState.cs index 1cacbe57ab..3e29555dd4 100644 --- a/Content.Shared/GameObjects/Components/Mobs/State/IMobState.cs +++ b/Content.Shared/GameObjects/Components/Mobs/State/IMobState.cs @@ -1,7 +1,6 @@ -using Content.Shared.GameObjects.EntitySystems; -using Content.Shared.GameObjects.EntitySystems.ActionBlocker; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Content.Shared.GameObjects.EntitySystems.ActionBlocker; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Mobs.State { diff --git a/Content.Shared/GameObjects/Components/Mobs/State/IMobStateComponent.cs b/Content.Shared/GameObjects/Components/Mobs/State/IMobStateComponent.cs index 9f39fa4f78..7e9bf10e00 100644 --- a/Content.Shared/GameObjects/Components/Mobs/State/IMobStateComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/State/IMobStateComponent.cs @@ -1,6 +1,6 @@ #nullable enable using System.Diagnostics.CodeAnalysis; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Mobs.State { diff --git a/Content.Shared/GameObjects/Components/Mobs/State/MobStateChangedMessage.cs b/Content.Shared/GameObjects/Components/Mobs/State/MobStateChangedMessage.cs index 660056d7c6..2a7afe6f88 100644 --- a/Content.Shared/GameObjects/Components/Mobs/State/MobStateChangedMessage.cs +++ b/Content.Shared/GameObjects/Components/Mobs/State/MobStateChangedMessage.cs @@ -1,6 +1,5 @@ #nullable enable using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.GameObjects.Components.Mobs.State { diff --git a/Content.Shared/GameObjects/Components/Mobs/State/SharedCriticalMobState.cs b/Content.Shared/GameObjects/Components/Mobs/State/SharedCriticalMobState.cs index 87e5d5b1a4..9382465af6 100644 --- a/Content.Shared/GameObjects/Components/Mobs/State/SharedCriticalMobState.cs +++ b/Content.Shared/GameObjects/Components/Mobs/State/SharedCriticalMobState.cs @@ -1,7 +1,6 @@ using Content.Shared.Alert; using Content.Shared.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Mobs.State { diff --git a/Content.Shared/GameObjects/Components/Mobs/State/SharedMobStateComponent.cs b/Content.Shared/GameObjects/Components/Mobs/State/SharedMobStateComponent.cs index 4bcda6ac00..ff8658db3e 100644 --- a/Content.Shared/GameObjects/Components/Mobs/State/SharedMobStateComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/State/SharedMobStateComponent.cs @@ -5,10 +5,8 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Shared.Alert; using Content.Shared.GameObjects.Components.Damage; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/GameObjects/Components/Movement/IMoverComponent.cs b/Content.Shared/GameObjects/Components/Movement/IMoverComponent.cs index bafe58dd82..8b87033b58 100644 --- a/Content.Shared/GameObjects/Components/Movement/IMoverComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/IMoverComponent.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Shared/GameObjects/Components/Movement/MovementIgnoreGravityComponent.cs b/Content.Shared/GameObjects/Components/Movement/MovementIgnoreGravityComponent.cs index c69a2d8bf3..75a4b2b1a4 100644 --- a/Content.Shared/GameObjects/Components/Movement/MovementIgnoreGravityComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/MovementIgnoreGravityComponent.cs @@ -1,8 +1,7 @@ #nullable enable using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.IoC; +using Robust.Shared.Physics; namespace Content.Shared.GameObjects.Components.Movement { diff --git a/Content.Shared/GameObjects/Components/Movement/MovementSpeedModifierComponent.cs b/Content.Shared/GameObjects/Components/Movement/MovementSpeedModifierComponent.cs index a978f31769..663bfb5b62 100644 --- a/Content.Shared/GameObjects/Components/Movement/MovementSpeedModifierComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/MovementSpeedModifierComponent.cs @@ -1,6 +1,5 @@ using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/GameObjects/Components/Movement/SharedClimbingComponent.cs b/Content.Shared/GameObjects/Components/Movement/SharedClimbingComponent.cs index db39b8d368..c1c0c5a17f 100644 --- a/Content.Shared/GameObjects/Components/Movement/SharedClimbingComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/SharedClimbingComponent.cs @@ -1,9 +1,7 @@ using System; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Physics; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; using Robust.Shared.Physics; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs b/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs index a1d2d659e8..b56fa9ad8c 100644 --- a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs @@ -1,10 +1,8 @@ #nullable enable using System; using Content.Shared.GameObjects.Components.Body; +using Robust.Shared.Configuration; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; diff --git a/Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs b/Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs index de3b2bdd8f..6614e22770 100644 --- a/Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs @@ -2,14 +2,10 @@ using System.Collections.Generic; using System.Linq; using Content.Shared.GameObjects.Components.Mobs; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.EffectBlocker; using Content.Shared.Physics; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/GameObjects/Components/Observer/SharedGhostComponent.cs b/Content.Shared/GameObjects/Components/Observer/SharedGhostComponent.cs index 3eebfdc8ae..41cd9972f4 100644 --- a/Content.Shared/GameObjects/Components/Observer/SharedGhostComponent.cs +++ b/Content.Shared/GameObjects/Components/Observer/SharedGhostComponent.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs b/Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs index d7dbdbea3c..8d56744e13 100644 --- a/Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs +++ b/Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/GameObjects/Components/Portal/SharedPortalComponent.cs b/Content.Shared/GameObjects/Components/Portal/SharedPortalComponent.cs index 320e682ded..9324abe693 100644 --- a/Content.Shared/GameObjects/Components/Portal/SharedPortalComponent.cs +++ b/Content.Shared/GameObjects/Components/Portal/SharedPortalComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Portal diff --git a/Content.Shared/GameObjects/Components/Power/AME/SharedAMEControllerComponent.cs b/Content.Shared/GameObjects/Components/Power/AME/SharedAMEControllerComponent.cs index d7233231f4..1a4140f62d 100644 --- a/Content.Shared/GameObjects/Components/Power/AME/SharedAMEControllerComponent.cs +++ b/Content.Shared/GameObjects/Components/Power/AME/SharedAMEControllerComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Power.AME diff --git a/Content.Shared/GameObjects/Components/Power/SharedApc.cs b/Content.Shared/GameObjects/Components/Power/SharedApc.cs index 0169ca2d72..de4b2af2b8 100644 --- a/Content.Shared/GameObjects/Components/Power/SharedApc.cs +++ b/Content.Shared/GameObjects/Components/Power/SharedApc.cs @@ -1,5 +1,5 @@ using System; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Power diff --git a/Content.Shared/GameObjects/Components/Power/SharedSolarControlConsoleComponent.cs b/Content.Shared/GameObjects/Components/Power/SharedSolarControlConsoleComponent.cs index 54ce97e831..c21dea2e56 100644 --- a/Content.Shared/GameObjects/Components/Power/SharedSolarControlConsoleComponent.cs +++ b/Content.Shared/GameObjects/Components/Power/SharedSolarControlConsoleComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Projectiles/SharedProjectileComponent.cs b/Content.Shared/GameObjects/Components/Projectiles/SharedProjectileComponent.cs index dbebf69605..78746e0f8e 100644 --- a/Content.Shared/GameObjects/Components/Projectiles/SharedProjectileComponent.cs +++ b/Content.Shared/GameObjects/Components/Projectiles/SharedProjectileComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; using Robust.Shared.Physics; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs b/Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs index 49111b3fc6..386c50baef 100644 --- a/Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs +++ b/Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs @@ -7,10 +7,6 @@ using Content.Shared.Physics; using Content.Shared.Physics.Pull; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.ComponentDependencies; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Physics; diff --git a/Content.Shared/GameObjects/Components/Pulling/SharedPullerComponent.cs b/Content.Shared/GameObjects/Components/Pulling/SharedPullerComponent.cs index ae4719fe9c..3be78d4400 100644 --- a/Content.Shared/GameObjects/Components/Pulling/SharedPullerComponent.cs +++ b/Content.Shared/GameObjects/Components/Pulling/SharedPullerComponent.cs @@ -5,10 +5,7 @@ using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Physics.Pull; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Component = Robust.Shared.GameObjects.Component; -using Robust.Shared.Log; namespace Content.Shared.GameObjects.Components.Pulling { diff --git a/Content.Shared/GameObjects/Components/Research/SharedLatheComponent.cs b/Content.Shared/GameObjects/Components/Research/SharedLatheComponent.cs index 79ae8e0d61..91f0fa8959 100644 --- a/Content.Shared/GameObjects/Components/Research/SharedLatheComponent.cs +++ b/Content.Shared/GameObjects/Components/Research/SharedLatheComponent.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using Content.Shared.Research; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Research/SharedResearchClientComponent.cs b/Content.Shared/GameObjects/Components/Research/SharedResearchClientComponent.cs index 7551b7ddd4..592eaa1ac7 100644 --- a/Content.Shared/GameObjects/Components/Research/SharedResearchClientComponent.cs +++ b/Content.Shared/GameObjects/Components/Research/SharedResearchClientComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Research diff --git a/Content.Shared/GameObjects/Components/Research/SharedResearchConsoleComponent.cs b/Content.Shared/GameObjects/Components/Research/SharedResearchConsoleComponent.cs index 433f145198..36aa36fad5 100644 --- a/Content.Shared/GameObjects/Components/Research/SharedResearchConsoleComponent.cs +++ b/Content.Shared/GameObjects/Components/Research/SharedResearchConsoleComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Research diff --git a/Content.Shared/GameObjects/Components/SharedConfigurationComponent.cs b/Content.Shared/GameObjects/Components/SharedConfigurationComponent.cs index 590f770b62..b88dc252ca 100644 --- a/Content.Shared/GameObjects/Components/SharedConfigurationComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedConfigurationComponent.cs @@ -1,5 +1,4 @@ using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; using System; using System.Collections.Generic; diff --git a/Content.Shared/GameObjects/Components/SharedCrayonComponent.cs b/Content.Shared/GameObjects/Components/SharedCrayonComponent.cs index 25ddb384e6..d7286dc701 100644 --- a/Content.Shared/GameObjects/Components/SharedCrayonComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedCrayonComponent.cs @@ -1,5 +1,4 @@ using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Maths; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/SharedGasAnalyzerComponent.cs b/Content.Shared/GameObjects/Components/SharedGasAnalyzerComponent.cs index 641ab79ac8..45be6173c2 100644 --- a/Content.Shared/GameObjects/Components/SharedGasAnalyzerComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedGasAnalyzerComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Localization; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/SharedMagicMirrorComponent.cs b/Content.Shared/GameObjects/Components/SharedMagicMirrorComponent.cs index 67174b5e65..54f50c44fa 100644 --- a/Content.Shared/GameObjects/Components/SharedMagicMirrorComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedMagicMirrorComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/SharedPaperComponent.cs b/Content.Shared/GameObjects/Components/SharedPaperComponent.cs index ea8ab84577..f3baf5c57b 100644 --- a/Content.Shared/GameObjects/Components/SharedPaperComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedPaperComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components diff --git a/Content.Shared/GameObjects/Components/SharedStackComponent.cs b/Content.Shared/GameObjects/Components/SharedStackComponent.cs index 8f99d94742..4eda42eb7d 100644 --- a/Content.Shared/GameObjects/Components/SharedStackComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedStackComponent.cs @@ -1,8 +1,7 @@ using System; -using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; +using Robust.Shared.Reflection; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/GameObjects/Components/SharedVaporComponent.cs b/Content.Shared/GameObjects/Components/SharedVaporComponent.cs index a3826e6894..682eaef39c 100644 --- a/Content.Shared/GameObjects/Components/SharedVaporComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedVaporComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components diff --git a/Content.Shared/GameObjects/Components/SharedWiresComponent.cs b/Content.Shared/GameObjects/Components/SharedWiresComponent.cs index 9275b79a50..db319fd9d1 100644 --- a/Content.Shared/GameObjects/Components/SharedWiresComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedWiresComponent.cs @@ -2,7 +2,6 @@ using System; using System.Diagnostics.CodeAnalysis; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Singularity/SharedParticleAcceleratorComponent.cs b/Content.Shared/GameObjects/Components/Singularity/SharedParticleAcceleratorComponent.cs index bdf5919356..e39082c3c1 100644 --- a/Content.Shared/GameObjects/Components/Singularity/SharedParticleAcceleratorComponent.cs +++ b/Content.Shared/GameObjects/Components/Singularity/SharedParticleAcceleratorComponent.cs @@ -1,5 +1,5 @@ using System; -using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components diff --git a/Content.Shared/GameObjects/Components/Sound/SharedLoopingSoundComponent.cs b/Content.Shared/GameObjects/Components/Sound/SharedLoopingSoundComponent.cs index 01d5a35f00..63c1b9d907 100644 --- a/Content.Shared/GameObjects/Components/Sound/SharedLoopingSoundComponent.cs +++ b/Content.Shared/GameObjects/Components/Sound/SharedLoopingSoundComponent.cs @@ -1,7 +1,6 @@ using System; using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Sound diff --git a/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs b/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs index cd353412b4..6786b0a0a6 100644 --- a/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs +++ b/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs @@ -2,12 +2,9 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Numerics; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Strap/SharedStrapComponent.cs b/Content.Shared/GameObjects/Components/Strap/SharedStrapComponent.cs index f06ce2ef32..58872c82e5 100644 --- a/Content.Shared/GameObjects/Components/Strap/SharedStrapComponent.cs +++ b/Content.Shared/GameObjects/Components/Strap/SharedStrapComponent.cs @@ -1,10 +1,8 @@ using System; using Content.Shared.GameObjects.Components.Buckle; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Strap diff --git a/Content.Shared/GameObjects/Components/Suspicion/SharedSuspicionRoleComponent.cs b/Content.Shared/GameObjects/Components/Suspicion/SharedSuspicionRoleComponent.cs index 7bee76b3e2..9796cdde9d 100644 --- a/Content.Shared/GameObjects/Components/Suspicion/SharedSuspicionRoleComponent.cs +++ b/Content.Shared/GameObjects/Components/Suspicion/SharedSuspicionRoleComponent.cs @@ -1,7 +1,5 @@ #nullable enable using System; -using System.Collections.Generic; -using System.Linq; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Tag/TagComponentExtensions.cs b/Content.Shared/GameObjects/Components/Tag/TagComponentExtensions.cs index 9fbbb4fa45..b93a7a767f 100644 --- a/Content.Shared/GameObjects/Components/Tag/TagComponentExtensions.cs +++ b/Content.Shared/GameObjects/Components/Tag/TagComponentExtensions.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using Content.Shared.Prototypes.Tag; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Prototypes; namespace Content.Shared.GameObjects.Components.Tag diff --git a/Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs b/Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs index e80da037cf..49f33ae9e8 100644 --- a/Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs +++ b/Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/GameObjects/EntitySystems/ActSystem.cs b/Content.Shared/GameObjects/EntitySystems/ActSystem.cs index d3512bbda5..3489b7883a 100644 --- a/Content.Shared/GameObjects/EntitySystems/ActSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/ActSystem.cs @@ -1,8 +1,7 @@ using System; using System.Linq; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.Shared.GameObjects.EntitySystems diff --git a/Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerExtensions.cs b/Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerExtensions.cs index c8052699d2..c631d5395f 100644 --- a/Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerExtensions.cs +++ b/Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerExtensions.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker { diff --git a/Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerSystem.cs index b2adcf73e1..ac739e2984 100644 --- a/Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerSystem.cs @@ -1,8 +1,7 @@ using Content.Shared.GameObjects.Components.Mobs.Speech; using Content.Shared.GameObjects.EntitySystems.EffectBlocker; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker { diff --git a/Content.Shared/GameObjects/EntitySystems/Atmos/SharedAtmosDebugOverlaySystem.cs b/Content.Shared/GameObjects/EntitySystems/Atmos/SharedAtmosDebugOverlaySystem.cs index f65dffc54b..1d340b5c46 100644 --- a/Content.Shared/GameObjects/EntitySystems/Atmos/SharedAtmosDebugOverlaySystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/Atmos/SharedAtmosDebugOverlaySystem.cs @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Map; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using Content.Shared.Atmos; using Robust.Shared.Maths; diff --git a/Content.Shared/GameObjects/EntitySystems/Atmos/SharedAtmosphereSystem.cs b/Content.Shared/GameObjects/EntitySystems/Atmos/SharedAtmosphereSystem.cs index 2739e006e7..0841811a2e 100644 --- a/Content.Shared/GameObjects/EntitySystems/Atmos/SharedAtmosphereSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/Atmos/SharedAtmosphereSystem.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Content.Shared.Atmos; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Utility; diff --git a/Content.Shared/GameObjects/EntitySystems/Atmos/SharedGasTileOverlaySystem.cs b/Content.Shared/GameObjects/EntitySystems/Atmos/SharedGasTileOverlaySystem.cs index 577ce979e5..f99f869c69 100644 --- a/Content.Shared/GameObjects/EntitySystems/Atmos/SharedGasTileOverlaySystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/Atmos/SharedGasTileOverlaySystem.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; -using Robust.Shared.Utility; namespace Content.Shared.GameObjects.EntitySystems.Atmos { diff --git a/Content.Shared/GameObjects/EntitySystems/ChemistrySystem.cs b/Content.Shared/GameObjects/EntitySystems/ChemistrySystem.cs index e6e531eb1a..513e09d1de 100644 --- a/Content.Shared/GameObjects/EntitySystems/ChemistrySystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/ChemistrySystem.cs @@ -1,8 +1,7 @@ using System; using System.Linq; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Shared/GameObjects/EntitySystems/DamageSystem.cs b/Content.Shared/GameObjects/EntitySystems/DamageSystem.cs index 502d71062d..48fd41e696 100644 --- a/Content.Shared/GameObjects/EntitySystems/DamageSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/DamageSystem.cs @@ -2,7 +2,7 @@ using System.Collections.Immutable; using Content.Shared.Damage; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerExtensions.cs b/Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerExtensions.cs index 842695f3ec..96c0e68d2d 100644 --- a/Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerExtensions.cs +++ b/Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerExtensions.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems.EffectBlocker { diff --git a/Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerSystem.cs b/Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerSystem.cs index 215630014c..d76449bb6f 100644 --- a/Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerSystem.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems.EffectBlocker { diff --git a/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs b/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs index 0a20721eac..fdedca5578 100644 --- a/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs +++ b/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs @@ -6,8 +6,6 @@ using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Utility; diff --git a/Content.Shared/GameObjects/EntitySystems/MechanismSystem.cs b/Content.Shared/GameObjects/EntitySystems/MechanismSystem.cs index 75861219e6..8f7356cc7c 100644 --- a/Content.Shared/GameObjects/EntitySystems/MechanismSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/MechanismSystem.cs @@ -1,7 +1,6 @@ -using Content.Shared.GameObjects.Components.Body.Behavior; -using Content.Shared.GameObjects.Components.Body.Mechanism; +using Content.Shared.GameObjects.Components.Body.Mechanism; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Shared/GameObjects/EntitySystems/SharedActionSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedActionSystem.cs index f7ed7cac43..12ce595d4f 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedActionSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedActionSystem.cs @@ -1,6 +1,5 @@ using Content.Shared.GameObjects.Components.Mobs; -using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Shared/GameObjects/EntitySystems/SharedChemicalReactionSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedChemicalReactionSystem.cs index 8c2a3a6e7e..7e6e836141 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedChemicalReactionSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedChemicalReactionSystem.cs @@ -1,10 +1,9 @@ using Content.Shared.Chemistry; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Prototypes; using System.Collections.Generic; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs index 52cee2b63f..0c7b3ab25c 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs @@ -1,7 +1,6 @@ using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.EntitySystemMessages; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs index 86ad4c764a..cbb904261c 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs @@ -1,12 +1,8 @@ using System; -using Content.Shared.Construction; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization; -using Robust.Shared.Utility; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Shared/GameObjects/EntitySystems/SharedDisposalUnitSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedDisposalUnitSystem.cs index b8fd1ead39..25413a4cff 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedDisposalUnitSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedDisposalUnitSystem.cs @@ -1,6 +1,6 @@ using Content.Shared.GameObjects.Components.Disposal; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Shared/GameObjects/EntitySystems/SharedInteractionSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedInteractionSystem.cs index 838dafcb09..5c7fe3c85f 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedInteractionSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedInteractionSystem.cs @@ -3,14 +3,12 @@ using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Physics; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Physics; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs index 127cd56b8a..6dbb0cabc3 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs @@ -5,17 +5,12 @@ using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Physics; using Content.Shared.Physics.Pull; -using Robust.Shared.Configuration; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; using Robust.Shared.Input; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.Configuration; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.IoC; using Robust.Shared.Maths; +using Robust.Shared.Physics; using Robust.Shared.Players; namespace Content.Shared.GameObjects.EntitySystems diff --git a/Content.Shared/GameObjects/EntitySystems/SharedPullingSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedPullingSystem.cs index edc0c29262..a692b51edb 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedPullingSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedPullingSystem.cs @@ -6,11 +6,7 @@ using Content.Shared.Input; using Content.Shared.Physics.Pull; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.GameObjects.Components.Transform; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Input.Binding; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Players; diff --git a/Content.Shared/GameObjects/EntitySystems/SharedStandingStateSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedStandingStateSystem.cs index 46fb1dec2e..646c8a36e4 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedStandingStateSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedStandingStateSystem.cs @@ -1,6 +1,5 @@ using Content.Shared.GameObjects.EntitySystems.EffectBlocker; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Shared/GameObjects/EntitySystems/SlipperySystem.cs b/Content.Shared/GameObjects/EntitySystems/SlipperySystem.cs index 6a44dd5634..e10d23d0b1 100644 --- a/Content.Shared/GameObjects/EntitySystems/SlipperySystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SlipperySystem.cs @@ -1,6 +1,6 @@ using Content.Shared.GameObjects.Components.Movement; using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Shared/GameObjects/Verbs/GlobalVerb.cs b/Content.Shared/GameObjects/Verbs/GlobalVerb.cs index c4ff6bfe0c..f405df236f 100644 --- a/Content.Shared/GameObjects/Verbs/GlobalVerb.cs +++ b/Content.Shared/GameObjects/Verbs/GlobalVerb.cs @@ -1,6 +1,6 @@ using System; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Verbs { diff --git a/Content.Shared/GameObjects/Verbs/IShowContextMenu.cs b/Content.Shared/GameObjects/Verbs/IShowContextMenu.cs index 3e51ad13d0..b34bcdc19e 100644 --- a/Content.Shared/GameObjects/Verbs/IShowContextMenu.cs +++ b/Content.Shared/GameObjects/Verbs/IShowContextMenu.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Verbs { diff --git a/Content.Shared/GameObjects/Verbs/SharedVerbSystem.cs b/Content.Shared/GameObjects/Verbs/SharedVerbSystem.cs index 6ed33924d4..1adc5d79cb 100644 --- a/Content.Shared/GameObjects/Verbs/SharedVerbSystem.cs +++ b/Content.Shared/GameObjects/Verbs/SharedVerbSystem.cs @@ -5,9 +5,6 @@ using System.Linq; using Content.Shared.Physics; using Content.Shared.Utility; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.Eye; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Shared/GameObjects/Verbs/Verb.cs b/Content.Shared/GameObjects/Verbs/Verb.cs index 89b1ac59c6..610e3adbf6 100644 --- a/Content.Shared/GameObjects/Verbs/Verb.cs +++ b/Content.Shared/GameObjects/Verbs/Verb.cs @@ -1,6 +1,6 @@ using System; using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Verbs { diff --git a/Content.Shared/GameObjects/Verbs/VerbData.cs b/Content.Shared/GameObjects/Verbs/VerbData.cs index 94f72e72f3..16487afbbe 100644 --- a/Content.Shared/GameObjects/Verbs/VerbData.cs +++ b/Content.Shared/GameObjects/Verbs/VerbData.cs @@ -1,5 +1,5 @@ using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Utility; namespace Content.Shared.GameObjects.Verbs diff --git a/Content.Shared/GameObjects/Verbs/VerbUtility.cs b/Content.Shared/GameObjects/Verbs/VerbUtility.cs index 78aaa227d0..2e43c2280a 100644 --- a/Content.Shared/GameObjects/Verbs/VerbUtility.cs +++ b/Content.Shared/GameObjects/Verbs/VerbUtility.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Reflection; using Robust.Shared.Containers; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Utility; diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs index ad8445656b..fb49c7cd12 100644 --- a/Content.Shared/GameTicking/SharedGameTicker.cs +++ b/Content.Shared/GameTicking/SharedGameTicker.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.IO; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Network; +using Robust.Shared.Serialization; namespace Content.Shared.GameTicking { diff --git a/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs b/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs index 3cb72d5a9d..2d0891c936 100644 --- a/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs +++ b/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs @@ -1,6 +1,6 @@ using Content.Shared.Chemistry; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.Interfaces.Chemistry { diff --git a/Content.Shared/Interfaces/Chemistry/IPlantMetabolizable.cs b/Content.Shared/Interfaces/Chemistry/IPlantMetabolizable.cs index ed0f1dcd12..5edf1bdc74 100644 --- a/Content.Shared/Interfaces/Chemistry/IPlantMetabolizable.cs +++ b/Content.Shared/Interfaces/Chemistry/IPlantMetabolizable.cs @@ -1,7 +1,5 @@ -using Content.Shared.Chemistry; -using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Shared.Interfaces.Chemistry { diff --git a/Content.Shared/Interfaces/Chemistry/IReactionEffect.cs b/Content.Shared/Interfaces/Chemistry/IReactionEffect.cs index 21a4ea91f9..c924f43cea 100644 --- a/Content.Shared/Interfaces/Chemistry/IReactionEffect.cs +++ b/Content.Shared/Interfaces/Chemistry/IReactionEffect.cs @@ -1,5 +1,5 @@ -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; namespace Content.Server.Interfaces.Chemistry { diff --git a/Content.Shared/Interfaces/Chemistry/ITileReaction.cs b/Content.Shared/Interfaces/Chemistry/ITileReaction.cs index ae584642b1..38a132203f 100644 --- a/Content.Shared/Interfaces/Chemistry/ITileReaction.cs +++ b/Content.Shared/Interfaces/Chemistry/ITileReaction.cs @@ -1,6 +1,6 @@ using Content.Shared.Chemistry; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Map; +using Robust.Shared.Serialization; namespace Content.Shared.Interfaces.Chemistry { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs index da1f85cd93..c44ee207fa 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs @@ -2,7 +2,6 @@ using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.Interfaces.GameObjects.Components { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs index d40b256de5..d9e6646977 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; #nullable enable diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs index 61e94ff295..9c2493a5de 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs @@ -2,7 +2,6 @@ using System; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDraggable.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDraggable.cs index c3226d69dc..ffbe070a94 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDraggable.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDraggable.cs @@ -1,6 +1,6 @@ using System; using Robust.Shared.Analyzers; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.Map; namespace Content.Shared.Interfaces.GameObjects.Components diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs index 06cdac2f55..041587b71f 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs @@ -2,7 +2,6 @@ using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.Interfaces.GameObjects.Components { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs index f3c2cf889c..b9056f7894 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs @@ -3,7 +3,6 @@ using Content.Shared.GameObjects.Components.Inventory; using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.Interfaces.GameObjects.Components { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs index d902a139a7..52021dddf2 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs @@ -1,10 +1,7 @@ -using System; -using Content.Shared.GameObjects.Components.Inventory; -using Content.Shared.GameObjects.Components.Items; +using Content.Shared.GameObjects.Components.Items; using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.Interfaces.GameObjects.Components { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs index 9c1238de4e..42cc352b23 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs @@ -2,7 +2,6 @@ using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.Interfaces.GameObjects.Components { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs index baadd64c0b..fcd079919c 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs @@ -2,7 +2,6 @@ using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.Interfaces.GameObjects.Components { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs index 9e93d642a0..c787beb553 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs @@ -2,7 +2,6 @@ using System; using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.Interfaces.GameObjects.Components { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs index f50c58fb7d..06c8b20e6f 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; namespace Content.Shared.Interfaces.GameObjects.Components diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs index 031f6fbb72..c2d5f22f3b 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs @@ -2,7 +2,6 @@ using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; namespace Content.Shared.Interfaces.GameObjects.Components diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRadiationAct.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRadiationAct.cs index 039e49cc83..5804c58752 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRadiationAct.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRadiationAct.cs @@ -1,6 +1,6 @@ using Content.Shared.GameObjects.Components; using Robust.Shared.Analyzers; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Interfaces.GameObjects.Components { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs index 384239cfbf..3fc46a2713 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs @@ -2,7 +2,6 @@ using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; namespace Content.Shared.Interfaces.GameObjects.Components diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/ITargetedInteractEventArgs.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/ITargetedInteractEventArgs.cs index bc6313916e..d05c149490 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/ITargetedInteractEventArgs.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/ITargetedInteractEventArgs.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Shared.Interfaces.GameObjects.Components { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrowCollide.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrowCollide.cs index 113917dce2..cb29056740 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrowCollide.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrowCollide.cs @@ -1,7 +1,6 @@ using System; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; namespace Content.Shared.Interfaces.GameObjects.Components diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs index 5e0817d05f..a788d867a6 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs @@ -2,7 +2,6 @@ using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.Interfaces.GameObjects.Components { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs index f2dd91dd21..e45a1c8379 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs @@ -2,7 +2,6 @@ using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.Interfaces.GameObjects.Components { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs index ddcdbe8a3f..e846b5af17 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs @@ -2,7 +2,6 @@ using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.Interfaces.GameObjects.Components { diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs index 7ba65a0e48..9c23da73fe 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs @@ -2,7 +2,6 @@ using JetBrains.Annotations; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.Interfaces.GameObjects.Components { diff --git a/Content.Shared/Interfaces/ISharedNotifyManager.cs b/Content.Shared/Interfaces/ISharedNotifyManager.cs index be950de1ea..91537098bd 100644 --- a/Content.Shared/Interfaces/ISharedNotifyManager.cs +++ b/Content.Shared/Interfaces/ISharedNotifyManager.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Shared/Kitchen/SharedMicrowaveComponent.cs b/Content.Shared/Kitchen/SharedMicrowaveComponent.cs index 92e6e9324d..d83bebf7d8 100644 --- a/Content.Shared/Kitchen/SharedMicrowaveComponent.cs +++ b/Content.Shared/Kitchen/SharedMicrowaveComponent.cs @@ -2,7 +2,6 @@ using Content.Shared.Chemistry; using Content.Shared.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.Kitchen diff --git a/Content.Shared/Kitchen/SharedReagentGrinderComponent.cs b/Content.Shared/Kitchen/SharedReagentGrinderComponent.cs index 6aa00b33ea..c1b0c51f63 100644 --- a/Content.Shared/Kitchen/SharedReagentGrinderComponent.cs +++ b/Content.Shared/Kitchen/SharedReagentGrinderComponent.cs @@ -2,7 +2,6 @@ using Content.Shared.Chemistry; using Content.Shared.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; namespace Content.Shared.Kitchen diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index 79678476e7..5954d55321 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; -using Robust.Shared.Interfaces.Map; +using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Shared/Maps/TurfHelpers.cs b/Content.Shared/Maps/TurfHelpers.cs index 329b18bd38..379bfc2deb 100644 --- a/Content.Shared/Maps/TurfHelpers.cs +++ b/Content.Shared/Maps/TurfHelpers.cs @@ -5,13 +5,11 @@ using System.Runtime.CompilerServices; using System.Diagnostics.CodeAnalysis; using Content.Shared.Physics; using Content.Shared.Utility; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Physics; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Physics; namespace Content.Shared.Maps { diff --git a/Content.Shared/Materials/Material.cs b/Content.Shared/Materials/Material.cs index a9455be0dd..0c9e7b2f87 100644 --- a/Content.Shared/Materials/Material.cs +++ b/Content.Shared/Materials/Material.cs @@ -1,4 +1,3 @@ -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Network/NetMessages/MsgDeleteCharacter.cs b/Content.Shared/Network/NetMessages/MsgDeleteCharacter.cs index aa0344c83b..9cfca1ed16 100644 --- a/Content.Shared/Network/NetMessages/MsgDeleteCharacter.cs +++ b/Content.Shared/Network/NetMessages/MsgDeleteCharacter.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; namespace Content.Shared.Network.NetMessages diff --git a/Content.Shared/Network/NetMessages/MsgEuiCtl.cs b/Content.Shared/Network/NetMessages/MsgEuiCtl.cs index d1b553d18c..07acdf1aeb 100644 --- a/Content.Shared/Network/NetMessages/MsgEuiCtl.cs +++ b/Content.Shared/Network/NetMessages/MsgEuiCtl.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; namespace Content.Shared.Network.NetMessages diff --git a/Content.Shared/Network/NetMessages/MsgEuiMessage.cs b/Content.Shared/Network/NetMessages/MsgEuiMessage.cs index 7fe5912d20..b4d829a002 100644 --- a/Content.Shared/Network/NetMessages/MsgEuiMessage.cs +++ b/Content.Shared/Network/NetMessages/MsgEuiMessage.cs @@ -2,10 +2,9 @@ using System.IO; using Content.Shared.Eui; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Network; +using Robust.Shared.Serialization; namespace Content.Shared.Network.NetMessages { diff --git a/Content.Shared/Network/NetMessages/MsgEuiState.cs b/Content.Shared/Network/NetMessages/MsgEuiState.cs index 044c4c17b3..ae7ba19453 100644 --- a/Content.Shared/Network/NetMessages/MsgEuiState.cs +++ b/Content.Shared/Network/NetMessages/MsgEuiState.cs @@ -2,10 +2,9 @@ using System.IO; using Content.Shared.Eui; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Network; +using Robust.Shared.Serialization; namespace Content.Shared.Network.NetMessages { diff --git a/Content.Shared/Network/NetMessages/MsgPreferencesAndSettings.cs b/Content.Shared/Network/NetMessages/MsgPreferencesAndSettings.cs index d2136888bb..b453a8af21 100644 --- a/Content.Shared/Network/NetMessages/MsgPreferencesAndSettings.cs +++ b/Content.Shared/Network/NetMessages/MsgPreferencesAndSettings.cs @@ -1,10 +1,9 @@ using System.IO; using Content.Shared.Preferences; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Network; +using Robust.Shared.Serialization; namespace Content.Shared.Network.NetMessages { diff --git a/Content.Shared/Network/NetMessages/MsgRequestStationEvents.cs b/Content.Shared/Network/NetMessages/MsgRequestStationEvents.cs index d7a21ad578..31d7fdd2c6 100644 --- a/Content.Shared/Network/NetMessages/MsgRequestStationEvents.cs +++ b/Content.Shared/Network/NetMessages/MsgRequestStationEvents.cs @@ -1,9 +1,4 @@ -using System.Collections.Generic; -using System.IO; -using Lidgren.Network; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.IoC; +using Lidgren.Network; using Robust.Shared.Network; namespace Content.Shared.Network.NetMessages diff --git a/Content.Shared/Network/NetMessages/MsgRequestWindowAttention.cs b/Content.Shared/Network/NetMessages/MsgRequestWindowAttention.cs index e14ca862e5..fe27599f4a 100644 --- a/Content.Shared/Network/NetMessages/MsgRequestWindowAttention.cs +++ b/Content.Shared/Network/NetMessages/MsgRequestWindowAttention.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; namespace Content.Shared.Network.NetMessages diff --git a/Content.Shared/Network/NetMessages/MsgSelectCharacter.cs b/Content.Shared/Network/NetMessages/MsgSelectCharacter.cs index 2267d042ea..a9afe5440d 100644 --- a/Content.Shared/Network/NetMessages/MsgSelectCharacter.cs +++ b/Content.Shared/Network/NetMessages/MsgSelectCharacter.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; namespace Content.Shared.Network.NetMessages diff --git a/Content.Shared/Network/NetMessages/MsgStationEvents.cs b/Content.Shared/Network/NetMessages/MsgStationEvents.cs index 6523419f1e..3ee27d01f9 100644 --- a/Content.Shared/Network/NetMessages/MsgStationEvents.cs +++ b/Content.Shared/Network/NetMessages/MsgStationEvents.cs @@ -1,9 +1,8 @@ using System.IO; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Network; +using Robust.Shared.Serialization; namespace Content.Shared.Network.NetMessages { diff --git a/Content.Shared/Network/NetMessages/MsgUpdateAdminStatus.cs b/Content.Shared/Network/NetMessages/MsgUpdateAdminStatus.cs index bdeb4be645..647c267db9 100644 --- a/Content.Shared/Network/NetMessages/MsgUpdateAdminStatus.cs +++ b/Content.Shared/Network/NetMessages/MsgUpdateAdminStatus.cs @@ -1,6 +1,5 @@ using Content.Shared.Administration; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; namespace Content.Shared.Network.NetMessages diff --git a/Content.Shared/Network/NetMessages/MsgUpdateCharacter.cs b/Content.Shared/Network/NetMessages/MsgUpdateCharacter.cs index 9e32bf379e..88dd0ae22f 100644 --- a/Content.Shared/Network/NetMessages/MsgUpdateCharacter.cs +++ b/Content.Shared/Network/NetMessages/MsgUpdateCharacter.cs @@ -1,10 +1,9 @@ using System.IO; using Content.Shared.Preferences; using Lidgren.Network; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Network; +using Robust.Shared.Serialization; namespace Content.Shared.Network.NetMessages { diff --git a/Content.Shared/Physics/BulletController.cs b/Content.Shared/Physics/BulletController.cs index eccd2b291f..c54fc53553 100644 --- a/Content.Shared/Physics/BulletController.cs +++ b/Content.Shared/Physics/BulletController.cs @@ -1,5 +1,5 @@ #nullable enable -using Robust.Shared.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Physics; diff --git a/Content.Shared/Physics/ContainmentFieldRepellController.cs b/Content.Shared/Physics/ContainmentFieldRepellController.cs index 314dbc811a..843a5a289f 100644 --- a/Content.Shared/Physics/ContainmentFieldRepellController.cs +++ b/Content.Shared/Physics/ContainmentFieldRepellController.cs @@ -1,6 +1,4 @@ -using System.Numerics; -using Robust.Shared.Maths; -using Robust.Shared.Physics; +using Robust.Shared.Maths; namespace Content.Shared.Physics { diff --git a/Content.Shared/Physics/ConveyedController.cs b/Content.Shared/Physics/ConveyedController.cs index 6232710b87..226b5335a3 100644 --- a/Content.Shared/Physics/ConveyedController.cs +++ b/Content.Shared/Physics/ConveyedController.cs @@ -1,11 +1,8 @@ #nullable enable using Content.Shared.GameObjects.Components.Movement; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.IoC; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Physics; -using Robust.Shared.Random; namespace Content.Shared.Physics { diff --git a/Content.Shared/Physics/FrictionController.cs b/Content.Shared/Physics/FrictionController.cs index 0b9eb019ce..9438b51e4d 100644 --- a/Content.Shared/Physics/FrictionController.cs +++ b/Content.Shared/Physics/FrictionController.cs @@ -1,5 +1,4 @@ using System; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.IoC; using Robust.Shared.Physics; diff --git a/Content.Shared/Physics/MoverController.cs b/Content.Shared/Physics/MoverController.cs index 60c6f76ba2..1124806330 100644 --- a/Content.Shared/Physics/MoverController.cs +++ b/Content.Shared/Physics/MoverController.cs @@ -1,6 +1,6 @@ #nullable enable using Content.Shared.GameObjects.Components.Movement; -using Robust.Shared.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Physics; diff --git a/Content.Shared/Physics/Pull/PullAttemptMessage.cs b/Content.Shared/Physics/Pull/PullAttemptMessage.cs index 8a3a31bab4..778b21173f 100644 --- a/Content.Shared/Physics/Pull/PullAttemptMessage.cs +++ b/Content.Shared/Physics/Pull/PullAttemptMessage.cs @@ -1,4 +1,4 @@ -using Robust.Shared.GameObjects.Components; +using Robust.Shared.GameObjects; namespace Content.Shared.Physics.Pull { diff --git a/Content.Shared/Physics/Pull/PullController.cs b/Content.Shared/Physics/Pull/PullController.cs index be093ca55e..b29643116d 100644 --- a/Content.Shared/Physics/Pull/PullController.cs +++ b/Content.Shared/Physics/Pull/PullController.cs @@ -3,14 +3,10 @@ using System; using System.Linq; using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Physics; -using Robust.Shared.Utility; using Content.Shared.GameObjects.Components.Pulling; using static Content.Shared.GameObjects.EntitySystems.SharedInteractionSystem; diff --git a/Content.Shared/Physics/Pull/PullMessage.cs b/Content.Shared/Physics/Pull/PullMessage.cs index 92c811ddd4..9df78ea424 100644 --- a/Content.Shared/Physics/Pull/PullMessage.cs +++ b/Content.Shared/Physics/Pull/PullMessage.cs @@ -1,5 +1,4 @@ using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; namespace Content.Shared.Physics.Pull { diff --git a/Content.Shared/Physics/Pull/PullStartedMessage.cs b/Content.Shared/Physics/Pull/PullStartedMessage.cs index ea043c2b4b..36d20fb0be 100644 --- a/Content.Shared/Physics/Pull/PullStartedMessage.cs +++ b/Content.Shared/Physics/Pull/PullStartedMessage.cs @@ -1,4 +1,4 @@ -using Robust.Shared.GameObjects.Components; +using Robust.Shared.GameObjects; namespace Content.Shared.Physics.Pull { diff --git a/Content.Shared/Physics/Pull/PullStoppedMessage.cs b/Content.Shared/Physics/Pull/PullStoppedMessage.cs index dd43653b6b..36c4524cdc 100644 --- a/Content.Shared/Physics/Pull/PullStoppedMessage.cs +++ b/Content.Shared/Physics/Pull/PullStoppedMessage.cs @@ -1,4 +1,4 @@ -using Robust.Shared.GameObjects.Components; +using Robust.Shared.GameObjects; namespace Content.Shared.Physics.Pull { diff --git a/Content.Shared/Physics/ShuttleController.cs b/Content.Shared/Physics/ShuttleController.cs index cb995167f3..ed986d1e5e 100644 --- a/Content.Shared/Physics/ShuttleController.cs +++ b/Content.Shared/Physics/ShuttleController.cs @@ -1,5 +1,5 @@ #nullable enable -using Robust.Shared.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Physics; diff --git a/Content.Shared/Physics/SingularityController.cs b/Content.Shared/Physics/SingularityController.cs index 2aafe8d5a6..c9dd44b1d2 100644 --- a/Content.Shared/Physics/SingularityController.cs +++ b/Content.Shared/Physics/SingularityController.cs @@ -1,5 +1,5 @@ #nullable enable -using Robust.Shared.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Physics; diff --git a/Content.Shared/Physics/SingularityPullController.cs b/Content.Shared/Physics/SingularityPullController.cs index 0a235fe1d0..66f4fa0c90 100644 --- a/Content.Shared/Physics/SingularityPullController.cs +++ b/Content.Shared/Physics/SingularityPullController.cs @@ -1,5 +1,5 @@ #nullable enable -using Robust.Shared.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Physics; diff --git a/Content.Shared/Physics/SlipController.cs b/Content.Shared/Physics/SlipController.cs index 8a2091019b..55710b4a3e 100644 --- a/Content.Shared/Physics/SlipController.cs +++ b/Content.Shared/Physics/SlipController.cs @@ -1,5 +1,4 @@ -using Robust.Shared.Interfaces.Physics; -using Robust.Shared.IoC; +using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Physics; diff --git a/Content.Shared/Physics/ThrowKnockbackController.cs b/Content.Shared/Physics/ThrowKnockbackController.cs index 0b11cab2a3..296d6782a7 100644 --- a/Content.Shared/Physics/ThrowKnockbackController.cs +++ b/Content.Shared/Physics/ThrowKnockbackController.cs @@ -1,7 +1,5 @@ using Content.Shared.GameObjects.Components.Movement; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Physics; diff --git a/Content.Shared/Physics/ThrownController.cs b/Content.Shared/Physics/ThrownController.cs index 1586fb4954..8b836b969b 100644 --- a/Content.Shared/Physics/ThrownController.cs +++ b/Content.Shared/Physics/ThrownController.cs @@ -1,5 +1,5 @@ #nullable enable -using Robust.Shared.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Physics; diff --git a/Content.Shared/Preferences/HumanoidCharacterAppearance.cs b/Content.Shared/Preferences/HumanoidCharacterAppearance.cs index 0c06fd1570..a7617a6036 100644 --- a/Content.Shared/Preferences/HumanoidCharacterAppearance.cs +++ b/Content.Shared/Preferences/HumanoidCharacterAppearance.cs @@ -1,7 +1,6 @@ using System; using System.Linq; using Content.Shared.Preferences.Appearance; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Random; diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index 2c7ae05637..ccd539bb20 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -5,7 +5,6 @@ using System.Linq; using Content.Shared.GameTicking; using Content.Shared.Roles; using Content.Shared.Text; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Random; diff --git a/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs b/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs index 7c5411e20d..b30e04f9d3 100644 --- a/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs +++ b/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs @@ -1,5 +1,4 @@ using System; -using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/Prototypes/Tag/TagPrototype.cs b/Content.Shared/Prototypes/Tag/TagPrototype.cs index c45e994af3..046e46b11d 100644 --- a/Content.Shared/Prototypes/Tag/TagPrototype.cs +++ b/Content.Shared/Prototypes/Tag/TagPrototype.cs @@ -1,6 +1,5 @@ #nullable enable using JetBrains.Annotations; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using YamlDotNet.RepresentationModel; diff --git a/Content.Shared/Research/LatheRecipePrototype.cs b/Content.Shared/Research/LatheRecipePrototype.cs index 4cda6fbd47..3c1cb8cdf6 100644 --- a/Content.Shared/Research/LatheRecipePrototype.cs +++ b/Content.Shared/Research/LatheRecipePrototype.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/Roles/JobSpecial.cs b/Content.Shared/Roles/JobSpecial.cs index edc3f091de..09dc5f3870 100644 --- a/Content.Shared/Roles/JobSpecial.cs +++ b/Content.Shared/Roles/JobSpecial.cs @@ -1,5 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; namespace Content.Shared.Roles diff --git a/Content.Shared/Sandbox/SharedSandboxManager.cs b/Content.Shared/Sandbox/SharedSandboxManager.cs index 5276cb911c..677b5afe73 100644 --- a/Content.Shared/Sandbox/SharedSandboxManager.cs +++ b/Content.Shared/Sandbox/SharedSandboxManager.cs @@ -1,5 +1,4 @@ using Lidgren.Network; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; namespace Content.Shared.Sandbox diff --git a/Content.Shared/SharedNotifyManager.cs b/Content.Shared/SharedNotifyManager.cs index 9a28a21bb0..0d0c3d76a1 100644 --- a/Content.Shared/SharedNotifyManager.cs +++ b/Content.Shared/SharedNotifyManager.cs @@ -1,8 +1,6 @@ using Content.Shared.Interfaces; using Lidgren.Network; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.Map; using Robust.Shared.Network; diff --git a/Content.Shared/Utility/Cooldowns.cs b/Content.Shared/Utility/Cooldowns.cs index 04a2aa39f4..74d9551d43 100644 --- a/Content.Shared/Utility/Cooldowns.cs +++ b/Content.Shared/Utility/Cooldowns.cs @@ -1,6 +1,6 @@ using System; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; +using Robust.Shared.Timing; namespace Content.Shared.Utility { diff --git a/Content.Shared/Utility/EntityCoordinatesExtensions.cs b/Content.Shared/Utility/EntityCoordinatesExtensions.cs index 173ba12c86..996397d897 100644 --- a/Content.Shared/Utility/EntityCoordinatesExtensions.cs +++ b/Content.Shared/Utility/EntityCoordinatesExtensions.cs @@ -1,6 +1,5 @@ #nullable enable using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Shared/Utility/EntityPrototypeHelpers.cs b/Content.Shared/Utility/EntityPrototypeHelpers.cs index 704313d329..0fa03a531a 100644 --- a/Content.Shared/Utility/EntityPrototypeHelpers.cs +++ b/Content.Shared/Utility/EntityPrototypeHelpers.cs @@ -2,7 +2,6 @@ using System; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Utility/SharedDirectionExtensions.cs b/Content.Shared/Utility/SharedDirectionExtensions.cs index a30b37de57..56f784d105 100644 --- a/Content.Shared/Utility/SharedDirectionExtensions.cs +++ b/Content.Shared/Utility/SharedDirectionExtensions.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using Content.Shared.Maps; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Random; namespace Content.Shared.Utility { diff --git a/Content.Shared/Utility/SharedEntityExtensions.cs b/Content.Shared/Utility/SharedEntityExtensions.cs index 8ad47700e2..6e1602bbcf 100644 --- a/Content.Shared/Utility/SharedEntityExtensions.cs +++ b/Content.Shared/Utility/SharedEntityExtensions.cs @@ -1,6 +1,5 @@ using System; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Random; diff --git a/Content.Shared/Utility/SharedUnobstructedExtensions.cs b/Content.Shared/Utility/SharedUnobstructedExtensions.cs index 4cbce7d6e5..a42c5d00fc 100644 --- a/Content.Shared/Utility/SharedUnobstructedExtensions.cs +++ b/Content.Shared/Utility/SharedUnobstructedExtensions.cs @@ -2,9 +2,7 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Physics; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using static Content.Shared.GameObjects.EntitySystems.SharedInteractionSystem; diff --git a/Content.Shared/Utility/SharedUnoccludedExtensions.cs b/Content.Shared/Utility/SharedUnoccludedExtensions.cs index db2d057ddf..4befa1fa27 100644 --- a/Content.Shared/Utility/SharedUnoccludedExtensions.cs +++ b/Content.Shared/Utility/SharedUnoccludedExtensions.cs @@ -1,8 +1,7 @@ #nullable enable using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using static Content.Shared.GameObjects.EntitySystems.ExamineSystemShared; diff --git a/Content.Shared/Utility/TransformExtensions.cs b/Content.Shared/Utility/TransformExtensions.cs index d126dd5bba..d8ec0bce64 100644 --- a/Content.Shared/Utility/TransformExtensions.cs +++ b/Content.Shared/Utility/TransformExtensions.cs @@ -1,5 +1,4 @@ -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; namespace Content.Shared.Utility { diff --git a/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs b/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs index 9f3faf4e9d..f68ad44c00 100644 --- a/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs +++ b/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs @@ -3,7 +3,7 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Shared.Alert; using Content.Shared.GameObjects.Components.Mobs; using NUnit.Framework; -using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Tests/Server/Preferences/ServerDbSqliteTests.cs b/Content.Tests/Server/Preferences/ServerDbSqliteTests.cs index 2df929a3b6..b57b4ee96d 100644 --- a/Content.Tests/Server/Preferences/ServerDbSqliteTests.cs +++ b/Content.Tests/Server/Preferences/ServerDbSqliteTests.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Content.Server.Database; -using Content.Shared; using Content.Shared.GameTicking; using Content.Shared.Preferences; using Microsoft.Data.Sqlite; @@ -11,8 +10,6 @@ using Microsoft.EntityFrameworkCore; using NUnit.Framework; using Robust.Shared.Maths; using Robust.Shared.Network; -using Robust.UnitTesting; -using Robust.Shared.IoC; using Robust.Shared.Localization.Macros; namespace Content.Tests.Server.Preferences diff --git a/Content.Tests/Shared/Alert/AlertManagerTests.cs b/Content.Tests/Shared/Alert/AlertManagerTests.cs index c9cf51ce38..2e9f79cbb5 100644 --- a/Content.Tests/Shared/Alert/AlertManagerTests.cs +++ b/Content.Tests/Shared/Alert/AlertManagerTests.cs @@ -1,13 +1,9 @@ -using System.IO; +using System.IO; using Content.Shared.Alert; using NUnit.Framework; -using Robust.Shared.Interfaces.Log; using Robust.Shared.IoC; -using Robust.Shared.Log; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -using Robust.UnitTesting; -using YamlDotNet.RepresentationModel; namespace Content.Tests.Shared.Alert { diff --git a/Content.Tests/Shared/Alert/AlertOrderPrototypeTests.cs b/Content.Tests/Shared/Alert/AlertOrderPrototypeTests.cs index b7aad0e5ce..c39ef83b31 100644 --- a/Content.Tests/Shared/Alert/AlertOrderPrototypeTests.cs +++ b/Content.Tests/Shared/Alert/AlertOrderPrototypeTests.cs @@ -1,11 +1,10 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using Content.Shared.Alert; using NUnit.Framework; using Robust.Shared.IoC; using Robust.Shared.Prototypes; -using Robust.UnitTesting; namespace Content.Tests.Shared.Alert { diff --git a/Content.Tests/Shared/Gamestates/ComponentStateNullTest.cs b/Content.Tests/Shared/Gamestates/ComponentStateNullTest.cs index 93bfa94513..2bcb217f58 100644 --- a/Content.Tests/Shared/Gamestates/ComponentStateNullTest.cs +++ b/Content.Tests/Shared/Gamestates/ComponentStateNullTest.cs @@ -4,8 +4,6 @@ using System.Reflection; using NUnit.Framework; using Robust.Shared.ContentPack; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.Reflection; namespace Content.Tests.Shared.Gamestates diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index b5541b8aeb..90a4d78510 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -601,7 +601,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 69 type: PowerCellRecharger @@ -641,7 +641,7 @@ entities: type: Transform - containers: storagebase: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 73 type: DrinkGoldenCup @@ -932,7 +932,7 @@ entities: type: Transform - containers: storagebase: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 115 type: FlashlightLantern @@ -1326,7 +1326,7 @@ entities: type: Transform - containers: DisposalBend: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 160 type: DisposalBend @@ -1337,7 +1337,7 @@ entities: type: Transform - containers: DisposalBend: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 161 type: DisposalPipe @@ -1347,7 +1347,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 162 type: TwoWayLever @@ -1367,7 +1367,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 164 type: DisposalJunction @@ -1378,7 +1378,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 165 type: DisposalJunction @@ -1389,7 +1389,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 166 type: DisposalJunctionFlipped @@ -1400,7 +1400,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 167 type: DisposalJunction @@ -1411,7 +1411,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 168 type: DisposalJunctionFlipped @@ -1422,7 +1422,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 169 type: DisposalJunctionFlipped @@ -1433,7 +1433,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 170 type: DisposalJunction @@ -1444,7 +1444,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 171 type: DisposalYJunction @@ -1455,7 +1455,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 172 type: DisposalJunctionFlipped @@ -1465,7 +1465,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 173 type: DisposalJunction @@ -1476,7 +1476,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 174 type: DisposalJunction @@ -1487,7 +1487,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 175 type: DisposalJunctionFlipped @@ -1498,7 +1498,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 176 type: DisposalJunctionFlipped @@ -1509,7 +1509,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 177 type: DisposalJunction @@ -1520,7 +1520,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 178 type: DisposalJunctionFlipped @@ -1531,7 +1531,7 @@ entities: type: Transform - containers: DisposalJunction: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 179 type: DisposalPipe @@ -1542,7 +1542,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 180 type: DisposalPipe @@ -1553,7 +1553,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 181 type: DisposalPipe @@ -1564,7 +1564,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 182 type: DisposalPipe @@ -1575,7 +1575,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 183 type: DisposalTrunk @@ -1586,7 +1586,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 184 type: DisposalUnit @@ -1597,7 +1597,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 185 type: DisposalPipe @@ -1607,7 +1607,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 186 type: DisposalPipe @@ -1618,7 +1618,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 187 type: DisposalPipe @@ -1629,7 +1629,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 188 type: DisposalPipe @@ -1640,7 +1640,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 189 type: DisposalPipe @@ -1651,7 +1651,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 190 type: DisposalPipe @@ -1662,7 +1662,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 191 type: VendingMachineYouTool @@ -1680,7 +1680,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 193 type: DisposalBend @@ -1691,7 +1691,7 @@ entities: type: Transform - containers: DisposalBend: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 194 type: DisposalPipe @@ -1702,7 +1702,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 195 type: DisposalPipe @@ -1712,7 +1712,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 196 type: DisposalPipe @@ -1722,7 +1722,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 197 type: DisposalPipe @@ -1732,7 +1732,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 198 type: DisposalPipe @@ -1742,7 +1742,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 199 type: DisposalPipe @@ -1752,7 +1752,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 200 type: DisposalPipe @@ -1762,7 +1762,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 201 type: DisposalTrunk @@ -1772,7 +1772,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 202 type: DisposalUnit @@ -1783,7 +1783,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 203 type: DisposalPipe @@ -1794,7 +1794,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 204 type: DisposalPipe @@ -1805,7 +1805,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 205 type: DisposalPipe @@ -1816,7 +1816,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 206 type: DisposalTrunk @@ -1827,7 +1827,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 207 type: DisposalUnit @@ -1838,7 +1838,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 208 type: DisposalPipe @@ -1849,7 +1849,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 209 type: DisposalPipe @@ -1860,7 +1860,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 210 type: DisposalPipe @@ -1871,7 +1871,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 211 type: DisposalPipe @@ -1882,7 +1882,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 212 type: DisposalTrunk @@ -1893,7 +1893,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 213 type: DisposalUnit @@ -1904,7 +1904,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 214 type: DisposalPipe @@ -1914,7 +1914,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 215 type: DisposalPipe @@ -1924,7 +1924,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 216 type: DisposalPipe @@ -1934,7 +1934,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 217 type: DisposalPipe @@ -1945,7 +1945,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 218 type: Recycler @@ -1962,7 +1962,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 220 type: DisposalPipe @@ -1973,7 +1973,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 221 type: DisposalPipe @@ -1984,7 +1984,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 222 type: DisposalPipe @@ -1995,7 +1995,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 223 type: DisposalPipe @@ -2006,7 +2006,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 224 type: DisposalPipe @@ -2017,7 +2017,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 225 type: DisposalPipe @@ -2028,7 +2028,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 226 type: DisposalTrunk @@ -2039,7 +2039,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 227 type: DisposalUnit @@ -2050,7 +2050,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 228 type: DisposalPipe @@ -2061,7 +2061,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 229 type: DisposalPipe @@ -2072,7 +2072,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 230 type: DisposalPipe @@ -2083,7 +2083,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 231 type: DisposalPipe @@ -2094,7 +2094,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 232 type: DisposalPipe @@ -2105,7 +2105,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 233 type: DisposalPipe @@ -2116,7 +2116,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 234 type: DisposalPipe @@ -2127,7 +2127,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 235 type: DisposalBend @@ -2138,7 +2138,7 @@ entities: type: Transform - containers: DisposalBend: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 236 type: DisposalPipe @@ -2149,7 +2149,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 237 type: DisposalPipe @@ -2160,7 +2160,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 238 type: DisposalTrunk @@ -2171,7 +2171,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 239 type: DisposalUnit @@ -2182,7 +2182,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 240 type: DisposalBend @@ -2193,7 +2193,7 @@ entities: type: Transform - containers: DisposalBend: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 241 type: DisposalPipe @@ -2204,7 +2204,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 242 type: DisposalPipe @@ -2215,7 +2215,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 243 type: DisposalPipe @@ -2226,7 +2226,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 244 type: DisposalPipe @@ -2237,7 +2237,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 245 type: DisposalPipe @@ -2248,7 +2248,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 246 type: DisposalPipe @@ -2259,7 +2259,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 247 type: DisposalPipe @@ -2270,7 +2270,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 248 type: DisposalPipe @@ -2281,7 +2281,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 249 type: DisposalPipe @@ -2292,7 +2292,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 250 type: DisposalPipe @@ -2303,7 +2303,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 251 type: DisposalPipe @@ -2314,7 +2314,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 252 type: DisposalPipe @@ -2325,7 +2325,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 253 type: DisposalPipe @@ -2335,7 +2335,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 254 type: DisposalPipe @@ -2346,7 +2346,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 255 type: DisposalPipe @@ -2357,7 +2357,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 256 type: DisposalPipe @@ -2368,7 +2368,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 257 type: DisposalPipe @@ -2379,7 +2379,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 258 type: DisposalPipe @@ -2390,7 +2390,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 259 type: DisposalPipe @@ -2401,7 +2401,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 260 type: DisposalPipe @@ -2412,7 +2412,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 261 type: DisposalPipe @@ -2423,7 +2423,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 262 type: DisposalPipe @@ -2434,7 +2434,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 263 type: DisposalPipe @@ -2445,7 +2445,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 264 type: Window @@ -2463,7 +2463,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 266 type: DisposalPipe @@ -2474,7 +2474,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 267 type: DisposalPipe @@ -2484,7 +2484,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 268 type: DisposalPipe @@ -2494,7 +2494,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 269 type: DisposalPipe @@ -2504,7 +2504,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 270 type: DisposalPipe @@ -2514,7 +2514,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 271 type: DisposalTrunk @@ -2524,7 +2524,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 272 type: DisposalUnit @@ -2535,7 +2535,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 273 type: DisposalPipe @@ -2545,7 +2545,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 274 type: DisposalPipe @@ -2556,7 +2556,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 275 type: DisposalPipe @@ -2567,7 +2567,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 276 type: DisposalPipe @@ -2578,7 +2578,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 277 type: DisposalPipe @@ -2589,7 +2589,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 278 type: DisposalPipe @@ -2600,7 +2600,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 279 type: DisposalPipe @@ -2611,7 +2611,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 280 type: DisposalPipe @@ -2622,7 +2622,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 281 type: DisposalPipe @@ -2633,7 +2633,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 282 type: DisposalPipe @@ -2644,7 +2644,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 283 type: DisposalPipe @@ -2655,7 +2655,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 284 type: DisposalPipe @@ -2666,7 +2666,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 285 type: DisposalPipe @@ -2677,7 +2677,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 286 type: DisposalPipe @@ -2688,7 +2688,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 287 type: DisposalBend @@ -2699,7 +2699,7 @@ entities: type: Transform - containers: DisposalBend: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 288 type: DisposalPipe @@ -2710,7 +2710,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 289 type: DisposalPipe @@ -2721,7 +2721,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 290 type: DisposalPipe @@ -2732,7 +2732,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 291 type: DisposalPipe @@ -2743,7 +2743,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 292 type: DisposalPipe @@ -2754,7 +2754,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 293 type: DisposalPipe @@ -2765,7 +2765,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 294 type: DisposalPipe @@ -2776,7 +2776,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 295 type: DisposalTrunk @@ -2787,7 +2787,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 296 type: DisposalUnit @@ -2798,7 +2798,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 297 type: DisposalPipe @@ -2808,7 +2808,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 298 type: DisposalPipe @@ -2819,7 +2819,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 299 type: DisposalPipe @@ -2830,7 +2830,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 300 type: DisposalPipe @@ -2841,7 +2841,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 301 type: DisposalTrunk @@ -2852,7 +2852,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 302 type: DisposalUnit @@ -2863,7 +2863,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 303 type: Window @@ -2888,7 +2888,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 306 type: DisposalPipe @@ -2899,7 +2899,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 307 type: DisposalPipe @@ -2910,7 +2910,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 308 type: DisposalPipe @@ -2921,7 +2921,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 309 type: DisposalPipe @@ -2932,7 +2932,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 310 type: DisposalPipe @@ -2943,7 +2943,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 311 type: DisposalPipe @@ -2954,7 +2954,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 312 type: DisposalPipe @@ -2965,7 +2965,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 313 type: DisposalPipe @@ -2976,7 +2976,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 314 type: DisposalPipe @@ -2987,7 +2987,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 315 type: DisposalPipe @@ -2998,7 +2998,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 316 type: DisposalPipe @@ -3009,7 +3009,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 317 type: DisposalPipe @@ -3020,7 +3020,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 318 type: DisposalPipe @@ -3031,7 +3031,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 319 type: DisposalPipe @@ -3042,7 +3042,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 320 type: DisposalPipe @@ -3053,7 +3053,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 321 type: DisposalPipe @@ -3064,7 +3064,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 322 type: DisposalPipe @@ -3075,7 +3075,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 323 type: DisposalPipe @@ -3086,7 +3086,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 324 type: DisposalPipe @@ -3097,7 +3097,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 325 type: Firelock @@ -3117,7 +3117,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 327 type: DisposalPipe @@ -3128,7 +3128,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 328 type: DisposalPipe @@ -3139,7 +3139,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 329 type: DisposalPipe @@ -3150,7 +3150,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 330 type: DisposalPipe @@ -3161,7 +3161,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 331 type: DisposalPipe @@ -3172,7 +3172,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 332 type: DisposalPipe @@ -3183,7 +3183,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 333 type: DisposalPipe @@ -3193,7 +3193,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 334 type: DisposalTrunk @@ -3204,7 +3204,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 335 type: DisposalUnit @@ -3215,7 +3215,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 336 type: DisposalPipe @@ -3226,7 +3226,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 337 type: DisposalTrunk @@ -3237,7 +3237,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 338 type: DisposalPipe @@ -3247,7 +3247,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 339 type: DisposalPipe @@ -3258,7 +3258,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 340 type: DisposalTrunk @@ -3269,7 +3269,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 341 type: DisposalPipe @@ -3279,7 +3279,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 342 type: DisposalPipe @@ -3290,7 +3290,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 343 type: DisposalPipe @@ -3301,7 +3301,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 344 type: DisposalBend @@ -3311,7 +3311,7 @@ entities: type: Transform - containers: DisposalBend: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 345 type: DisposalPipe @@ -3322,7 +3322,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 346 type: DisposalPipe @@ -3333,7 +3333,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 347 type: DisposalTrunk @@ -3344,7 +3344,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 348 type: DisposalBend @@ -3355,7 +3355,7 @@ entities: type: Transform - containers: DisposalBend: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 349 type: DisposalPipe @@ -3366,7 +3366,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 350 type: DisposalPipe @@ -3377,7 +3377,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 351 type: DisposalPipe @@ -3388,7 +3388,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 352 type: DisposalPipe @@ -3399,7 +3399,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 353 type: DisposalPipe @@ -3410,7 +3410,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 354 type: DisposalPipe @@ -3421,7 +3421,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 355 type: DisposalPipe @@ -3432,7 +3432,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 356 type: DisposalPipe @@ -3443,7 +3443,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 357 type: DisposalPipe @@ -3454,7 +3454,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 358 type: DisposalPipe @@ -3465,7 +3465,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 359 type: DisposalPipe @@ -3476,7 +3476,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 360 type: DisposalPipe @@ -3487,7 +3487,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 361 type: DisposalPipe @@ -3498,7 +3498,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 362 type: DisposalPipe @@ -3509,7 +3509,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 363 type: DisposalUnit @@ -3520,7 +3520,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 364 type: DisposalPipe @@ -3531,7 +3531,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 365 type: DisposalPipe @@ -3542,7 +3542,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 366 type: DisposalPipe @@ -3553,7 +3553,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 367 type: DisposalPipe @@ -3564,7 +3564,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 368 type: DisposalPipe @@ -3575,7 +3575,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 369 type: DisposalPipe @@ -3586,7 +3586,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 370 type: DisposalPipe @@ -3597,7 +3597,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 371 type: DisposalPipe @@ -3608,7 +3608,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 372 type: DisposalPipe @@ -3619,7 +3619,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 373 type: DisposalUnit @@ -3630,7 +3630,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 374 type: DisposalPipe @@ -3641,7 +3641,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 375 type: DisposalPipe @@ -3652,7 +3652,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 376 type: DisposalPipe @@ -3663,7 +3663,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 377 type: DisposalPipe @@ -3674,7 +3674,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 378 type: DisposalPipe @@ -3685,7 +3685,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 379 type: DisposalPipe @@ -3696,7 +3696,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 380 type: DisposalPipe @@ -3707,7 +3707,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 381 type: DisposalPipe @@ -3718,7 +3718,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 382 type: DisposalPipe @@ -3729,7 +3729,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 383 type: DisposalPipe @@ -3740,7 +3740,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 384 type: DisposalPipe @@ -3751,7 +3751,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 385 type: DisposalPipe @@ -3762,7 +3762,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 386 type: DisposalPipe @@ -3773,7 +3773,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 387 type: DisposalPipe @@ -3784,7 +3784,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 388 type: DisposalPipe @@ -3795,7 +3795,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 389 type: DisposalPipe @@ -3806,7 +3806,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 390 type: DisposalPipe @@ -3817,7 +3817,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 391 type: DisposalPipe @@ -3828,7 +3828,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 392 type: DisposalPipe @@ -3839,7 +3839,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 393 type: DisposalPipe @@ -3850,7 +3850,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 394 type: DisposalPipe @@ -3861,7 +3861,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 395 type: DisposalPipe @@ -3872,7 +3872,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 396 type: DisposalBend @@ -3883,7 +3883,7 @@ entities: type: Transform - containers: DisposalBend: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 397 type: DisposalPipe @@ -3894,7 +3894,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 398 type: DisposalPipe @@ -3905,7 +3905,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 399 type: DisposalPipe @@ -3916,7 +3916,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 400 type: DisposalPipe @@ -3927,7 +3927,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 401 type: DisposalUnit @@ -3938,7 +3938,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 402 type: DisposalPipe @@ -3949,7 +3949,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 403 type: DisposalPipe @@ -3960,7 +3960,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 404 type: DisposalPipe @@ -3971,7 +3971,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 405 type: DisposalUnit @@ -3982,7 +3982,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 406 type: Firelock @@ -5160,7 +5160,7 @@ entities: board: entities: - 563 - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 565 type: cargoTelepad @@ -6012,7 +6012,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 663 type: Table @@ -6734,7 +6734,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 761 type: PottedPlantRandom @@ -6758,7 +6758,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 763 type: LockerEmergencyFilledRandom @@ -6771,7 +6771,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 764 type: PottedPlantRandom @@ -6806,7 +6806,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 767 type: LockerEmergencyFilledRandom @@ -6819,7 +6819,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 768 type: LockerEmergencyFilledRandom @@ -6832,7 +6832,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 769 type: PottedPlantRD @@ -6856,7 +6856,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 771 type: PottedPlantRandom @@ -6891,7 +6891,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 774 type: LockerFireFilled @@ -6904,7 +6904,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 775 type: LockerBombFilled @@ -6917,7 +6917,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 776 type: LockerBombFilled @@ -6930,7 +6930,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 777 type: LockerFireFilled @@ -6943,7 +6943,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 778 type: LockerEmergencyFilledRandom @@ -6956,7 +6956,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 779 type: LockerFireFilled @@ -6969,7 +6969,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 780 type: LockerEmergencyFilledRandom @@ -6982,7 +6982,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 781 type: LockerFireFilled @@ -6995,7 +6995,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 782 type: LockerFireFilled @@ -7008,7 +7008,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 783 type: LockerEmergencyFilledRandom @@ -7021,7 +7021,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 784 type: LockerFireFilled @@ -7034,7 +7034,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 785 type: LockerEmergencyFilledRandom @@ -7047,7 +7047,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 786 type: LockerEmergencyFilledRandom @@ -7060,7 +7060,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 787 type: LockerEmergencyFilledRandom @@ -7073,7 +7073,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 788 type: LockerEmergencyFilledRandom @@ -7086,7 +7086,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 789 type: LockerFireFilled @@ -7099,7 +7099,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 790 type: LockerEmergencyFilledRandom @@ -7112,7 +7112,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 791 type: LockerEmergencyFilledRandom @@ -7125,7 +7125,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 792 type: LockerEmergencyFilledRandom @@ -7138,7 +7138,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 793 type: LockerEmergencyFilledRandom @@ -7151,7 +7151,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 794 type: LockerCaptainFilled @@ -7164,7 +7164,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 795 type: WardrobeCargoFilled @@ -7177,7 +7177,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 796 type: PottedPlantRandom @@ -7201,7 +7201,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 798 type: LockerL3JanitorFilled @@ -7214,7 +7214,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 799 type: LockerJanitorFilled @@ -7227,7 +7227,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 800 type: LockerChefFilled @@ -7240,7 +7240,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 801 type: WardrobeWhiteFilled @@ -7253,7 +7253,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 802 type: LockerMedicineFilled @@ -7266,7 +7266,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 803 type: LockerL3VirologyFilled @@ -7279,7 +7279,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 804 type: LockerSecurityFilled @@ -7292,7 +7292,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 805 type: LockerSecurityFilled @@ -7305,7 +7305,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 806 type: LockerSecurityFilled @@ -7318,7 +7318,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 807 type: WardrobeMedicalDoctorFilled @@ -7331,7 +7331,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 808 type: LockerL3SecurityFilled @@ -7344,7 +7344,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 809 type: LockerChiefMedicalOfficerFilled @@ -7357,7 +7357,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 810 type: TableGlass @@ -7377,7 +7377,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 812 type: LowWall @@ -7397,7 +7397,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 814 type: WardrobeAtmosphericsFilled @@ -7410,7 +7410,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 815 type: LockerAtmosphericsFilled @@ -7423,7 +7423,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 816 type: LockerAtmosphericsFilled @@ -7436,7 +7436,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 817 type: LockerChiefEngineerFilled @@ -7449,7 +7449,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 818 type: LockerEngineerFilled @@ -7462,7 +7462,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 819 type: LockerEngineerFilled @@ -7475,7 +7475,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 820 type: LockerResearchDirectorFilled @@ -7488,7 +7488,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 821 type: WardrobeScienceFilled @@ -7501,7 +7501,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 822 type: LockerL3JanitorFilled @@ -7514,7 +7514,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 823 type: LockerGeneric @@ -7527,7 +7527,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 824 type: TableGlass @@ -7640,7 +7640,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 839 type: DisposalBend @@ -7651,7 +7651,7 @@ entities: type: Transform - containers: DisposalBend: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 840 type: DisposalBend @@ -7662,7 +7662,7 @@ entities: type: Transform - containers: DisposalBend: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 841 type: DisposalBend @@ -7672,7 +7672,7 @@ entities: type: Transform - containers: DisposalBend: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 842 type: DisposalPipe @@ -7683,7 +7683,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 843 type: DisposalPipe @@ -7694,7 +7694,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 844 type: DisposalTrunk @@ -7705,7 +7705,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 845 type: DisposalUnit @@ -7716,7 +7716,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 846 type: DisposalPipe @@ -7727,7 +7727,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 847 type: DisposalPipe @@ -7737,7 +7737,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 848 type: DisposalPipe @@ -7747,7 +7747,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 849 type: DisposalPipe @@ -7757,7 +7757,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 850 type: DisposalPipe @@ -7767,7 +7767,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 851 type: DisposalPipe @@ -7777,7 +7777,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 852 type: DisposalPipe @@ -7788,7 +7788,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 853 components: @@ -20051,7 +20051,7 @@ entities: type: Transform - containers: microwave_entity_container: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 895 type: Table @@ -20515,7 +20515,7 @@ entities: board: entities: - 4024 - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 960 type: ChairOfficeDark @@ -20631,7 +20631,7 @@ entities: board: entities: - 3945 - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 974 type: ComputerId @@ -20648,7 +20648,7 @@ entities: board: entities: - 3946 - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 975 type: Table @@ -20702,7 +20702,7 @@ entities: board: entities: - 3992 - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 981 type: ChairOfficeDark @@ -20804,7 +20804,7 @@ entities: board: entities: - 4032 - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 993 type: Table @@ -21193,7 +21193,7 @@ entities: machine_board: entities: - 4272 - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container machine_parts: entities: - 4273 @@ -21202,7 +21202,7 @@ entities: - 4276 - 4277 - 4278 - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1044 type: Autolathe @@ -21222,7 +21222,7 @@ entities: machine_board: entities: - 871 - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container machine_parts: entities: - 872 @@ -21230,7 +21230,7 @@ entities: - 874 - 875 - 876 - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1045 type: ChairOfficeLight @@ -21344,7 +21344,7 @@ entities: board: entities: - 4009 - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1059 type: LowWall @@ -21778,7 +21778,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1105 type: DisposalUnit @@ -21788,7 +21788,7 @@ entities: type: Transform - containers: DisposalUnit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1106 type: SpawnPointBotanist @@ -22021,7 +22021,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1134 type: LowWall @@ -22087,7 +22087,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1142 type: Table @@ -22128,7 +22128,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1147 type: Table @@ -22176,7 +22176,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1153 type: Catwalk @@ -22196,7 +22196,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1155 type: WarpPoint @@ -22261,7 +22261,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1162 type: LockerElectricalSupplies @@ -22274,7 +22274,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1163 type: Catwalk @@ -22319,7 +22319,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1168 type: Table @@ -22819,7 +22819,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1221 type: Welder @@ -22845,7 +22845,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1224 type: Multitool @@ -22865,7 +22865,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1226 type: Poweredlight @@ -22966,7 +22966,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1234 type: Poweredlight @@ -26042,7 +26042,7 @@ entities: type: Transform - containers: BoltActionBarrel-ammo-container: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container BoltActionBarrel-chamber-container: type: Content.Server.GameObjects.ContainerSlot type: ContainerContainer @@ -26101,7 +26101,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1574 type: CrateGeneric @@ -26114,7 +26114,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 1575 type: Table @@ -31817,7 +31817,7 @@ entities: type: Transform - containers: storagebase: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 2385 type: solid_wall @@ -32019,7 +32019,7 @@ entities: board: entities: - 2414 - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 2413 type: solid_wall @@ -32112,7 +32112,7 @@ entities: type: Transform - containers: DisposalEntry: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 2426 type: VendingMachineSovietSoda @@ -32181,7 +32181,7 @@ entities: type: Transform - containers: storagebase: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 2435 type: VendingMachineCola @@ -32547,7 +32547,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 2486 type: CrateRadiation @@ -32560,7 +32560,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 2487 type: solid_wall @@ -32800,7 +32800,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 2517 type: SalternApc @@ -42878,7 +42878,7 @@ entities: type: Transform - containers: storagebase: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 3927 type: MetalStack @@ -42975,7 +42975,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 3940 type: Crowbar @@ -43242,7 +43242,7 @@ entities: type: Transform - containers: DisposalTransit: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 3973 type: FirelockGlass @@ -44554,7 +44554,7 @@ entities: type: Transform - containers: storagebase: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4138 type: TableR @@ -44602,7 +44602,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4144 type: LockerGeneric @@ -44615,7 +44615,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4145 type: Poweredlight @@ -44761,7 +44761,7 @@ entities: type: Transform - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container morgue_tray: type: Content.Server.GameObjects.ContainerSlot type: ContainerContainer @@ -44773,7 +44773,7 @@ entities: type: Transform - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container morgue_tray: type: Content.Server.GameObjects.ContainerSlot type: ContainerContainer @@ -44785,7 +44785,7 @@ entities: type: Transform - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container morgue_tray: type: Content.Server.GameObjects.ContainerSlot type: ContainerContainer @@ -44797,7 +44797,7 @@ entities: type: Transform - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container morgue_tray: type: Content.Server.GameObjects.ContainerSlot type: ContainerContainer @@ -44809,7 +44809,7 @@ entities: type: Transform - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container morgue_tray: type: Content.Server.GameObjects.ContainerSlot type: ContainerContainer @@ -44842,7 +44842,7 @@ entities: type: Transform - containers: storagebase: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4170 type: MagazinePistolSmgTopMounted @@ -44853,7 +44853,7 @@ entities: type: Transform - containers: RangedMagazine-magazine: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4171 type: MagazinePistolSmgTopMounted @@ -44864,7 +44864,7 @@ entities: type: Transform - containers: RangedMagazine-magazine: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4172 type: AirlockMedicalLocked @@ -44886,7 +44886,7 @@ entities: board: entities: - 4174 - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4174 type: BodyScannerComputerCircuitboard @@ -44965,7 +44965,7 @@ entities: ReagentGrinder-reagentContainerContainer: type: Content.Server.GameObjects.ContainerSlot ReagentGrinder-entityContainerContainer: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4183 type: ApcExtensionCable @@ -45104,7 +45104,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4202 type: LockerFreezer @@ -45117,7 +45117,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4203 type: Poweredlight @@ -45383,7 +45383,7 @@ entities: type: Transform - containers: storagebase: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4239 type: WeaponCapacitorRecharger @@ -45407,7 +45407,7 @@ entities: type: Transform - containers: storagebase: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4241 type: RadioHandheld @@ -45460,7 +45460,7 @@ entities: type: Transform - containers: microwave_entity_container: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4248 type: ClothingHeadHelmetScaf @@ -45478,7 +45478,7 @@ entities: type: Transform - containers: storagebase: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4250 type: Shelf @@ -45532,7 +45532,7 @@ entities: type: Transform - containers: RangedMagazine-magazine: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4256 type: BodyBag_Container @@ -45543,7 +45543,7 @@ entities: type: Transform - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container body_bag_label: type: Content.Server.GameObjects.ContainerSlot type: ContainerContainer @@ -45556,7 +45556,7 @@ entities: type: Transform - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container body_bag_label: type: Content.Server.GameObjects.ContainerSlot type: ContainerContainer @@ -45593,7 +45593,7 @@ entities: type: Transform - containers: storagebase: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4262 type: CarpetBlue @@ -48808,7 +48808,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4715 type: CrateServiceReplacementLights @@ -48821,7 +48821,7 @@ entities: type: PlaceableSurface - containers: EntityStorageComponent: - type: Robust.Server.GameObjects.Components.Container.Container + type: Robust.Server.GameObjects.Container type: ContainerContainer - uid: 4716 type: SalternSubstation diff --git a/RobustToolbox b/RobustToolbox index cbf01f0aa5..0ba2272cab 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit cbf01f0aa54dd1f380d776c27b2d376868dc134a +Subproject commit 0ba2272cab9c7fd73a79c717a9f0b950fb1a0c7a