diff --git a/Content.Benchmarks/ComponentManagerGetAllComponents.cs b/Content.Benchmarks/ComponentManagerGetAllComponents.cs index 3b1c3e1c6d9..db49d0974ee 100644 --- a/Content.Benchmarks/ComponentManagerGetAllComponents.cs +++ b/Content.Benchmarks/ComponentManagerGetAllComponents.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using BenchmarkDotNet.Attributes; using Moq; using Robust.Shared.Exceptions; diff --git a/Content.Client/Atmos/GasTileOverlay.cs b/Content.Client/Atmos/GasTileOverlay.cs index ec0cb330fa7..8f852d0ed11 100644 --- a/Content.Client/Atmos/GasTileOverlay.cs +++ b/Content.Client/Atmos/GasTileOverlay.cs @@ -1,25 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Content.Client.GameObjects.EntitySystems; -using Content.Client.Utility; -using JetBrains.Annotations; -using Robust.Client.Graphics; +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.Client.Interfaces.ResourceManagement; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Resources; using Robust.Shared.IoC; -using Robust.Shared.Log; -using Robust.Shared.Map; using Robust.Shared.Maths; -using Robust.Shared.Timing; -using Robust.Shared.Utility; namespace Content.Client.Atmos { diff --git a/Content.Client/Chat/ChatBox.cs b/Content.Client/Chat/ChatBox.cs index 7f3e1aa3ec1..eb37c86703a 100644 --- a/Content.Client/Chat/ChatBox.cs +++ b/Content.Client/Chat/ChatBox.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using Content.Shared.Chat; +using Content.Shared.Chat; using Robust.Client.Console; using Robust.Client.Graphics.Drawing; using Robust.Client.UserInterface; diff --git a/Content.Client/ClientContentIoC.cs b/Content.Client/ClientContentIoC.cs index 96c9e5a7c6a..9fe86a4b736 100644 --- a/Content.Client/ClientContentIoC.cs +++ b/Content.Client/ClientContentIoC.cs @@ -8,9 +8,7 @@ using Content.Client.Sandbox; using Content.Client.UserInterface; using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; -using Content.Shared.Chemistry; using Content.Shared.Interfaces; -using Content.Shared.Interfaces.Chemistry; using Robust.Shared.IoC; namespace Content.Client diff --git a/Content.Client/Command/CommunicationsConsoleMenu.cs b/Content.Client/Command/CommunicationsConsoleMenu.cs index 0a6804264c5..a04bb56edba 100644 --- a/Content.Client/Command/CommunicationsConsoleMenu.cs +++ b/Content.Client/Command/CommunicationsConsoleMenu.cs @@ -5,7 +5,6 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Log; using Robust.Shared.Maths; using Timer = Robust.Shared.Timers.Timer; diff --git a/Content.Client/Commands/DebugAiCommand.cs b/Content.Client/Commands/DebugAiCommand.cs index f5c3088215d..065da01baba 100644 --- a/Content.Client/Commands/DebugAiCommand.cs +++ b/Content.Client/Commands/DebugAiCommand.cs @@ -1,10 +1,7 @@ using Content.Client.GameObjects.EntitySystems.AI; using JetBrains.Annotations; using Robust.Client.Interfaces.Console; -using Robust.Client.Player; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; namespace Content.Client.Commands { diff --git a/Content.Client/Commands/DebugCommands.cs b/Content.Client/Commands/DebugCommands.cs index 510e1e25a8f..8ba7a3a9759 100644 --- a/Content.Client/Commands/DebugCommands.cs +++ b/Content.Client/Commands/DebugCommands.cs @@ -1,15 +1,12 @@ using Content.Client.GameObjects.Components; using Content.Client.GameObjects.EntitySystems; using Content.Client.Interfaces; -using Content.Shared.GameObjects.Components.Markers; -using Robust.Client.Console.Commands; +using Content.Shared.GameObjects; using Robust.Client.Interfaces.Console; using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -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 f1818231419..9c79bec8e71 100644 --- a/Content.Client/Commands/DebugPathfindingCommand.cs +++ b/Content.Client/Commands/DebugPathfindingCommand.cs @@ -2,8 +2,6 @@ using Content.Client.GameObjects.EntitySystems.AI; using JetBrains.Annotations; using Robust.Client.Interfaces.Console; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; namespace Content.Client.Commands { diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs index 837e79a79d5..9a3065d77c3 100644 --- a/Content.Client/EntryPoint.cs +++ b/Content.Client/EntryPoint.cs @@ -12,6 +12,8 @@ using Content.Client.UserInterface.Stylesheets; 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; using Content.Shared.GameObjects.Components.Markers; using Content.Shared.GameObjects.Components.Research; diff --git a/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs b/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs index e248993a756..c2b66a9b075 100644 --- a/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs +++ b/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs @@ -9,7 +9,6 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; namespace Content.Client.GameObjects.Components.Actor diff --git a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerBoundUserInterface.cs b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerBoundUserInterface.cs index c4907bc31d9..810d57182e0 100644 --- a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerBoundUserInterface.cs @@ -1,8 +1,5 @@ using Robust.Client.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface; -using System; -using System.Collections.Generic; -using System.Text; using static Content.Shared.GameObjects.Components.SharedGasAnalyzerComponent; namespace Content.Client.GameObjects.Components.Atmos diff --git a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerComponent.cs b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerComponent.cs index e8b9a297005..c39e425fe77 100644 --- a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerComponent.cs +++ b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerComponent.cs @@ -1,6 +1,6 @@ -using Content.Client.UserInterface.Stylesheets; +using System; +using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -8,9 +8,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Timing; using Robust.Shared.ViewVariables; -using System; -using System.Collections.Generic; -using System.Text; 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 1e06c0a9fe6..b7f7bbb39e8 100644 --- a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerMenu.cs +++ b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerMenu.cs @@ -1,19 +1,11 @@ -using System; -using Content.Client.Animations; -using Content.Client.GameObjects.EntitySystems; -using Content.Client.UserInterface.Stylesheets; +using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; -using Content.Shared.GameObjects.Components; using Content.Shared.Utility; -using Robust.Client.Animations; -using Robust.Client.Graphics; using Robust.Client.Graphics.Drawing; using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.Animations; -using Robust.Shared.Input; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs b/Content.Client/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs index 18b729b8cab..c29e62464bf 100644 --- a/Content.Client/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs +++ b/Content.Client/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs @@ -1,8 +1,8 @@ -using Content.Shared.GameObjects.Components.Cargo; +using System; +using System.Collections.Generic; +using Content.Shared.GameObjects.Components.Cargo; using Content.Shared.Prototypes.Cargo; using Robust.Shared.GameObjects; -using System; -using System.Collections.Generic; namespace Content.Client.GameObjects.Components.Cargo { diff --git a/Content.Client/GameObjects/Components/Cargo/GalacticMarketComponent.cs b/Content.Client/GameObjects/Components/Cargo/GalacticMarketComponent.cs index bb29dfd1d4e..1311900514f 100644 --- a/Content.Client/GameObjects/Components/Cargo/GalacticMarketComponent.cs +++ b/Content.Client/GameObjects/Components/Cargo/GalacticMarketComponent.cs @@ -1,9 +1,9 @@ -using Content.Shared.GameObjects.Components.Cargo; +using System; +using Content.Shared.GameObjects.Components.Cargo; using Content.Shared.Prototypes.Cargo; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; -using System; 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 27ab3de2567..1af6a39bb53 100644 --- a/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterBoundUserInterface.cs @@ -1,13 +1,12 @@ #nullable enable -using Content.Client.GameObjects.Components.Chemistry.ChemMaster; -using Content.Shared.GameObjects.Components.Chemistry; +using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser; using JetBrains.Annotations; using Robust.Client.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Localization; -using static Content.Shared.GameObjects.Components.Chemistry.SharedChemMasterComponent; +using static Content.Shared.GameObjects.Components.Chemistry.ChemMaster.SharedChemMasterComponent; -namespace Content.Client.GameObjects.Components.Chemistry +namespace Content.Client.GameObjects.Components.Chemistry.ChemMaster { /// /// Initializes a and updates it when new server messages are received. diff --git a/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs b/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs index 3a2dece8e99..08ec838c88c 100644 --- a/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs +++ b/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; using System.Linq; -using Content.Client.UserInterface; using Content.Client.UserInterface.Stylesheets; using Content.Shared.Chemistry; -using Content.Shared.GameObjects.Components.Chemistry; +using Content.Shared.GameObjects.Components.Chemistry.ChemMaster; using Robust.Client.Graphics.Drawing; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -12,10 +10,9 @@ using Robust.Client.UserInterface.CustomControls; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Prototypes; -using static Content.Shared.GameObjects.Components.Chemistry.SharedChemMasterComponent; +using static Content.Shared.GameObjects.Components.Chemistry.ChemMaster.SharedChemMasterComponent; namespace Content.Client.GameObjects.Components.Chemistry.ChemMaster { diff --git a/Content.Client/GameObjects/Components/Chemistry/InjectorComponent.cs b/Content.Client/GameObjects/Components/Chemistry/InjectorComponent.cs index 65569893407..fe1e71bbe5c 100644 --- a/Content.Client/GameObjects/Components/Chemistry/InjectorComponent.cs +++ b/Content.Client/GameObjects/Components/Chemistry/InjectorComponent.cs @@ -1,14 +1,13 @@ -using Content.Client.UserInterface; -using Content.Client.UserInterface.Stylesheets; +using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; -using Robust.Shared.Timing; +using Content.Shared.Chemistry; using Content.Shared.GameObjects.Components.Chemistry; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; using Robust.Shared.Localization; +using Robust.Shared.Timing; using Robust.Shared.ViewVariables; -using Content.Shared.Chemistry; namespace Content.Client.GameObjects.Components.Chemistry { diff --git a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs index 1aabef19dcc..ccf3a0f3b9a 100644 --- a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs @@ -1,15 +1,15 @@ using System.Collections.Generic; using System.Linq; -using Content.Shared.GameObjects.Components.Chemistry; +using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser; using JetBrains.Annotations; using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.IoC; using Robust.Shared.Localization; -using static Content.Shared.GameObjects.Components.Chemistry.SharedReagentDispenserComponent; +using static Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser.SharedReagentDispenserComponent; -namespace Content.Client.GameObjects.Components.Chemistry +namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser { /// /// Initializes a and updates it when new server messages are received. diff --git a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs index 66b5fd693f4..0389b9aa35b 100644 --- a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs +++ b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; -using Content.Client.UserInterface; using Content.Client.UserInterface.Stylesheets; using Content.Shared.Chemistry; -using Content.Shared.GameObjects.Components.Chemistry; +using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser; using Robust.Client.Graphics.Drawing; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -12,9 +11,9 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Prototypes; -using static Content.Shared.GameObjects.Components.Chemistry.SharedReagentDispenserComponent; +using static Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser.SharedReagentDispenserComponent; -namespace Content.Client.GameObjects.Components.Chemistry +namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser { /// /// Client-side UI used to control a diff --git a/Content.Client/GameObjects/Components/DamageableComponent.cs b/Content.Client/GameObjects/Components/DamageableComponent.cs index e19de318d30..2e425018949 100644 --- a/Content.Client/GameObjects/Components/DamageableComponent.cs +++ b/Content.Client/GameObjects/Components/DamageableComponent.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Robust.Shared.GameObjects; -namespace Content.Client.GameObjects +namespace Content.Client.GameObjects.Components { /// /// Fuck I really hate doing this diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs b/Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs index bb46144185c..b2e9ab7fb98 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs @@ -2,7 +2,6 @@ using JetBrains.Annotations; using Robust.Client.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.Localization; using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalUnitComponent; namespace Content.Client.GameObjects.Components.Disposal diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs b/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs index 2aa013469df..62e6bd1a242 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs +++ b/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs @@ -1,5 +1,4 @@ -using System.Runtime.CompilerServices; -using Content.Shared.GameObjects.Components.Disposal; +using Content.Shared.GameObjects.Components.Disposal; using Robust.Client.Graphics.Drawing; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs b/Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs index 450e73c2888..0ed0ad0a68f 100644 --- a/Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs @@ -1,4 +1,3 @@ -using System; using Content.Shared.GameObjects.Components.Gravity; using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs index 041f763cac8..26b1086f0a3 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using Content.Client.GameObjects.Components.Clothing; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.Preferences.Appearance; using Robust.Client.GameObjects; using Robust.Client.Interfaces.GameObjects.Components; @@ -10,9 +10,9 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; -using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage; +using static Content.Shared.GameObjects.Components.Inventory.SharedInventoryComponent.ClientInventoryMessage; -namespace Content.Client.GameObjects +namespace Content.Client.GameObjects.Components.HUD.Inventory { /// /// A character UI which shows items the user has equipped within his inventory diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs b/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs index 01d94b822b4..d08d3e12114 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs @@ -1,4 +1,6 @@ -using Content.Client.Utility; +using System.Collections.Generic; +using Content.Client.UserInterface; +using Content.Client.Utility; using JetBrains.Annotations; using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.UserInterface; @@ -9,10 +11,8 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; -using Content.Client.UserInterface; -using System.Collections.Generic; -namespace Content.Client.GameObjects +namespace Content.Client.GameObjects.Components.HUD.Inventory { // Dynamically instantiated by ClientInventoryComponent. [UsedImplicitly] diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs b/Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs index 091ca4d0973..12cf3375c26 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs @@ -8,7 +8,7 @@ using Robust.Shared.Input; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -namespace Content.Client.GameObjects +namespace Content.Client.GameObjects.Components.HUD.Inventory { public abstract class InventoryInterfaceController : IDisposable { diff --git a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs index 54d2a993974..7515d40d510 100644 --- a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs +++ b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; using Content.Client.GameObjects.EntitySystems; using JetBrains.Annotations; using Robust.Client.Interfaces.GameObjects.Components; diff --git a/Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs b/Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs index 69d364fd5f3..eeae34cbde1 100644 --- a/Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs +++ b/Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs @@ -4,16 +4,16 @@ using System.Collections.Generic; using System.Linq; using Content.Shared.GameObjects.Components.Instruments; using Content.Shared.Physics; -using Robust.Shared.GameObjects; using Robust.Client.Audio.Midi; +using Robust.Shared.Audio.Midi; +using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Players; using Robust.Shared.Serialization; +using Robust.Shared.Timers; using Robust.Shared.ViewVariables; -using MidiEvent = Robust.Shared.Audio.Midi.MidiEvent; -using Timer = Robust.Shared.Timers.Timer; namespace Content.Client.GameObjects.Components.Instruments { diff --git a/Content.Client/GameObjects/Components/Interactable/MultiToolComponent.cs b/Content.Client/GameObjects/Components/Interactable/MultiToolComponent.cs index 5eb67e8113c..70de6236219 100644 --- a/Content.Client/GameObjects/Components/Interactable/MultiToolComponent.cs +++ b/Content.Client/GameObjects/Components/Interactable/MultiToolComponent.cs @@ -1,12 +1,10 @@ -using System; -using Content.Client.UserInterface.Stylesheets; +using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Interactable; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; -using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Timing; using Robust.Shared.ViewVariables; diff --git a/Content.Client/GameObjects/Components/Items/ItemStatusComponent.cs b/Content.Client/GameObjects/Components/Items/ItemStatusComponent.cs index 7d4562ce02e..0a21bd8e438 100644 --- a/Content.Client/GameObjects/Components/Items/ItemStatusComponent.cs +++ b/Content.Client/GameObjects/Components/Items/ItemStatusComponent.cs @@ -1,6 +1,6 @@ using Robust.Shared.GameObjects; -namespace Content.Client.GameObjects +namespace Content.Client.GameObjects.Components.Items { [RegisterComponent] public class ItemStatusComponent : Component diff --git a/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs b/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs index 4fb4c8ce9fa..174b21e5b66 100644 --- a/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs @@ -1,21 +1,20 @@ using System; -using Robust.Client.GameObjects.Components.UserInterface; -using Content.Shared.Kitchen; -using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.IoC; -using Robust.Shared.Prototypes; -using Content.Shared.Chemistry; -using Robust.Shared.GameObjects; using System.Collections.Generic; -using Robust.Shared.Interfaces.GameObjects; +using Content.Shared.Chemistry; +using Content.Shared.Kitchen; using Robust.Client.GameObjects; +using Robust.Client.GameObjects.Components.UserInterface; 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; - +using Robust.Shared.Prototypes; namespace Content.Client.GameObjects.Components.Kitchen { diff --git a/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs b/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs index 63ecab02ccd..ab90668e243 100644 --- a/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs +++ b/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs @@ -7,7 +7,6 @@ using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Audio; using Robust.Shared.Log; - namespace Content.Client.GameObjects.Components.Kitchen { public sealed class MicrowaveVisualizer : AppearanceVisualizer diff --git a/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs b/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs index f44166c11f6..aea3434e61e 100644 --- a/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using Content.Client.UserInterface; using Content.Client.UserInterface.Stylesheets; using Content.Shared.Preferences.Appearance; using JetBrains.Annotations; diff --git a/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs b/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs index 9486ba6e830..68288ff66a9 100644 --- a/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs +++ b/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs @@ -2,7 +2,6 @@ using Content.Shared.GameObjects.Components.Mobs; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.Log; using Robust.Shared.Maths; diff --git a/Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs b/Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs index 46d5eb5872c..c294fa68cd6 100644 --- a/Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs +++ b/Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs @@ -1,13 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reflection; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.Interfaces; using Robust.Client.GameObjects; using Robust.Client.Graphics.Overlays; using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Client.Player; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; @@ -15,7 +13,6 @@ using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Players; -using Robust.Shared.Utility; using Robust.Shared.ViewVariables; namespace Content.Client.GameObjects.Components.Mobs diff --git a/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs b/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs index 4e08edbd12d..bcedfa84875 100644 --- a/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs +++ b/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs @@ -1,13 +1,10 @@ -using System; -using Content.Client.UserInterface; +using Content.Client.UserInterface; 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.Interfaces.Network; using Robust.Shared.IoC; -using Robust.Shared.Players; 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 556e066e1f1..83a3e4f70c5 100644 --- a/Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs +++ b/Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; +using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Mobs; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; -using DrawDepth = Content.Shared.GameObjects.DrawDepth; namespace Content.Client.GameObjects.Components.Mobs { diff --git a/Content.Client/GameObjects/Components/Observer/GhostComponent.cs b/Content.Client/GameObjects/Components/Observer/GhostComponent.cs index 611476f9be6..e0f2407a897 100644 --- a/Content.Client/GameObjects/Components/Observer/GhostComponent.cs +++ b/Content.Client/GameObjects/Components/Observer/GhostComponent.cs @@ -4,7 +4,6 @@ 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.ViewVariables; diff --git a/Content.Client/GameObjects/Components/Paper/PaperBoundUserInterface.cs b/Content.Client/GameObjects/Components/Paper/PaperBoundUserInterface.cs index b064d7519c9..87a609f89c4 100644 --- a/Content.Client/GameObjects/Components/Paper/PaperBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Paper/PaperBoundUserInterface.cs @@ -3,7 +3,7 @@ using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects.Components.UserInterface; -namespace Content.Client.GameObjects.Components +namespace Content.Client.GameObjects.Components.Paper { public class PaperBoundUserInterface : BoundUserInterface { diff --git a/Content.Client/GameObjects/Components/Paper/PaperWindow.cs b/Content.Client/GameObjects/Components/Paper/PaperWindow.cs index 27626258324..d2ac5dde080 100644 --- a/Content.Client/GameObjects/Components/Paper/PaperWindow.cs +++ b/Content.Client/GameObjects/Components/Paper/PaperWindow.cs @@ -4,7 +4,7 @@ using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Maths; using Robust.Shared.Utility; -namespace Content.Client.GameObjects.Components +namespace Content.Client.GameObjects.Components.Paper { public class PaperWindow : SS14Window { diff --git a/Content.Client/GameObjects/Components/Pointing/RoguePointingArrowVisualizer.cs b/Content.Client/GameObjects/Components/Pointing/RoguePointingArrowVisualizer.cs index 97de9d0b9f0..325147b76a7 100644 --- a/Content.Client/GameObjects/Components/Pointing/RoguePointingArrowVisualizer.cs +++ b/Content.Client/GameObjects/Components/Pointing/RoguePointingArrowVisualizer.cs @@ -1,5 +1,4 @@ using System; -using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Pointing; using JetBrains.Annotations; using Robust.Client.Animations; diff --git a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs index d240cc0c6c3..616997820e6 100644 --- a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs @@ -1,5 +1,4 @@ using System; -using Content.Client.UserInterface; using Content.Client.UserInterface.Stylesheets; using Content.Shared.GameObjects.Components.Power; using Robust.Client.GameObjects.Components.UserInterface; diff --git a/Content.Client/GameObjects/Components/Power/SolarControlConsoleBoundUserInterface.cs b/Content.Client/GameObjects/Components/Power/SolarControlConsoleBoundUserInterface.cs index 88ce1214434..17ce456aff1 100644 --- a/Content.Client/GameObjects/Components/Power/SolarControlConsoleBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Power/SolarControlConsoleBoundUserInterface.cs @@ -1,6 +1,4 @@ using System; -using Content.Client.UserInterface; -using Content.Client.UserInterface.Stylesheets; using Content.Shared.GameObjects.Components.Power; using Robust.Client.GameObjects.Components.UserInterface; using Robust.Client.Graphics.Drawing; diff --git a/Content.Client/GameObjects/Components/RadiatingLightComponent.cs b/Content.Client/GameObjects/Components/RadiatingLightComponent.cs index 76b57f2fb45..9cfa2721366 100644 --- a/Content.Client/GameObjects/Components/RadiatingLightComponent.cs +++ b/Content.Client/GameObjects/Components/RadiatingLightComponent.cs @@ -4,7 +4,6 @@ using Robust.Client.GameObjects; using Robust.Client.GameObjects.Components.Animations; using Robust.Shared.Animations; using Robust.Shared.GameObjects; -using Robust.Shared.Maths; namespace Content.Client.GameObjects.Components { diff --git a/Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs b/Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs index 6c6473a3f10..f521c0c3a7a 100644 --- a/Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs +++ b/Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs @@ -4,14 +4,12 @@ using Content.Shared.Physics; using Robust.Client.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.Timers; -using Robust.Shared.Utility; 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 affff8473d3..4c5d5dce364 100644 --- a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs +++ b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using Content.Client.GameObjects.Components.Items; -using Content.Shared.GameObjects.Components.Storage; using Content.Client.Interfaces.GameObjects.Components.Interaction; +using Content.Shared.GameObjects.Components.Storage; using Robust.Client.Graphics.Drawing; using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Client.Player; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; diff --git a/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs b/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs index 76bce4a4200..b31af5f4b71 100644 --- a/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs +++ b/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs @@ -1,5 +1,5 @@ using System; -using Content.Shared.GameObjects.Components.Triggers; +using Content.Shared.GameObjects.Components.Trigger; using Robust.Client.Animations; using Robust.Client.GameObjects; using Robust.Client.GameObjects.Components.Animations; @@ -8,7 +8,7 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; -namespace Content.Client.GameObjects.Components.Doors +namespace Content.Client.GameObjects.Components.Trigger { public class TimerTriggerVisualizer : AppearanceVisualizer { diff --git a/Content.Client/GameObjects/Components/Wires/WiresMenu.cs b/Content.Client/GameObjects/Components/Wires/WiresMenu.cs index 53e1a320641..a3fcda48614 100644 --- a/Content.Client/GameObjects/Components/Wires/WiresMenu.cs +++ b/Content.Client/GameObjects/Components/Wires/WiresMenu.cs @@ -5,7 +5,6 @@ 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.Interfaces.ResourceManagement; using Robust.Client.UserInterface; diff --git a/Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs b/Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs index 9b662176123..a46f038e67d 100644 --- a/Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs @@ -1,11 +1,9 @@ using Content.Client.GameObjects.Components.Actor; using Content.Client.UserInterface; using Content.Shared.Input; -using Robust.Client.GameObjects.EntitySystems; using Robust.Client.Player; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Input; 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 ccfb3ac7d08..80cd1fbb0ff 100644 --- a/Content.Client/GameObjects/EntitySystems/ClientInventorySystem.cs +++ b/Content.Client/GameObjects/EntitySystems/ClientInventorySystem.cs @@ -1,10 +1,9 @@ +using Content.Client.GameObjects.Components.HUD.Inventory; using Content.Client.UserInterface; using Content.Shared.Input; -using Robust.Client.GameObjects.EntitySystems; using Robust.Client.Player; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Input; 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 1ea36b6ae09..9daa25095b9 100644 --- a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs @@ -1,25 +1,16 @@ using Content.Client.GameObjects.Components.Mobs; using Content.Client.UserInterface; -using Content.Client.Utility; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Input; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.GameObjects.EntitySystems; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Graphics.Overlays; -using Robust.Client.Interfaces.Graphics.Overlays; -using Robust.Client.Interfaces.Input; using Robust.Client.Player; -using Robust.Shared.Input; using Robust.Shared.Input.Binding; using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; -using Robust.Shared.Maths; using Robust.Shared.Players; -using static Content.Client.StaticIoC; namespace Content.Client.GameObjects.EntitySystems { diff --git a/Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs b/Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs index 700393b9c55..09a4beea424 100644 --- a/Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs @@ -3,6 +3,7 @@ using Content.Client.Construction; using Content.Client.GameObjects.Components.Construction; using Content.Client.UserInterface; using Content.Shared.Construction; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Input; using JetBrains.Annotations; using Robust.Client.GameObjects; @@ -21,7 +22,7 @@ namespace Content.Client.GameObjects.EntitySystems /// The client-side implementation of the construction system, which is used for constructing entities in game. /// [UsedImplicitly] - public class ConstructionSystem : Shared.GameObjects.EntitySystems.SharedConstructionSystem + public class ConstructionSystem : SharedConstructionSystem { #pragma warning disable 649 [Dependency] private readonly IGameHud _gameHud; diff --git a/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs b/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs index fe8eae89598..66a5f1592c9 100644 --- a/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs @@ -95,8 +95,8 @@ namespace Content.Client.GameObjects.EntitySystems _dropTargetInRangeShader = _prototypeManager.Index(ShaderDropTargetInRange).Instance(); _dropTargetOutOfRangeShader = _prototypeManager.Index(ShaderDropTargetOutOfRange).Instance(); - _interactionSystem = EntitySystem.Get(); - _inputSystem = EntitySystem.Get(); + _interactionSystem = Get(); + _inputSystem = Get(); // needs to fire on mouseup and mousedown so we can detect a drag / drop CommandBinds.Builder .Bind(EngineKeyFunctions.Use, new PointerInputCmdHandler(OnUse, false)) diff --git a/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs b/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs index 79d297bd340..86f0f9e52d7 100644 --- a/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs @@ -5,7 +5,6 @@ using Content.Shared.GameObjects.EntitySystemMessages; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Input; using JetBrains.Annotations; -using Robust.Client.GameObjects.EntitySystems; using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.Input; using Robust.Client.Interfaces.UserInterface; @@ -13,7 +12,6 @@ using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; -using Robust.Shared.Input; using Robust.Shared.Input.Binding; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; @@ -109,7 +107,7 @@ namespace Content.Client.GameObjects.EntitySystems FormattedMessage message; if (entity.Uid.IsClientSide()) { - message = ExamineSystem.GetExamineText(entity, _playerManager.LocalPlayer.ControlledEntity); + message = GetExamineText(entity, _playerManager.LocalPlayer.ControlledEntity); } else { diff --git a/Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs b/Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs index 1e2f0220af5..a3eeadd0d32 100644 --- a/Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs +++ b/Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs @@ -1,22 +1,16 @@ using System; using System.Collections.Generic; -using System.Linq; -using Content.Client.Atmos; -using Content.Client.Utility; using Content.Shared.Atmos; using Content.Shared.GameObjects.EntitySystems; 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.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; -using Robust.Shared.Prototypes; using Robust.Shared.Utility; namespace Content.Client.GameObjects.EntitySystems diff --git a/Content.Client/GameObjects/EntitySystems/MoverSystem.cs b/Content.Client/GameObjects/EntitySystems/MoverSystem.cs index e0d161b649f..b16cea16729 100644 --- a/Content.Client/GameObjects/EntitySystems/MoverSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/MoverSystem.cs @@ -1,7 +1,6 @@ #nullable enable using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.EntitySystems; -using Content.Shared.Physics; using JetBrains.Annotations; using Robust.Client.Physics; using Robust.Client.Player; diff --git a/Content.Client/GameObjects/EntitySystems/StatusEffectsSystem.cs b/Content.Client/GameObjects/EntitySystems/StatusEffectsSystem.cs index 65476ce25e4..a0fd868b2c1 100644 --- a/Content.Client/GameObjects/EntitySystems/StatusEffectsSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/StatusEffectsSystem.cs @@ -1,5 +1,4 @@ using Content.Client.GameObjects.Components.Mobs; -using Content.Shared.GameObjects.Components.Mobs; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.Timing; diff --git a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs index 6c5fc114455..9d730133216 100644 --- a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs @@ -6,8 +6,8 @@ using System.Threading; using Content.Client.State; using Content.Client.UserInterface; using Content.Client.Utility; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.EntitySystemMessages; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Input; using JetBrains.Annotations; using Robust.Client.GameObjects.EntitySystems; diff --git a/Content.Client/GlobalVerbs/ExamineVerb.cs b/Content.Client/GlobalVerbs/ExamineVerb.cs index 33b8f38027f..13e61984903 100644 --- a/Content.Client/GlobalVerbs/ExamineVerb.cs +++ b/Content.Client/GlobalVerbs/ExamineVerb.cs @@ -1,5 +1,5 @@ using Content.Client.GameObjects.EntitySystems; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Verbs; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Client/GlobalVerbs/ViewVariablesVerb.cs b/Content.Client/GlobalVerbs/ViewVariablesVerb.cs index acaa118f09c..93e2f1f39a7 100644 --- a/Content.Client/GlobalVerbs/ViewVariablesVerb.cs +++ b/Content.Client/GlobalVerbs/ViewVariablesVerb.cs @@ -1,4 +1,4 @@ -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Verbs; using Robust.Client.Console; using Robust.Client.ViewVariables; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Client/Graphics/Overlays/FlashOverlay.cs b/Content.Client/Graphics/Overlays/FlashOverlay.cs index 2d76466b32a..cf56eb796e1 100644 --- a/Content.Client/Graphics/Overlays/FlashOverlay.cs +++ b/Content.Client/Graphics/Overlays/FlashOverlay.cs @@ -1,20 +1,16 @@ -using System.Net.Mime; -using Content.Shared.GameObjects.Components.Mobs; +using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.Interfaces; 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.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; -using Robust.Shared.Timing; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; -using Color = Robust.Shared.Maths.Color; namespace Content.Client.Graphics.Overlays { diff --git a/Content.Client/Health/BodySystem/BodyScanner/BodyScannerBoundUserInterface.cs b/Content.Client/Health/BodySystem/BodyScanner/BodyScannerBoundUserInterface.cs index 382712cf844..5bf9bec18bb 100644 --- a/Content.Client/Health/BodySystem/BodyScanner/BodyScannerBoundUserInterface.cs +++ b/Content.Client/Health/BodySystem/BodyScanner/BodyScannerBoundUserInterface.cs @@ -1,12 +1,10 @@ -using Content.Client.UserInterface; -using Content.Shared.BodySystem; +using System.Collections.Generic; +using Content.Shared.Health.BodySystem.BodyScanner; using Robust.Client.GameObjects.Components.UserInterface; -using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.ViewVariables; -using System.Collections.Generic; -namespace Content.Client.BodySystem +namespace Content.Client.Health.BodySystem.BodyScanner { public class BodyScannerBoundUserInterface : BoundUserInterface { @@ -40,7 +38,7 @@ namespace Content.Client.BodySystem _template = scannerState.Template; _parts = scannerState.Parts; - + _display.UpdateDisplay(_template, _parts); } diff --git a/Content.Client/Health/BodySystem/BodyScanner/BodyScannerDisplay.cs b/Content.Client/Health/BodySystem/BodyScanner/BodyScannerDisplay.cs index 8df49bc53eb..d997c732164 100644 --- a/Content.Client/Health/BodySystem/BodyScanner/BodyScannerDisplay.cs +++ b/Content.Client/Health/BodySystem/BodyScanner/BodyScannerDisplay.cs @@ -1,20 +1,14 @@ -using Content.Client.BodySystem; -using Content.Shared.BodySystem; -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.ResourceManagement; +using System.Collections.Generic; +using System.Globalization; +using Content.Shared.Health.BodySystem.BodyScanner; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Client.Utility; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; -using Robust.Shared.Utility; -using System; -using System.Collections.Generic; -using System.Globalization; using static Robust.Client.UserInterface.Controls.ItemList; -namespace Content.Client.UserInterface +namespace Content.Client.Health.BodySystem.BodyScanner { public sealed class BodyScannerDisplay : SS14Window { @@ -33,7 +27,7 @@ namespace Content.Client.UserInterface private BodyScannerTemplateData _template; private Dictionary _parts; - private List _slots; + private List _slots; private BodyScannerBodyPartData _currentBodyPart; @@ -100,7 +94,7 @@ namespace Content.Client.UserInterface public void UpdateDisplay(BodyScannerTemplateData template, Dictionary parts) { - _template = template; + _template = template; _parts = parts; _slots = new List(); BodyPartList.Clear(); diff --git a/Content.Client/Health/BodySystem/Surgery/GenericSurgeryBoundUserInterface.cs b/Content.Client/Health/BodySystem/Surgery/GenericSurgeryBoundUserInterface.cs index 1079a939ce7..04c0246e836 100644 --- a/Content.Client/Health/BodySystem/Surgery/GenericSurgeryBoundUserInterface.cs +++ b/Content.Client/Health/BodySystem/Surgery/GenericSurgeryBoundUserInterface.cs @@ -1,15 +1,8 @@ -using System; -using System.Collections.Generic; +using Content.Shared.Health.BodySystem.Surgery; using Robust.Client.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.IoC; -using Robust.Shared.Prototypes; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Network; -using Robust.Shared.Players; -using Content.Shared.BodySystem; -namespace Content.Client.BodySystem +namespace Content.Client.Health.BodySystem.Surgery { //TODO : Make window close if target or surgery tool gets too far away from user. diff --git a/Content.Client/Health/BodySystem/Surgery/GenericSurgeryWindow.cs b/Content.Client/Health/BodySystem/Surgery/GenericSurgeryWindow.cs index f83ae9163f5..baae1b145cb 100644 --- a/Content.Client/Health/BodySystem/Surgery/GenericSurgeryWindow.cs +++ b/Content.Client/Health/BodySystem/Surgery/GenericSurgeryWindow.cs @@ -1,14 +1,13 @@ -using Robust.Client.UserInterface; +using System; +using System.Collections.Generic; +using System.Globalization; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Localization; using Robust.Shared.Maths; -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Text; -namespace Content.Client.BodySystem +namespace Content.Client.Health.BodySystem.Surgery { public class GenericSurgeryWindow : SS14Window { diff --git a/Content.Client/Instruments/InstrumentMenu.cs b/Content.Client/Instruments/InstrumentMenu.cs index 50f480143da..3acacb3f346 100644 --- a/Content.Client/Instruments/InstrumentMenu.cs +++ b/Content.Client/Instruments/InstrumentMenu.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using Content.Client.GameObjects.Components.Instruments; using Content.Client.UserInterface.Stylesheets; using Content.Shared.GameObjects.EntitySystems; diff --git a/Content.Client/Jobs/ClownSpecial.cs b/Content.Client/Jobs/ClownSpecial.cs index 8c4af7de1d7..e5cd37f1e1b 100644 --- a/Content.Client/Jobs/ClownSpecial.cs +++ b/Content.Client/Jobs/ClownSpecial.cs @@ -1,4 +1,4 @@ -using Content.Server.Jobs; +using Content.Shared.Roles; using JetBrains.Annotations; namespace Content.Client.Jobs diff --git a/Content.Client/Parallax/ParallaxGenerator.cs b/Content.Client/Parallax/ParallaxGenerator.cs index b9e532a8a25..ab358c2b413 100644 --- a/Content.Client/Parallax/ParallaxGenerator.cs +++ b/Content.Client/Parallax/ParallaxGenerator.cs @@ -9,7 +9,6 @@ using Robust.Shared.Maths; using Robust.Shared.Noise; using Robust.Shared.Random; using SixLabors.ImageSharp; -using SixLabors.ImageSharp.Advanced; using SixLabors.ImageSharp.PixelFormats; using Color = Robust.Shared.Maths.Color; diff --git a/Content.Client/Sandbox/SandboxManager.cs b/Content.Client/Sandbox/SandboxManager.cs index d1e7de96946..5e5cda1aa07 100644 --- a/Content.Client/Sandbox/SandboxManager.cs +++ b/Content.Client/Sandbox/SandboxManager.cs @@ -7,7 +7,6 @@ using Robust.Client.Interfaces.Placement; using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.Input; using Robust.Shared.Input.Binding; using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Network; diff --git a/Content.Client/ScreenshotHook.cs b/Content.Client/ScreenshotHook.cs index f3a7565bed3..238288ab5f8 100644 --- a/Content.Client/ScreenshotHook.cs +++ b/Content.Client/ScreenshotHook.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using Content.Shared.Input; using Robust.Client.Interfaces.Graphics; using Robust.Client.Interfaces.Input; -using Robust.Shared.Input; using Robust.Shared.Input.Binding; using Robust.Shared.Interfaces.Resources; using Robust.Shared.IoC; diff --git a/Content.Client/State/GameScreen.cs b/Content.Client/State/GameScreen.cs index 5449ed7e3b9..98425026b5a 100644 --- a/Content.Client/State/GameScreen.cs +++ b/Content.Client/State/GameScreen.cs @@ -1,20 +1,13 @@ -using System.Collections.Generic; -using System.Collections.Immutable; using Content.Client.Chat; using Content.Client.Interfaces.Chat; using Content.Client.UserInterface; using Content.Shared.Input; -using Robust.Client.Console; using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.State; using Robust.Client.Interfaces.UserInterface; using Robust.Client.UserInterface.Controls; -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.Map; using Robust.Shared.ViewVariables; namespace Content.Client.State diff --git a/Content.Client/State/GameScreenBase.cs b/Content.Client/State/GameScreenBase.cs index d16119a4a24..1372dacce55 100644 --- a/Content.Client/State/GameScreenBase.cs +++ b/Content.Client/State/GameScreenBase.cs @@ -5,11 +5,10 @@ using Content.Client.GameObjects.Components; using Content.Shared.GameObjects.EntitySystems; using Robust.Client.GameObjects.EntitySystems; using Robust.Client.Interfaces.GameObjects; -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.Interfaces.State; +using Robust.Client.Interfaces.UserInterface; using Robust.Client.Player; using Robust.Shared.GameObjects; using Robust.Shared.Input; diff --git a/Content.Client/State/LobbyState.cs b/Content.Client/State/LobbyState.cs index 5f4b6853e05..23f1d28d831 100644 --- a/Content.Client/State/LobbyState.cs +++ b/Content.Client/State/LobbyState.cs @@ -9,10 +9,8 @@ using Robust.Client.Interfaces; using Robust.Client.Interfaces.Input; using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.UserInterface; -using Robust.Client.UserInterface.CustomControls; using Robust.Client.Player; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Input; using Robust.Shared.Input.Binding; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs b/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs index 3626f72faa0..f5f05f50c02 100644 --- a/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs +++ b/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs @@ -1,4 +1,7 @@ -using Content.Client.GameObjects.Components.Cargo; +using System; +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.UserInterface.Controls; @@ -7,9 +10,6 @@ using Robust.Client.Utility; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; -using System; -using System.Collections.Generic; -using Content.Client.UserInterface.Stylesheets; namespace Content.Client.UserInterface.Cargo { diff --git a/Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs b/Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs index a831c90ccc7..5c2b4460f03 100644 --- a/Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs +++ b/Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs @@ -1,10 +1,8 @@ -using Robust.Client.UserInterface.Controls; +using System.Collections.Generic; +using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Maths; -using System; -using System.Collections.Generic; namespace Content.Client.UserInterface.Cargo { diff --git a/Content.Client/UserInterface/Cargo/GalacticBankSelectionMenu.cs b/Content.Client/UserInterface/Cargo/GalacticBankSelectionMenu.cs index cc4dfb1e830..25c90ee7f82 100644 --- a/Content.Client/UserInterface/Cargo/GalacticBankSelectionMenu.cs +++ b/Content.Client/UserInterface/Cargo/GalacticBankSelectionMenu.cs @@ -5,8 +5,6 @@ using Robust.Client.UserInterface.CustomControls; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; -using System; -using static Robust.Client.UserInterface.Controls.ItemList; namespace Content.Client.UserInterface.Cargo { diff --git a/Content.Client/UserInterface/CharacterSetupGui.cs b/Content.Client/UserInterface/CharacterSetupGui.cs index 4b6f9f4049f..5ca0d6d5644 100644 --- a/Content.Client/UserInterface/CharacterSetupGui.cs +++ b/Content.Client/UserInterface/CharacterSetupGui.cs @@ -3,8 +3,8 @@ using Content.Client.GameObjects.Components.Mobs; using Content.Client.Interfaces; using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; -using Content.Shared.Jobs; using Content.Shared.Preferences; +using Content.Shared.Roles; using Robust.Client.GameObjects; using Robust.Client.Graphics.Drawing; using Robust.Client.Interfaces.ResourceManagement; diff --git a/Content.Client/UserInterface/CooldownGraphic.cs b/Content.Client/UserInterface/CooldownGraphic.cs index fb440af9524..777ec9e1d93 100644 --- a/Content.Client/UserInterface/CooldownGraphic.cs +++ b/Content.Client/UserInterface/CooldownGraphic.cs @@ -1,13 +1,12 @@ -using Robust.Client.Graphics.Drawing; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Client.Interfaces.Graphics; -using Robust.Shared.Maths; -using System; +using System; +using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Shaders; +using Robust.Client.UserInterface; using Robust.Shared.IoC; +using Robust.Shared.Maths; using Robust.Shared.Prototypes; -namespace Robust.Client.UserInterface.Controls +namespace Content.Client.UserInterface { public class CooldownGraphic : Control diff --git a/Content.Client/UserInterface/GameHud.cs b/Content.Client/UserInterface/GameHud.cs index 318e1c051f7..fa2c6cf000b 100644 --- a/Content.Client/UserInterface/GameHud.cs +++ b/Content.Client/UserInterface/GameHud.cs @@ -8,12 +8,10 @@ using Robust.Client.Interfaces.Input; using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Input; using Robust.Shared.Input.Binding; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; -using static Robust.Client.UserInterface.Control; namespace Content.Client.UserInterface { diff --git a/Content.Client/UserInterface/GhostGui.cs b/Content.Client/UserInterface/GhostGui.cs index 959b3beff6c..5ac6e1a7ccf 100644 --- a/Content.Client/UserInterface/GhostGui.cs +++ b/Content.Client/UserInterface/GhostGui.cs @@ -1,4 +1,3 @@ -using System.Data; using Content.Client.GameObjects.Components.Observer; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/UserInterface/HumanoidProfileEditor.cs b/Content.Client/UserInterface/HumanoidProfileEditor.cs index 8bcc069762d..625cffd16e3 100644 --- a/Content.Client/UserInterface/HumanoidProfileEditor.cs +++ b/Content.Client/UserInterface/HumanoidProfileEditor.cs @@ -3,11 +3,9 @@ using System.Collections.Generic; using System.Linq; using Content.Client.GameObjects.Components; using Content.Client.Interfaces; -using Content.Client.Utility; using Content.Shared; -using Content.Shared.Jobs; -using Content.Shared.Antags; using Content.Shared.Preferences; +using Content.Shared.Roles; using Robust.Client.Graphics.Drawing; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -18,7 +16,6 @@ using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -using static Content.Client.StaticIoC; namespace Content.Client.UserInterface { diff --git a/Content.Client/UserInterface/IItemSlotManager.cs b/Content.Client/UserInterface/IItemSlotManager.cs index 9c233259764..f6f34c79031 100644 --- a/Content.Client/UserInterface/IItemSlotManager.cs +++ b/Content.Client/UserInterface/IItemSlotManager.cs @@ -1,5 +1,4 @@ -using Content.Client.GameObjects; -using Robust.Client.UserInterface; +using Robust.Client.UserInterface; using Robust.Shared.Interfaces.GameObjects; namespace Content.Client.UserInterface diff --git a/Content.Client/UserInterface/ItemSlotButton.cs b/Content.Client/UserInterface/ItemSlotButton.cs index 1438b48c882..24ed144d4cb 100644 --- a/Content.Client/UserInterface/ItemSlotButton.cs +++ b/Content.Client/UserInterface/ItemSlotButton.cs @@ -1,5 +1,4 @@ using System; -using Content.Shared.GameObjects.Components.Items; using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/UserInterface/ItemSlotManager.cs b/Content.Client/UserInterface/ItemSlotManager.cs index 2186d4e4eef..d7d4c1e78d7 100644 --- a/Content.Client/UserInterface/ItemSlotManager.cs +++ b/Content.Client/UserInterface/ItemSlotManager.cs @@ -1,17 +1,12 @@ -using System; -using Content.Client.GameObjects; -using Content.Client.GameObjects.Components.Storage; +using Content.Client.GameObjects.Components.Storage; using Content.Client.GameObjects.EntitySystems; -using Content.Client.Utility; using Content.Shared.GameObjects.Components.Items; using Content.Shared.Input; using Robust.Client.GameObjects; using Robust.Client.GameObjects.EntitySystems; -using Robust.Client.Graphics; using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Shared.Input; diff --git a/Content.Client/UserInterface/LateJoinGui.cs b/Content.Client/UserInterface/LateJoinGui.cs index 02edca1d924..30f662ae80b 100644 --- a/Content.Client/UserInterface/LateJoinGui.cs +++ b/Content.Client/UserInterface/LateJoinGui.cs @@ -1,19 +1,18 @@ +using System; +using System.Linq; +using Content.Shared.Roles; using Robust.Client.Console; using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.CustomControls; using Robust.Client.Utility; -using Content.Shared.Jobs; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Robust.Client.UserInterface.CustomControls +namespace Content.Client.UserInterface { public sealed class LateJoinGui : SS14Window { diff --git a/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs b/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs index c5df73e0015..b4dcdca7fb9 100644 --- a/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs +++ b/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs @@ -1,10 +1,10 @@ using System.Linq; -using Content.Client.GameObjects; +using Content.Client.GameObjects.Components.HUD.Inventory; using Content.Client.GameObjects.Components.Mobs; using Content.Client.Interfaces; using Content.Shared; -using Content.Shared.Jobs; using Content.Shared.Preferences; +using Content.Shared.Roles; using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/UserInterface/RoundEndSummaryWindow.cs b/Content.Client/UserInterface/RoundEndSummaryWindow.cs index 5e8600b1881..5f2d736d9cb 100644 --- a/Content.Client/UserInterface/RoundEndSummaryWindow.cs +++ b/Content.Client/UserInterface/RoundEndSummaryWindow.cs @@ -1,19 +1,12 @@ -using Robust.Client.Graphics; -using Robust.Client.Interfaces.Input; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Client.ResourceManagement; +using System; +using System.Collections.Generic; +using System.Linq; +using Content.Client.Utility; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; -using Content.Client.Utility; -using Robust.Client.Player; -using System.Linq; -using System.Collections.Generic; -using static Robust.Client.UserInterface.Controls.ItemList; using static Content.Shared.SharedGameTicker; -using System; namespace Content.Client.UserInterface { diff --git a/Content.IntegrationTests/Tests/AI/AiControllerTest.cs b/Content.IntegrationTests/Tests/AI/AiControllerTest.cs index 7c2b1b3371f..12517b2092a 100644 --- a/Content.IntegrationTests/Tests/AI/AiControllerTest.cs +++ b/Content.IntegrationTests/Tests/AI/AiControllerTest.cs @@ -1,23 +1,19 @@ -using NUnit.Framework; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.Map; -using Robust.Shared.Prototypes; -using System; +using System; using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.GameObjects.Components.Movement; -using Content.Shared.VendingMachines; +using NUnit.Framework; using Robust.Server.AI; -using Robust.Shared.Log; -using Robust.Server.Interfaces.Maps; -using Robust.Server.Interfaces.Timing; +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.Maths; +using Robust.Shared.Prototypes; -namespace Content.IntegrationTests.Tests +namespace Content.IntegrationTests.Tests.AI { [TestFixture] [TestOf(typeof(AiControllerTest))] @@ -47,7 +43,7 @@ namespace Content.IntegrationTests.Tests Assert.That(attrib != null, $"No AiLogicProcessorAttribute found on {processor.Name}"); processorNames.Add(attrib.SerializeName); } - + foreach (var entity in prototypeManager.EnumeratePrototypes()) { var comps = entity.Components; diff --git a/Content.IntegrationTests/Tests/BuckleTest.cs b/Content.IntegrationTests/Tests/BuckleTest.cs index 34049ade76a..e2ada13caae 100644 --- a/Content.IntegrationTests/Tests/BuckleTest.cs +++ b/Content.IntegrationTests/Tests/BuckleTest.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Buckle; +using Content.Server.GameObjects.Components.Strap; using Content.Shared.GameObjects.Components.Buckle; using Content.Shared.GameObjects.EntitySystems; using NUnit.Framework; @@ -7,7 +8,6 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; -using StrapComponent = Content.Server.GameObjects.Components.Strap.StrapComponent; namespace Content.IntegrationTests.Tests { diff --git a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs index c3b84b42b56..3ab0b0c837c 100644 --- a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs +++ b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs @@ -1,6 +1,5 @@ using System.Linq; using System.Threading.Tasks; -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Items.Storage; using NUnit.Framework; using Robust.Client.GameObjects; diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs index b8d887ead54..15b21676311 100644 --- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs +++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs @@ -5,7 +5,6 @@ using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Disposal; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using NUnit.Framework; -using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; diff --git a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs index 7ddb2ef944b..5c6fdcfe387 100644 --- a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs +++ b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs @@ -1,7 +1,7 @@ using System.Threading; using System.Threading.Tasks; using Content.Server.GameObjects.Components; -using Content.Server.GameObjects.EntitySystems; +using Content.Server.GameObjects.EntitySystems.DoAfter; using NUnit.Framework; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; @@ -9,7 +9,6 @@ using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; -using Robust.Shared.Maths; namespace Content.IntegrationTests.Tests.DoAfter { @@ -35,7 +34,7 @@ namespace Content.IntegrationTests.Tests.DoAfter var args = new DoAfterEventArgs(mob, tickTime / 2, cancelToken.Token); task = EntitySystem.Get().DoAfter(args); }); - + await server.WaitRunTicks(1); Assert.That(task.Result == DoAfterStatus.Finished); } @@ -63,4 +62,4 @@ namespace Content.IntegrationTests.Tests.DoAfter Assert.That(task.Result == DoAfterStatus.Cancelled, $"Result was {task.Result}"); } } -} \ No newline at end of file +} diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index 288105ab429..4df604e4ada 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -1,20 +1,21 @@ -using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using NUnit.Framework; +using Robust.Server.Interfaces.Maps; +using Robust.Server.Interfaces.Timing; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; -using Robust.Shared.Map; -using Robust.Shared.Prototypes; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using Robust.Shared.Log; -using Robust.Server.Interfaces.Maps; -using Robust.Server.Interfaces.Timing; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Prototypes; namespace Content.IntegrationTests.Tests { [TestFixture] - [TestOf(typeof(Robust.Shared.GameObjects.Entity))] + [TestOf(typeof(Entity))] public class EntityTest : ContentIntegrationTest { [Test] @@ -41,7 +42,7 @@ namespace Content.IntegrationTests.Tests server.Assert(() => { - var testLocation = new GridCoordinates(new Robust.Shared.Maths.Vector2(0, 0), grid); + var testLocation = new GridCoordinates(new Vector2(0, 0), grid); //Generate list of non-abstract prototypes to test foreach (var prototype in prototypeMan.EnumeratePrototypes()) diff --git a/Content.IntegrationTests/Tests/GravityGridTest.cs b/Content.IntegrationTests/Tests/GravityGridTest.cs index dcf9b23d3f8..82c694b26a3 100644 --- a/Content.IntegrationTests/Tests/GravityGridTest.cs +++ b/Content.IntegrationTests/Tests/GravityGridTest.cs @@ -1,8 +1,6 @@ using System.Threading.Tasks; -using Content.Client.GameObjects.Components.Gravity; using Content.Server.GameObjects.Components.Gravity; using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.GameObjects.Components.Power; using NUnit.Framework; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; diff --git a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs index 2281118b12e..3f2b1ca4f82 100644 --- a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs +++ b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs @@ -1,11 +1,10 @@ using System.Threading.Tasks; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.GUI; using NUnit.Framework; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; -using Robust.Shared.Maths; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; namespace Content.IntegrationTests.Tests diff --git a/Content.Server.Database/Migrations/Postgres/PostgresPreferencesDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresPreferencesDbContextModelSnapshot.cs index 0343886635d..9429c9c003e 100644 --- a/Content.Server.Database/Migrations/Postgres/PostgresPreferencesDbContextModelSnapshot.cs +++ b/Content.Server.Database/Migrations/Postgres/PostgresPreferencesDbContextModelSnapshot.cs @@ -1,8 +1,7 @@ // -using Content.Server.Database; + using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace Content.Server.Database.Migrations.Postgres diff --git a/Content.Server.Database/Migrations/Sqlite/20200118020532_initial.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20200118020532_initial.Designer.cs index 001d5c6a29f..a0cfca0af89 100644 --- a/Content.Server.Database/Migrations/Sqlite/20200118020532_initial.Designer.cs +++ b/Content.Server.Database/Migrations/Sqlite/20200118020532_initial.Designer.cs @@ -1,11 +1,10 @@ // -using Content.Server.Database; + using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Content.Server.Database.Migrations +namespace Content.Server.Database.Migrations.Sqlite { [DbContext(typeof(SqlitePreferencesDbContext))] [Migration("20200118020532_initial")] diff --git a/Content.Server.Database/Migrations/Sqlite/20200118020532_initial.cs b/Content.Server.Database/Migrations/Sqlite/20200118020532_initial.cs index 69fdb24764b..9fdf32e225b 100644 --- a/Content.Server.Database/Migrations/Sqlite/20200118020532_initial.cs +++ b/Content.Server.Database/Migrations/Sqlite/20200118020532_initial.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Content.Server.Database.Migrations +namespace Content.Server.Database.Migrations.Sqlite { public partial class initial : Migration { diff --git a/Content.Server.Database/Migrations/Sqlite/20200118195640_jobs.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20200118195640_jobs.Designer.cs index 24a875c25c3..c7235a5ef9b 100644 --- a/Content.Server.Database/Migrations/Sqlite/20200118195640_jobs.Designer.cs +++ b/Content.Server.Database/Migrations/Sqlite/20200118195640_jobs.Designer.cs @@ -1,11 +1,10 @@ // -using Content.Server.Database; + using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Content.Server.Database.Migrations +namespace Content.Server.Database.Migrations.Sqlite { [DbContext(typeof(SqlitePreferencesDbContext))] [Migration("20200118195640_jobs")] diff --git a/Content.Server.Database/Migrations/Sqlite/20200118195640_jobs.cs b/Content.Server.Database/Migrations/Sqlite/20200118195640_jobs.cs index 09a47891ba8..44b8beb6516 100644 --- a/Content.Server.Database/Migrations/Sqlite/20200118195640_jobs.cs +++ b/Content.Server.Database/Migrations/Sqlite/20200118195640_jobs.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Content.Server.Database.Migrations +namespace Content.Server.Database.Migrations.Sqlite { public partial class jobs : Migration { diff --git a/Content.Server.Database/Migrations/Sqlite/20200119103426_preferenceUnavailable.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20200119103426_preferenceUnavailable.Designer.cs index c0aab2caeb5..4b138768401 100644 --- a/Content.Server.Database/Migrations/Sqlite/20200119103426_preferenceUnavailable.Designer.cs +++ b/Content.Server.Database/Migrations/Sqlite/20200119103426_preferenceUnavailable.Designer.cs @@ -1,11 +1,10 @@ // -using Content.Server.Database; + using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Content.Server.Database.Migrations +namespace Content.Server.Database.Migrations.Sqlite { [DbContext(typeof(SqlitePreferencesDbContext))] [Migration("20200119103426_preferenceUnavailable")] diff --git a/Content.Server.Database/Migrations/Sqlite/20200119103426_preferenceUnavailable.cs b/Content.Server.Database/Migrations/Sqlite/20200119103426_preferenceUnavailable.cs index 453b1cff608..e5091391f2a 100644 --- a/Content.Server.Database/Migrations/Sqlite/20200119103426_preferenceUnavailable.cs +++ b/Content.Server.Database/Migrations/Sqlite/20200119103426_preferenceUnavailable.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Content.Server.Database.Migrations +namespace Content.Server.Database.Migrations.Sqlite { public partial class preferenceUnavailable : Migration { diff --git a/Content.Server.Database/Migrations/Sqlite/SqlitePreferencesDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqlitePreferencesDbContextModelSnapshot.cs index 60b7c39f14a..5715275f50c 100644 --- a/Content.Server.Database/Migrations/Sqlite/SqlitePreferencesDbContextModelSnapshot.cs +++ b/Content.Server.Database/Migrations/Sqlite/SqlitePreferencesDbContextModelSnapshot.cs @@ -1,10 +1,9 @@ // -using Content.Server.Database; + using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Content.Server.Database.Migrations +namespace Content.Server.Database.Migrations.Sqlite { [DbContext(typeof(SqlitePreferencesDbContext))] partial class SqlitePreferencesDbContextModelSnapshot : ModelSnapshot diff --git a/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs b/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs index 9f47dff8260..d9c6ce5383e 100644 --- a/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs +++ b/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs @@ -1,8 +1,6 @@ -using Content.Server.GameObjects; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Weapon.Melee; -using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems.Click; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs b/Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs index a0bade8ae3f..0a6b6697fe2 100644 --- a/Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs +++ b/Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs @@ -1,7 +1,5 @@ -using Content.Server.GameObjects; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Weapon.Melee; -using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems.Click; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs b/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs index 78767115560..8753fb6115a 100644 --- a/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs +++ b/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs @@ -1,6 +1,5 @@ using Content.Server.AI.Utility; using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.Utility; using Content.Shared.Interfaces.GameObjects.Components; diff --git a/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs b/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs index 1e2450d7914..94778ff1696 100644 --- a/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs +++ b/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs @@ -1,7 +1,5 @@ -using Content.Server.GameObjects; using Content.Server.GameObjects.Components.GUI; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Log; 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 dd3c45bd463..65b0ef9f03f 100644 --- a/Content.Server/AI/Operators/Inventory/DropHandItemsOperator.cs +++ b/Content.Server/AI/Operators/Inventory/DropHandItemsOperator.cs @@ -1,4 +1,3 @@ -using Content.Server.GameObjects; using Content.Server.GameObjects.Components.GUI; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/AI/Operators/Inventory/EquipEntityOperator.cs b/Content.Server/AI/Operators/Inventory/EquipEntityOperator.cs index 64eafaffd2c..9e1348c5a1d 100644 --- a/Content.Server/AI/Operators/Inventory/EquipEntityOperator.cs +++ b/Content.Server/AI/Operators/Inventory/EquipEntityOperator.cs @@ -1,4 +1,3 @@ -using Content.Server.GameObjects; using Content.Server.GameObjects.Components.GUI; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs index b27b58c3ea9..07eeb3e9116 100644 --- a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs +++ b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs @@ -1,6 +1,5 @@ using Content.Server.AI.Utility; using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.Utility; using Content.Shared.Interfaces.GameObjects.Components; diff --git a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs index 69061a6382b..6b5b4386637 100644 --- a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs +++ b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs @@ -1,5 +1,5 @@ -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.Utility; using Robust.Shared.Containers; diff --git a/Content.Server/AI/Operators/Inventory/UseItemInHandsOperator.cs b/Content.Server/AI/Operators/Inventory/UseItemInHandsOperator.cs index e8e667270fa..130b139ad03 100644 --- a/Content.Server/AI/Operators/Inventory/UseItemInHandsOperator.cs +++ b/Content.Server/AI/Operators/Inventory/UseItemInHandsOperator.cs @@ -1,5 +1,5 @@ -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Storage; using Robust.Shared.Interfaces.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 ed4a10e6920..dd1d2120c80 100644 --- a/Content.Server/AI/Operators/Movement/MoveToEntityOperator.cs +++ b/Content.Server/AI/Operators/Movement/MoveToEntityOperator.cs @@ -1,5 +1,4 @@ using System; -using System.IO; using Content.Server.GameObjects.EntitySystems.AI.Steering; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/AI/Utility/Actions/Clothing/Gloves/PickUpGloves.cs b/Content.Server/AI/Utility/Actions/Clothing/Gloves/PickUpGloves.cs index 85df65dbfc0..3558bca497a 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/Gloves/PickUpGloves.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/Gloves/PickUpGloves.cs @@ -2,13 +2,11 @@ using System; using System.Collections.Generic; using Content.Server.AI.Operators.Sequences; using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Clothing; using Content.Server.AI.Utility.Considerations.Containers; 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 Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/Actions/Clothing/Head/EquipHead.cs b/Content.Server/AI/Utility/Actions/Clothing/Head/EquipHead.cs index 7bffe3d92de..8e37b88f5d2 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/Head/EquipHead.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/Head/EquipHead.cs @@ -3,11 +3,9 @@ using System.Collections.Generic; using Content.Server.AI.Operators; using Content.Server.AI.Operators.Inventory; using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Clothing; using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/Actions/Clothing/Head/PickUpHead.cs b/Content.Server/AI/Utility/Actions/Clothing/Head/PickUpHead.cs index ba911212548..ca0ee164d67 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/Head/PickUpHead.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/Head/PickUpHead.cs @@ -2,13 +2,11 @@ using System; using System.Collections.Generic; using Content.Server.AI.Operators.Sequences; using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Clothing; using Content.Server.AI.Utility.Considerations.Containers; 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 Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/EquipOuterClothing.cs b/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/EquipOuterClothing.cs index 9955cc49aa9..53e83765a18 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/EquipOuterClothing.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/EquipOuterClothing.cs @@ -3,11 +3,9 @@ using System.Collections.Generic; using Content.Server.AI.Operators; using Content.Server.AI.Operators.Inventory; using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Clothing; using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/PickUpOuterClothing.cs b/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/PickUpOuterClothing.cs index 22730f3659e..75e72dfbd9c 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/PickUpOuterClothing.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/OuterClothing/PickUpOuterClothing.cs @@ -2,13 +2,11 @@ using System; using System.Collections.Generic; using Content.Server.AI.Operators.Sequences; using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Clothing; using Content.Server.AI.Utility.Considerations.Containers; 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 Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/Actions/Clothing/Shoes/EquipShoes.cs b/Content.Server/AI/Utility/Actions/Clothing/Shoes/EquipShoes.cs index 218e218c356..07f0da5f8b4 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/Shoes/EquipShoes.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/Shoes/EquipShoes.cs @@ -3,11 +3,9 @@ using System.Collections.Generic; using Content.Server.AI.Operators; using Content.Server.AI.Operators.Inventory; using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Clothing; using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/Actions/Clothing/Shoes/PickUpShoes.cs b/Content.Server/AI/Utility/Actions/Clothing/Shoes/PickUpShoes.cs index 00cd4b1cd9e..39559bedb6c 100644 --- a/Content.Server/AI/Utility/Actions/Clothing/Shoes/PickUpShoes.cs +++ b/Content.Server/AI/Utility/Actions/Clothing/Shoes/PickUpShoes.cs @@ -2,13 +2,11 @@ using System; using System.Collections.Generic; using Content.Server.AI.Operators.Sequences; using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Clothing; using Content.Server.AI.Utility.Considerations.Containers; 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 Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeWeaponAttackEntity.cs b/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeWeaponAttackEntity.cs index 28335ace754..e0df81467c5 100644 --- a/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeWeaponAttackEntity.cs +++ b/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeWeaponAttackEntity.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Content.Server.AI.Operators; -using Content.Server.AI.Operators.Combat; using Content.Server.AI.Operators.Combat.Melee; using Content.Server.AI.Operators.Movement; using Content.Server.AI.Utility.Considerations; diff --git a/Content.Server/AI/Utility/Actions/Combat/Melee/PickUpMeleeWeapon.cs b/Content.Server/AI/Utility/Actions/Combat/Melee/PickUpMeleeWeapon.cs index 708afc240ee..fed29d402aa 100644 --- a/Content.Server/AI/Utility/Actions/Combat/Melee/PickUpMeleeWeapon.cs +++ b/Content.Server/AI/Utility/Actions/Combat/Melee/PickUpMeleeWeapon.cs @@ -4,7 +4,6 @@ using Content.Server.AI.Operators.Sequences; using Content.Server.AI.Utility.Considerations; using Content.Server.AI.Utility.Considerations.Combat.Melee; using Content.Server.AI.Utility.Considerations.Containers; -using Content.Server.AI.Utility.Considerations.Hands; using Content.Server.AI.Utility.Considerations.Movement; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; diff --git a/Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs b/Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs index 5735b884e71..62c15cffd7d 100644 --- a/Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs +++ b/Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs @@ -5,7 +5,6 @@ using Content.Server.AI.Operators.Combat.Melee; using Content.Server.AI.Operators.Movement; using Content.Server.AI.Utility.Considerations; using Content.Server.AI.Utility.Considerations.Combat; -using Content.Server.AI.Utility.Considerations.Combat.Melee; using Content.Server.AI.Utility.Considerations.Containers; using Content.Server.AI.Utility.Considerations.Movement; using Content.Server.AI.WorldState; diff --git a/Content.Server/AI/Utility/Actions/IAiUtility.cs b/Content.Server/AI/Utility/Actions/IAiUtility.cs index 679d410cb76..6eef451235c 100644 --- a/Content.Server/AI/Utility/Actions/IAiUtility.cs +++ b/Content.Server/AI/Utility/Actions/IAiUtility.cs @@ -1,5 +1,3 @@ -using Content.Server.AI.Utility.AiLogic; - namespace Content.Server.AI.Utility.Actions { public interface IAiUtility diff --git a/Content.Server/AI/Utility/Actions/Idle/WanderAndWait.cs b/Content.Server/AI/Utility/Actions/Idle/WanderAndWait.cs index ce68e46d78a..5cb13cea2cc 100644 --- a/Content.Server/AI/Utility/Actions/Idle/WanderAndWait.cs +++ b/Content.Server/AI/Utility/Actions/Idle/WanderAndWait.cs @@ -5,17 +5,15 @@ using Content.Server.AI.Operators.Generic; using Content.Server.AI.Operators.Movement; using Content.Server.AI.Utility.Considerations; using Content.Server.AI.Utility.Considerations.ActionBlocker; -using Content.Server.AI.Utility.Considerations.Containers; using Content.Server.AI.WorldState; +using Content.Server.GameObjects.EntitySystems.AI.Pathfinding; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible; -using Content.Server.GameObjects.EntitySystems.Pathfinding; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Map; -using Robust.Shared.Maths; using Robust.Shared.Random; namespace Content.Server.AI.Utility.Actions.Idle @@ -50,7 +48,7 @@ namespace Content.Server.AI.Utility.Actions.Idle new WaitOperator(waitTime), }); } - + protected override IReadOnlyCollection> GetConsiderations(Blackboard context) { var considerationsManager = IoCManager.Resolve(); @@ -75,7 +73,7 @@ namespace Content.Server.AI.Utility.Actions.Idle { return default; } - + var reachableNodes = new List(); foreach (var region in reachableRegions) diff --git a/Content.Server/AI/Utility/Actions/UtilityAction.cs b/Content.Server/AI/Utility/Actions/UtilityAction.cs index f00ee01ddf3..f8be97abaae 100644 --- a/Content.Server/AI/Utility/Actions/UtilityAction.cs +++ b/Content.Server/AI/Utility/Actions/UtilityAction.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Content.Server.AI.Operators; -using Content.Server.AI.Utility.Considerations; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States.Utility; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs index 791727b6370..005a30a9bc9 100644 --- a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs +++ b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs @@ -2,12 +2,12 @@ using System; using System.Collections.Generic; using System.Threading; using Content.Server.AI.Operators; -using Content.Server.AI.Operators.Generic; using Content.Server.AI.Utility.Actions; using Content.Server.AI.Utility.BehaviorSets; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States.Utility; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Damage; +using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.EntitySystems.AI.LoadBalancer; using Content.Server.GameObjects.EntitySystems.JobQueues; using Robust.Server.AI; @@ -148,7 +148,7 @@ namespace Content.Server.AI.Utility.AiLogic _isDead = false; } } - + private void ReceivedAction() { switch (_actionRequest.Exception) @@ -167,7 +167,7 @@ namespace Content.Server.AI.Utility.AiLogic { return; } - + var currentOp = CurrentAction?.ActionOperators.Peek(); if (currentOp != null && currentOp.HasStartup) { diff --git a/Content.Server/AI/Utility/BehaviorSets/BehaviorSet.cs b/Content.Server/AI/Utility/BehaviorSets/BehaviorSet.cs index 0651885c7e2..d5f221a5cdb 100644 --- a/Content.Server/AI/Utility/BehaviorSets/BehaviorSet.cs +++ b/Content.Server/AI/Utility/BehaviorSets/BehaviorSet.cs @@ -1,4 +1,3 @@ -using System.Collections; using System.Collections.Generic; using Content.Server.AI.Utility.Actions; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/AI/Utility/BehaviorSets/HungerBehaviorSet.cs b/Content.Server/AI/Utility/BehaviorSets/HungerBehaviorSet.cs index a9c6117af1b..b91b5044182 100644 --- a/Content.Server/AI/Utility/BehaviorSets/HungerBehaviorSet.cs +++ b/Content.Server/AI/Utility/BehaviorSets/HungerBehaviorSet.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; using Content.Server.AI.Utility.Actions; -using Content.Server.AI.Utility.Actions.Nutrition; using Content.Server.AI.Utility.ExpandableActions.Nutrition; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/AI/Utility/Considerations/Clothing/ClothingInInventoryCon.cs b/Content.Server/AI/Utility/Considerations/Clothing/ClothingInInventoryCon.cs index 5a0dce18f6c..961139a6481 100644 --- a/Content.Server/AI/Utility/Considerations/Clothing/ClothingInInventoryCon.cs +++ b/Content.Server/AI/Utility/Considerations/Clothing/ClothingInInventoryCon.cs @@ -1,7 +1,7 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States.Clothing; using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Items.Clothing; using Content.Shared.GameObjects.Components.Inventory; namespace Content.Server.AI.Utility.Considerations.Clothing diff --git a/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs b/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs index 96db4f5f352..8e70bb92008 100644 --- a/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs +++ b/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs @@ -1,7 +1,7 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Server.GameObjects; -using Content.Shared.GameObjects; +using Content.Server.GameObjects.Components.Damage; +using Content.Shared.GameObjects.Components.Damage; namespace Content.Server.AI.Utility.Considerations.Combat { diff --git a/Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs b/Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs index 0fd1990748c..97ed516326a 100644 --- a/Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs +++ b/Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs @@ -1,6 +1,6 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Mobs; 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 8cdf0b520b3..e973538e799 100644 --- a/Content.Server/AI/Utility/Considerations/Combat/TargetIsDeadCon.cs +++ b/Content.Server/AI/Utility/Considerations/Combat/TargetIsDeadCon.cs @@ -1,6 +1,6 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Mobs; namespace Content.Server.AI.Utility.Considerations.Combat { diff --git a/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs b/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs index 5c017aaa5eb..d8e95579662 100644 --- a/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs +++ b/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs @@ -1,9 +1,6 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.GameObjects.Components.Movement; -using Content.Server.GameObjects.EntitySystems.AI.Pathfinding; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible; using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.Containers; diff --git a/Content.Server/AI/Utility/Considerations/Hands/FreeHandCon.cs b/Content.Server/AI/Utility/Considerations/Hands/FreeHandCon.cs index b379f46e184..67363574e99 100644 --- a/Content.Server/AI/Utility/Considerations/Hands/FreeHandCon.cs +++ b/Content.Server/AI/Utility/Considerations/Hands/FreeHandCon.cs @@ -1,6 +1,5 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Server.GameObjects; using Content.Server.GameObjects.Components.GUI; namespace Content.Server.AI.Utility.Considerations.Hands diff --git a/Content.Server/AI/Utility/Considerations/Inventory/CanPutTargetInInventoryCon.cs b/Content.Server/AI/Utility/Considerations/Inventory/CanPutTargetInInventoryCon.cs index 706054cb109..c16ca7d86a5 100644 --- a/Content.Server/AI/Utility/Considerations/Inventory/CanPutTargetInInventoryCon.cs +++ b/Content.Server/AI/Utility/Considerations/Inventory/CanPutTargetInInventoryCon.cs @@ -2,7 +2,7 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Hands; using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects.Components; +using Content.Server.GameObjects.Components.Items.Storage; namespace Content.Server.AI.Utility.Considerations.Inventory { diff --git a/Content.Server/AI/Utility/Considerations/Inventory/TargetInOurInventoryCon.cs b/Content.Server/AI/Utility/Considerations/Inventory/TargetInOurInventoryCon.cs index 100f111a7e7..ba00f6303d7 100644 --- a/Content.Server/AI/Utility/Considerations/Inventory/TargetInOurInventoryCon.cs +++ b/Content.Server/AI/Utility/Considerations/Inventory/TargetInOurInventoryCon.cs @@ -1,8 +1,7 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects; -using Content.Server.GameObjects.Components; +using Content.Server.GameObjects.Components.Items.Storage; namespace Content.Server.AI.Utility.Considerations.Inventory { diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/EquipAnyGlovesExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/EquipAnyGlovesExp.cs index a022113f1b5..f828ab89b8e 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/EquipAnyGlovesExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/EquipAnyGlovesExp.cs @@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Clothing; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Items.Clothing; using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/PickUpAnyNearbyGlovesExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/PickUpAnyNearbyGlovesExp.cs index 50d584aa699..6128442684d 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/PickUpAnyNearbyGlovesExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/PickUpAnyNearbyGlovesExp.cs @@ -4,11 +4,10 @@ using Content.Server.AI.Utility.Actions; using Content.Server.AI.Utility.Actions.Clothing.Gloves; using Content.Server.AI.Utility.Considerations; using Content.Server.AI.Utility.Considerations.Clothing; -using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Clothing; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Items.Clothing; using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/EquipAnyHeadExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/EquipAnyHeadExp.cs index a98faf08049..2f051384361 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/EquipAnyHeadExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/EquipAnyHeadExp.cs @@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Clothing; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Items.Clothing; using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/PickUpAnyNearbyHeadExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/PickUpAnyNearbyHeadExp.cs index f1e3d0e14f5..a5642f09440 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/PickUpAnyNearbyHeadExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/PickUpAnyNearbyHeadExp.cs @@ -4,11 +4,10 @@ using Content.Server.AI.Utility.Actions; using Content.Server.AI.Utility.Actions.Clothing.Head; using Content.Server.AI.Utility.Considerations; using Content.Server.AI.Utility.Considerations.Clothing; -using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Clothing; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Items.Clothing; using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/EquipAnyOuterClothingExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/EquipAnyOuterClothingExp.cs index 548a08f7740..31aaa0ae94a 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/EquipAnyOuterClothingExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/EquipAnyOuterClothingExp.cs @@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Clothing; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Items.Clothing; using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/PickUpAnyNearbyOuterClothingExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/PickUpAnyNearbyOuterClothingExp.cs index 29ec45a582a..f216285e720 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/PickUpAnyNearbyOuterClothingExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/PickUpAnyNearbyOuterClothingExp.cs @@ -4,11 +4,10 @@ using Content.Server.AI.Utility.Actions; using Content.Server.AI.Utility.Actions.Clothing.OuterClothing; using Content.Server.AI.Utility.Considerations; using Content.Server.AI.Utility.Considerations.Clothing; -using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Clothing; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Items.Clothing; using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/EquipAnyShoesExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/EquipAnyShoesExp.cs index f02f7abe0f6..ab0a5a2a7b8 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/EquipAnyShoesExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/EquipAnyShoesExp.cs @@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Clothing; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Items.Clothing; using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/PickUpAnyNearbyShoesExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/PickUpAnyNearbyShoesExp.cs index 8a1fa9429e6..0e25c67fb74 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/PickUpAnyNearbyShoesExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/PickUpAnyNearbyShoesExp.cs @@ -4,11 +4,10 @@ using Content.Server.AI.Utility.Actions; using Content.Server.AI.Utility.Actions.Clothing.Shoes; using Content.Server.AI.Utility.Considerations; using Content.Server.AI.Utility.Considerations.Clothing; -using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Clothing; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Items.Clothing; using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/EquipMeleeExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/EquipMeleeExp.cs index 1d993bec7bb..996ff8c1ec2 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/EquipMeleeExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/EquipMeleeExp.cs @@ -4,7 +4,6 @@ using Content.Server.AI.Utility.Actions; using Content.Server.AI.Utility.Actions.Combat.Melee; using Content.Server.AI.Utility.Considerations; using Content.Server.AI.Utility.Considerations.Combat.Melee; -using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Inventory; diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyPlayerExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyPlayerExp.cs index a1ee5543bfe..b54aed6274c 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyPlayerExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyPlayerExp.cs @@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Combat.Melee; using Content.Server.AI.Utils; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Movement; using Robust.Server.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbySpeciesExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbySpeciesExp.cs index b78bb2812c1..29937b02701 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbySpeciesExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbySpeciesExp.cs @@ -1,11 +1,9 @@ -using System; using System.Collections.Generic; using Content.Server.AI.Utility.Actions; using Content.Server.AI.Utility.Actions.Combat.Melee; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; using Content.Server.AI.WorldState.States.Mobs; -using Content.Server.GameObjects.Components.Movement; 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 0fc6d162b77..74696e13e54 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyPlayerExp.cs +++ b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyPlayerExp.cs @@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Combat.Melee; using Content.Server.AI.Utils; using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Movement; using Robust.Server.GameObjects; using Robust.Shared.IoC; @@ -47,4 +47,4 @@ namespace Content.Server.AI.Utility.ExpandableActions.Combat.Melee } } } -} \ No newline at end of file +} diff --git a/Content.Server/AI/WorldState/Blackboard.cs b/Content.Server/AI/WorldState/Blackboard.cs index 3b1d5176e82..833e0a3bf5a 100644 --- a/Content.Server/AI/WorldState/Blackboard.cs +++ b/Content.Server/AI/WorldState/Blackboard.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; -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 ba4dfad8feb..684f8e250e8 100644 --- a/Content.Server/AI/WorldState/StateData.cs +++ b/Content.Server/AI/WorldState/StateData.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using Content.Server.Interfaces.GameTicking; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; diff --git a/Content.Server/AI/WorldState/States/Clothing/EquippedClothingState.cs b/Content.Server/AI/WorldState/States/Clothing/EquippedClothingState.cs index 2e91376bab3..694697a49b5 100644 --- a/Content.Server/AI/WorldState/States/Clothing/EquippedClothingState.cs +++ b/Content.Server/AI/WorldState/States/Clothing/EquippedClothingState.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.GUI; using Content.Shared.GameObjects.Components.Inventory; using JetBrains.Annotations; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs b/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs index 4d231273fa7..c8a654a01cf 100644 --- a/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs +++ b/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using Content.Server.AI.Utils; -using Content.Server.GameObjects; -using Content.Server.GameObjects.Components; +using Content.Server.GameObjects.Components.Items.Clothing; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Movement; using JetBrains.Annotations; diff --git a/Content.Server/AI/WorldState/States/Hands/AnyFreeHandState.cs b/Content.Server/AI/WorldState/States/Hands/AnyFreeHandState.cs index 5fcec1f4687..fdf61ebb9ab 100644 --- a/Content.Server/AI/WorldState/States/Hands/AnyFreeHandState.cs +++ b/Content.Server/AI/WorldState/States/Hands/AnyFreeHandState.cs @@ -1,4 +1,3 @@ -using Content.Server.GameObjects; using Content.Server.GameObjects.Components.GUI; using JetBrains.Annotations; diff --git a/Content.Server/AI/WorldState/States/Hands/FreeHands.cs b/Content.Server/AI/WorldState/States/Hands/FreeHands.cs index 92c846f672c..3a8f2e0807d 100644 --- a/Content.Server/AI/WorldState/States/Hands/FreeHands.cs +++ b/Content.Server/AI/WorldState/States/Hands/FreeHands.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using Content.Server.GameObjects; using Content.Server.GameObjects.Components.GUI; using JetBrains.Annotations; diff --git a/Content.Server/AI/WorldState/States/Hands/HandItemsState.cs b/Content.Server/AI/WorldState/States/Hands/HandItemsState.cs index ea53b121a9e..41bb9b50812 100644 --- a/Content.Server/AI/WorldState/States/Hands/HandItemsState.cs +++ b/Content.Server/AI/WorldState/States/Hands/HandItemsState.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using Content.Server.GameObjects; using Content.Server.GameObjects.Components.GUI; using JetBrains.Annotations; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs b/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs index f7784368b71..88426963ba0 100644 --- a/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs +++ b/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs @@ -1,4 +1,3 @@ -using Content.Server.GameObjects; using Content.Server.GameObjects.Components.GUI; using JetBrains.Annotations; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/AI/WorldState/States/Inventory/InventoryState.cs b/Content.Server/AI/WorldState/States/Inventory/InventoryState.cs index 26ce5f30af3..3f570d58bd6 100644 --- a/Content.Server/AI/WorldState/States/Inventory/InventoryState.cs +++ b/Content.Server/AI/WorldState/States/Inventory/InventoryState.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using Content.Server.GameObjects; using Content.Server.GameObjects.Components.GUI; using JetBrains.Annotations; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/AI/WorldState/States/Inventory/LastOpenedStorageState.cs b/Content.Server/AI/WorldState/States/Inventory/LastOpenedStorageState.cs index 973faf3115b..0df276ee3a7 100644 --- a/Content.Server/AI/WorldState/States/Inventory/LastOpenedStorageState.cs +++ b/Content.Server/AI/WorldState/States/Inventory/LastOpenedStorageState.cs @@ -1,7 +1,6 @@ -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Items.Storage; using Robust.Shared.Interfaces.GameObjects; -using Logger = Robust.Shared.Log.Logger; +using Robust.Shared.Log; namespace Content.Server.AI.WorldState.States.Inventory { diff --git a/Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs b/Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs index 802ef04258e..f1c7bbae1a5 100644 --- a/Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs +++ b/Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Movement; using JetBrains.Annotations; using Robust.Server.Interfaces.Player; diff --git a/Content.Server/AI/WorldState/States/Mobs/NearbySpeciesState.cs b/Content.Server/AI/WorldState/States/Mobs/NearbySpeciesState.cs index 68ac8fd3555..a72786d3267 100644 --- a/Content.Server/AI/WorldState/States/Mobs/NearbySpeciesState.cs +++ b/Content.Server/AI/WorldState/States/Mobs/NearbySpeciesState.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Content.Server.AI.Utils; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Movement; using JetBrains.Annotations; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs b/Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs index a2be3e46f22..15cd69cda22 100644 --- a/Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs +++ b/Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using Content.Server.AI.Utils; -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.Components.Nutrition; diff --git a/Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs b/Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs index 168f9c08972..ba44a9d9c5e 100644 --- a/Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs +++ b/Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using Content.Server.AI.Utils; -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.Components.Nutrition; diff --git a/Content.Server/AI/WorldState/States/Nutrition/ThirstyState.cs b/Content.Server/AI/WorldState/States/Nutrition/ThirstyState.cs index 65877facf20..e8a13e9e178 100644 --- a/Content.Server/AI/WorldState/States/Nutrition/ThirstyState.cs +++ b/Content.Server/AI/WorldState/States/Nutrition/ThirstyState.cs @@ -2,7 +2,6 @@ using System; using Content.Server.GameObjects.Components.Nutrition; using Content.Shared.GameObjects.Components.Nutrition; using JetBrains.Annotations; -using ThirstComponent = Content.Server.GameObjects.Components.Nutrition.ThirstComponent; namespace Content.Server.AI.WorldState.States.Nutrition { diff --git a/Content.Server/Administration/AGhost.cs b/Content.Server/Administration/AGhost.cs index b84847c6429..dfe516576bc 100644 --- a/Content.Server/Administration/AGhost.cs +++ b/Content.Server/Administration/AGhost.cs @@ -1,12 +1,9 @@ -using System.Timers; -using Content.Server.GameObjects.Components.Observer; +using Content.Server.GameObjects.Components.Observer; using Content.Server.Players; using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Player; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Map; -using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.Administration { diff --git a/Content.Server/Administration/ControlMob.cs b/Content.Server/Administration/ControlMob.cs index 8b08f3d99e5..317f2d77ee6 100644 --- a/Content.Server/Administration/ControlMob.cs +++ b/Content.Server/Administration/ControlMob.cs @@ -1,6 +1,5 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Observer; -using Content.Server.Mobs; using Content.Server.Players; using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Player; diff --git a/Content.Server/Administration/DeleteEntitiesWithComponent.cs b/Content.Server/Administration/DeleteEntitiesWithComponent.cs index b476ba3a0d1..6abf5a6f087 100644 --- a/Content.Server/Administration/DeleteEntitiesWithComponent.cs +++ b/Content.Server/Administration/DeleteEntitiesWithComponent.cs @@ -1,12 +1,11 @@ -using Robust.Server.Interfaces.Console; +using System; +using System.Collections.Generic; +using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Server.Administration { diff --git a/Content.Server/Atmos/Reactions/PhoronFireReaction.cs b/Content.Server/Atmos/Reactions/PhoronFireReaction.cs index 4b9d05e90f8..46e8ceec2b9 100644 --- a/Content.Server/Atmos/Reactions/PhoronFireReaction.cs +++ b/Content.Server/Atmos/Reactions/PhoronFireReaction.cs @@ -3,7 +3,6 @@ using System; using Content.Server.Interfaces; using Content.Shared.Atmos; using JetBrains.Annotations; -using Robust.Shared.Log; using Robust.Shared.Serialization; namespace Content.Server.Atmos.Reactions diff --git a/Content.Server/Atmos/TileAtmosInfo.cs b/Content.Server/Atmos/TileAtmosInfo.cs index b8bdb70a687..43ed5f129d0 100644 --- a/Content.Server/Atmos/TileAtmosInfo.cs +++ b/Content.Server/Atmos/TileAtmosInfo.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Runtime.InteropServices; using Robust.Shared.Maths; using Robust.Shared.ViewVariables; diff --git a/Content.Server/Cargo/CargoOrderDataManager.cs b/Content.Server/Cargo/CargoOrderDataManager.cs index 35fed56a01e..fe169ab26d9 100644 --- a/Content.Server/Cargo/CargoOrderDataManager.cs +++ b/Content.Server/Cargo/CargoOrderDataManager.cs @@ -1,7 +1,6 @@ -using Content.Server.GameObjects.Components.Cargo; +using System.Collections.Generic; +using Content.Server.GameObjects.Components.Cargo; using Content.Shared.Prototypes.Cargo; -using System; -using System.Collections.Generic; namespace Content.Server.Cargo { diff --git a/Content.Server/Cargo/CargoOrderDatabase.cs b/Content.Server/Cargo/CargoOrderDatabase.cs index 3762822ef58..924a4240714 100644 --- a/Content.Server/Cargo/CargoOrderDatabase.cs +++ b/Content.Server/Cargo/CargoOrderDatabase.cs @@ -1,7 +1,7 @@ -using Content.Shared.Prototypes.Cargo; -using Robust.Shared.Localization; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using Content.Shared.Prototypes.Cargo; +using Robust.Shared.Localization; namespace Content.Server.Cargo { diff --git a/Content.Server/Cargo/ICargoOrderDataManager.cs b/Content.Server/Cargo/ICargoOrderDataManager.cs index 2eefea9f9d8..118a4e1f9dc 100644 --- a/Content.Server/Cargo/ICargoOrderDataManager.cs +++ b/Content.Server/Cargo/ICargoOrderDataManager.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.GameObjects.Components.Cargo; using Content.Shared.Prototypes.Cargo; diff --git a/Content.Server/Chat/ChatCommands.cs b/Content.Server/Chat/ChatCommands.cs index eed35957da7..9d3ff7c9958 100644 --- a/Content.Server/Chat/ChatCommands.cs +++ b/Content.Server/Chat/ChatCommands.cs @@ -1,18 +1,18 @@ -using Content.Server.GameObjects; +using System.Linq; +using Content.Server.GameObjects.Components.Damage; +using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Observer; using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameObjects; using Content.Server.Players; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Player; using Robust.Shared.Enums; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; -using System.Linq; -using Content.Server.GameObjects.Components; -using Content.Server.GameObjects.Components.GUI; namespace Content.Server.Chat { diff --git a/Content.Server/Chat/ChatManager.cs b/Content.Server/Chat/ChatManager.cs index 6f79bb9d296..bb33c2c6ca2 100644 --- a/Content.Server/Chat/ChatManager.cs +++ b/Content.Server/Chat/ChatManager.cs @@ -1,5 +1,6 @@ using System.Linq; using Content.Server.GameObjects.Components.Observer; +using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Server.Interfaces.Chat; using Content.Shared.Chat; @@ -10,15 +11,6 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Log; -using Microsoft.EntityFrameworkCore.Metadata.Builders; -using System; -using Content.Server.GameObjects.Components; -using System.Collections.Generic; -using Content.Server.GameObjects.Components.Interactable; -using Content.Server.GameObjects.EntitySystems; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Robust.Shared.Interfaces.Map; namespace Content.Server.Chat { diff --git a/Content.Server/Chemistry/Metabolism/DefaultDrink.cs b/Content.Server/Chemistry/Metabolism/DefaultDrink.cs index 232ea1e108a..d604f46fa8c 100644 --- a/Content.Server/Chemistry/Metabolism/DefaultDrink.cs +++ b/Content.Server/Chemistry/Metabolism/DefaultDrink.cs @@ -1,5 +1,4 @@ -using System; -using Content.Server.GameObjects.Components.Nutrition; +using Content.Server.GameObjects.Components.Nutrition; using Content.Shared.Chemistry; using Content.Shared.Interfaces.Chemistry; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/Chemistry/Metabolism/DefaultFood.cs b/Content.Server/Chemistry/Metabolism/DefaultFood.cs index bbf83bc5d8c..e240b661b18 100644 --- a/Content.Server/Chemistry/Metabolism/DefaultFood.cs +++ b/Content.Server/Chemistry/Metabolism/DefaultFood.cs @@ -3,7 +3,6 @@ using Content.Shared.Chemistry; using Content.Shared.Interfaces.Chemistry; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.IoC; using Robust.Shared.Serialization; namespace Content.Server.Chemistry.Metabolism diff --git a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs index 89f26f24139..3e46751ab25 100644 --- a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs @@ -1,7 +1,7 @@ using System; using Content.Server.Explosions; using Content.Server.GameObjects.Components.Chemistry; -using Content.Shared.Interfaces; +using Content.Server.Interfaces.Chemistry; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Server/Chemistry/ReactionPrototype.cs b/Content.Server/Chemistry/ReactionPrototype.cs index 36e2304b16f..3cfef8c4d98 100644 --- a/Content.Server/Chemistry/ReactionPrototype.cs +++ b/Content.Server/Chemistry/ReactionPrototype.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; +using Content.Server.Interfaces.Chemistry; using Content.Shared.Chemistry; -using Content.Shared.Interfaces; using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs index 0f9a6bd6246..e83771204d9 100644 --- a/Content.Server/EntryPoint.cs +++ b/Content.Server/EntryPoint.cs @@ -1,8 +1,7 @@ using Content.Server.AI.Utility.Considerations; - using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; +using Content.Server.AI.WorldState; +using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Content.Server.Interfaces; -using Content.Server.AI.WorldState; using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameTicking; using Content.Server.Interfaces.PDA; diff --git a/Content.Server/Explosions/ExplosionHelper.cs b/Content.Server/Explosions/ExplosionHelper.cs index 4ca487317d4..277713bf283 100644 --- a/Content.Server/Explosions/ExplosionHelper.cs +++ b/Content.Server/Explosions/ExplosionHelper.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using Content.Server.GameObjects.Components.Mobs; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.Maps; using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs b/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs index 194c4e9b659..4ebfcd20bde 100644 --- a/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs +++ b/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Linq; +using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.Interfaces; -using Content.Server.Interfaces.GameObjects; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Inventory; using JetBrains.Annotations; diff --git a/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs b/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs index 9a799c77162..841b4dd1761 100644 --- a/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.Interfaces; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.Access; diff --git a/Content.Server/GameObjects/Components/Access/PresetIdCardComponent.cs b/Content.Server/GameObjects/Components/Access/PresetIdCardComponent.cs index 67c6d08a769..fef2f410223 100644 --- a/Content.Server/GameObjects/Components/Access/PresetIdCardComponent.cs +++ b/Content.Server/GameObjects/Components/Access/PresetIdCardComponent.cs @@ -1,5 +1,5 @@ #nullable enable -using Content.Shared.Jobs; +using Content.Shared.Roles; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs b/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs index 649d3dd34e7..478dd540cb0 100644 --- a/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs @@ -1,11 +1,9 @@ using System; -using Content.Server.Atmos; using Content.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs b/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs index cd2066d99c9..4beaa374b1e 100644 --- a/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs @@ -1,10 +1,11 @@ using System; using System.Runtime.CompilerServices; +using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameObjects; using Content.Shared.Atmos; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; diff --git a/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs b/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs index 777d2380609..066bc0940a2 100644 --- a/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs @@ -1,8 +1,8 @@ #nullable enable +using System.Collections.Generic; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Server.Interfaces.GameObjects.Components.Items; -using Content.Server.Utility; using Content.Shared.Atmos; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.EntitySystems; @@ -16,8 +16,6 @@ using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; -using Robust.Shared.Maths; -using System.Collections.Generic; namespace Content.Server.GameObjects.Components.Atmos { diff --git a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs index 87bf2ca6abe..5c9870c53f9 100644 --- a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs +++ b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs @@ -7,11 +7,11 @@ using Content.Server.GameObjects.Components.Strap; using Content.Server.Interfaces; using Content.Server.Mobs; using Content.Server.Utility; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Buckle; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Strap; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystemMessages; diff --git a/Content.Server/GameObjects/Components/Cargo/GalacticMarketComponent.cs b/Content.Server/GameObjects/Components/Cargo/GalacticMarketComponent.cs index 5f4ff15e26b..2bbbcc2618d 100644 --- a/Content.Server/GameObjects/Components/Cargo/GalacticMarketComponent.cs +++ b/Content.Server/GameObjects/Components/Cargo/GalacticMarketComponent.cs @@ -1,10 +1,5 @@ using Content.Shared.GameObjects.Components.Cargo; using Robust.Shared.GameObjects; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Content.Server.GameObjects.Components.Cargo { diff --git a/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs b/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs index 4f20a0c4e9a..68551cc0e23 100644 --- a/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs @@ -1,30 +1,30 @@ using System; using System.Linq; using Content.Server.GameObjects.Components.GUI; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.Components.Items.Storage; +using Content.Server.GameObjects.Components.Power.ApcNetComponents; +using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; -using Content.Server.Interfaces.GameObjects; +using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.Chemistry; -using Content.Shared.GameObjects.Components.Chemistry; +using Content.Shared.GameObjects.Components.Chemistry.ChemMaster; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.UserInterface; +using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; -using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.Interfaces.GameObjects.Components.Items; -using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.Interfaces.Random; using Robust.Shared.Maths; using Robust.Shared.Random; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Chemistry { diff --git a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs b/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs index a9c384dafbe..ea864a4b405 100644 --- a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs @@ -1,27 +1,28 @@ using System; using System.Linq; using Content.Server.GameObjects.Components.GUI; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.Components.Items.Storage; +using Content.Server.GameObjects.Components.Power.ApcNetComponents; +using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; +using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.Chemistry; -using Content.Shared.GameObjects.Components.Chemistry; +using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.UserInterface; +using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; -using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Shared.Interfaces.GameObjects.Components; -using Content.Server.Interfaces.GameObjects.Components.Items; namespace Content.Server.GameObjects.Components.Chemistry { diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs index ed4d9df3f67..5218f996ce4 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs @@ -1,12 +1,17 @@ -using Content.Server.Chemistry; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using System.Collections.Generic; +using System.Linq; +using Content.Server.Chemistry; +using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.Chemistry; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Chemistry; +using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Utility; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; @@ -15,12 +20,6 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -using System.Collections.Generic; -using System.Linq; -using Content.Server.GameObjects.Components.GUI; -using Content.Shared.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; -using Content.Server.GameObjects.EntitySystems.Click; namespace Content.Server.GameObjects.Components.Chemistry { diff --git a/Content.Server/GameObjects/Components/Chemistry/TransformableContainerComponent.cs b/Content.Server/GameObjects/Components/Chemistry/TransformableContainerComponent.cs index 048eb685a12..94d18c734ed 100644 --- a/Content.Server/GameObjects/Components/Chemistry/TransformableContainerComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/TransformableContainerComponent.cs @@ -1,4 +1,4 @@ -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.Chemistry; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs b/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs index dd5fea942bd..cc477cd8e96 100644 --- a/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs @@ -1,27 +1,15 @@ -using Content.Server.GameObjects.Components.Fluids; +using System.Linq; +using Content.Server.GameObjects.Components.Fluids; using Content.Shared.Chemistry; using Content.Shared.Physics; -using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.EntityFrameworkCore.Update.Internal; -using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; -using Robust.Shared.Map; using Robust.Shared.Maths; -using Robust.Shared.Physics; using Robust.Shared.Serialization; -using Robust.Shared.Timers; using Robust.Shared.ViewVariables; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading; -using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.GameObjects.Components.Chemistry { diff --git a/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs b/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs index 53b2fa5675b..d982b1fb069 100644 --- a/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs @@ -1,5 +1,5 @@ using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Command; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.Components.UserInterface; diff --git a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs index 49cd4cbeb8b..8e5ca778a1b 100644 --- a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs @@ -1,5 +1,4 @@ -using Content.Server.GameObjects.EntitySystems.Click; -using Content.Shared.Construction; +using Content.Shared.Construction; using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; diff --git a/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs b/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs index 13314712cbd..6d6a192359e 100644 --- a/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs +++ b/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Interactable; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Conveyor; diff --git a/Content.Server/GameObjects/Components/Damage/BreakableComponent.cs b/Content.Server/GameObjects/Components/Damage/BreakableComponent.cs index 226abbc3ab4..0a9e53e03aa 100644 --- a/Content.Server/GameObjects/Components/Damage/BreakableComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/BreakableComponent.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Interfaces; -using Content.Shared.GameObjects; +using Content.Server.GameObjects.EntitySystems; +using Content.Server.Interfaces.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; diff --git a/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs b/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs index 2d5fc7cfdc3..4e5b4169b2f 100644 --- a/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs @@ -1,9 +1,7 @@ using Content.Server.GameObjects.Components.Mobs; -using Content.Server.Interfaces.GameObjects; using Content.Shared.Audio; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Systems; diff --git a/Content.Server/GameObjects/Components/Damage/DamageOnToolInteractComponent.cs b/Content.Server/GameObjects/Components/Damage/DamageOnToolInteractComponent.cs index fb3a546d7e0..836dd9d0000 100644 --- a/Content.Server/GameObjects/Components/Damage/DamageOnToolInteractComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/DamageOnToolInteractComponent.cs @@ -1,9 +1,10 @@ -using Content.Server.GameObjects.Components.Interactable; +using System.Collections.Generic; +using Content.Server.GameObjects.Components.Interactable; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Interactable; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -using System.Collections.Generic; -using Content.Shared.Interfaces.GameObjects.Components; namespace Content.Server.GameObjects.Components.Damage { @@ -56,9 +57,9 @@ namespace Content.Server.GameObjects.Components.Damage { if (eventArgs.Target.TryGetComponent(out var damageable)) { - if(tool.HasQuality(ToolQuality.Welding)) damageable.TakeDamage(Shared.GameObjects.DamageType.Heat, Damage, eventArgs.Using, eventArgs.User); + if(tool.HasQuality(ToolQuality.Welding)) damageable.TakeDamage(DamageType.Heat, Damage, eventArgs.Using, eventArgs.User); else - damageable.TakeDamage(Shared.GameObjects.DamageType.Brute, Damage, eventArgs.Using, eventArgs.User); + damageable.TakeDamage(DamageType.Brute, Damage, eventArgs.Using, eventArgs.User); return true; } return false; diff --git a/Content.Server/GameObjects/Components/Damage/DamageThreshold.cs b/Content.Server/GameObjects/Components/Damage/DamageThreshold.cs index 8cf06a91032..1efd2ba7a46 100644 --- a/Content.Server/GameObjects/Components/Damage/DamageThreshold.cs +++ b/Content.Server/GameObjects/Components/Damage/DamageThreshold.cs @@ -1,9 +1,8 @@ using System; -using Content.Shared.GameObjects; -using JetBrains.Annotations; +using Content.Shared.GameObjects.Components.Damage; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.Damage { /// /// Triggers an event when values rise above or drop below this threshold diff --git a/Content.Server/GameObjects/Components/Damage/DamageableComponent.cs b/Content.Server/GameObjects/Components/Damage/DamageableComponent.cs index dd378cfdeef..613355bce2b 100644 --- a/Content.Server/GameObjects/Components/Damage/DamageableComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/DamageableComponent.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; -using Content.Server.Interfaces; using Content.Server.Interfaces.GameObjects; -using Content.Shared.GameObjects; +using Content.Server.Interfaces.GameObjects.Components.Damage; +using Content.Shared.GameObjects.Components.Damage; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.Damage { //TODO: add support for component add/remove diff --git a/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs b/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs index 4a34bc35a0e..86a7abb03f3 100644 --- a/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Interfaces; -using Content.Shared.GameObjects; +using Content.Server.GameObjects.EntitySystems; +using Content.Server.Interfaces.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; @@ -12,7 +12,7 @@ using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Content.Server.GameObjects.Components.Destructible +namespace Content.Server.GameObjects.Components.Damage { /// /// Deletes the entity once a certain damage threshold has been reached. diff --git a/Content.Server/GameObjects/Components/Damage/ResistanceSet.cs b/Content.Server/GameObjects/Components/Damage/ResistanceSet.cs index 982e614a154..e9a5e941a1d 100644 --- a/Content.Server/GameObjects/Components/Damage/ResistanceSet.cs +++ b/Content.Server/GameObjects/Components/Damage/ResistanceSet.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.Damage { /// /// Resistance set used by damageable objects. @@ -35,7 +35,7 @@ namespace Content.Server.GameObjects { _resistances[damageType] = resistanceSetting; }); - } + } } /// diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalCommands.cs b/Content.Server/GameObjects/Components/Disposal/DisposalCommands.cs index 51020360a73..5401182b5b1 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalCommands.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalCommands.cs @@ -1,5 +1,4 @@ #nullable enable -using Content.Server.Interfaces; using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalHolderComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalHolderComponent.cs index 8099c291a0d..f74eecb2849 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalHolderComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalHolderComponent.cs @@ -1,5 +1,7 @@ #nullable enable using System.Linq; +using Content.Server.GameObjects.Components.Items.Storage; +using Content.Server.GameObjects.Components.Mobs; using Robust.Server.GameObjects.Components.Container; using Robust.Shared.Containers; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs index ed953b4e70a..9f9d0efe210 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs @@ -1,9 +1,9 @@ #nullable enable using System; using System.Linq; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Shared.GameObjects; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Disposal; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Robust.Server.Console; using Robust.Server.GameObjects; diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs index ffc177fd15a..bc4d8874572 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs @@ -4,12 +4,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Storage; +using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.Interfaces; using Content.Server.Interfaces.GameObjects.Components.Items; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Disposal; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; diff --git a/Content.Server/GameObjects/Components/DoAfterComponent.cs b/Content.Server/GameObjects/Components/DoAfterComponent.cs index 4222363af8c..d77fc080d04 100644 --- a/Content.Server/GameObjects/Components/DoAfterComponent.cs +++ b/Content.Server/GameObjects/Components/DoAfterComponent.cs @@ -1,6 +1,6 @@ #nullable enable using System.Collections.Generic; -using Content.Server.GameObjects.EntitySystems; +using Content.Server.GameObjects.EntitySystems.DoAfter; using Content.Shared.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.Interfaces.GameObjects; @@ -38,20 +38,20 @@ namespace Content.Server.GameObjects.Components { return; } - + foreach (var (doAfter, id) in _doAfters) { // THE ALMIGHTY PYRAMID var message = new DoAfterMessage( - id, + id, doAfter.UserGrid, doAfter.TargetGrid, - doAfter.StartTime, - doAfter.EventArgs.Delay, - doAfter.EventArgs.BreakOnUserMove, + doAfter.StartTime, + doAfter.EventArgs.Delay, + doAfter.EventArgs.BreakOnUserMove, doAfter.EventArgs.BreakOnTargetMove, doAfter.EventArgs.Target?.Uid ?? EntityUid.Invalid); - + SendNetworkMessage(message, connectedClient); } } @@ -59,7 +59,7 @@ namespace Content.Server.GameObjects.Components private bool TryGetConnectedClient(out INetChannel? connectedClient) { connectedClient = null; - + if (!Owner.TryGetComponent(out IActorComponent actorComponent)) { return false; @@ -81,15 +81,15 @@ namespace Content.Server.GameObjects.Components if (TryGetConnectedClient(out var connectedClient)) { var message = new DoAfterMessage( - _runningIndex, + _runningIndex, doAfter.UserGrid, doAfter.TargetGrid, - doAfter.StartTime, - doAfter.EventArgs.Delay, - doAfter.EventArgs.BreakOnUserMove, + doAfter.StartTime, + doAfter.EventArgs.Delay, + doAfter.EventArgs.BreakOnUserMove, doAfter.EventArgs.BreakOnTargetMove, doAfter.EventArgs.Target?.Uid ?? EntityUid.Invalid); - + SendNetworkMessage(message, connectedClient); } @@ -108,7 +108,7 @@ namespace Content.Server.GameObjects.Components var message = new CancelledDoAfterMessage(index); SendNetworkMessage(message, connectedClient); } - + _doAfters.Remove(doAfter); } @@ -127,4 +127,4 @@ namespace Content.Server.GameObjects.Components _doAfters.Remove(doAfter); } } -} \ No newline at end of file +} diff --git a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs index 8b1ab391c7a..bcd49e5c895 100644 --- a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs @@ -1,10 +1,12 @@ using System; using System.Linq; +using System.Threading; using Content.Server.GameObjects.Components.Access; using Content.Server.GameObjects.Components.Atmos; +using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Mobs; -using Content.Server.Interfaces.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Doors; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.Interfaces.GameObjects.Components; @@ -17,11 +19,10 @@ using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Serialization; -using Robust.Shared.Timers; using Robust.Shared.ViewVariables; -using CancellationTokenSource = System.Threading.CancellationTokenSource; +using Timer = Robust.Shared.Timers.Timer; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.Doors { [RegisterComponent] [ComponentReference(typeof(IActivate))] @@ -237,7 +238,7 @@ namespace Content.Server.GameObjects if (percentage < 0.1f) continue; - damage.TakeDamage(Shared.GameObjects.DamageType.Brute, DoorCrushDamage); + damage.TakeDamage(DamageType.Brute, DoorCrushDamage); stun.Paralyze(DoorStunTime); hitSomeone = true; } diff --git a/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs b/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs index 96b7f192020..f23c611e242 100644 --- a/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs +++ b/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs @@ -1,5 +1,5 @@ using Content.Server.Explosions; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs b/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs index 4aec5f7fbc6..a547e5f0b39 100644 --- a/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs +++ b/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Weapon; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Containers; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Fluids/CanSpillComponent.cs b/Content.Server/GameObjects/Components/Fluids/CanSpillComponent.cs index e52172a4cd0..24b56c876f8 100644 --- a/Content.Server/GameObjects/Components/Fluids/CanSpillComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/CanSpillComponent.cs @@ -1,9 +1,7 @@ -using System; using Content.Server.GameObjects.Components.Chemistry; -using Content.Server.GameObjects.EntitySystems; using Content.Shared.Chemistry; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs b/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs index 8b89efc6739..598ee207543 100644 --- a/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Threading; -using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.Components.Chemistry; -using Content.Server.GameObjects.EntitySystems.Click; +using Content.Server.GameObjects.Components.Movement; using Content.Shared.Chemistry; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Physics; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; @@ -24,7 +24,6 @@ using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; using Timer = Robust.Shared.Timers.Timer; -using Content.Shared.GameObjects.EntitySystems; namespace Content.Server.GameObjects.Components.Fluids { diff --git a/Content.Server/GameObjects/Components/Fluids/SpillHelper.cs b/Content.Server/GameObjects/Components/Fluids/SpillHelper.cs index 493da11ffa1..5b85924b8d6 100644 --- a/Content.Server/GameObjects/Components/Fluids/SpillHelper.cs +++ b/Content.Server/GameObjects/Components/Fluids/SpillHelper.cs @@ -1,7 +1,6 @@ #nullable enable using Content.Shared.Chemistry; using Robust.Server.Interfaces.GameObjects; - using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; diff --git a/Content.Server/GameObjects/Components/Fluids/SprayComponent.cs b/Content.Server/GameObjects/Components/Fluids/SprayComponent.cs index 11c450f3913..ffb9cbdaa07 100644 --- a/Content.Server/GameObjects/Components/Fluids/SprayComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/SprayComponent.cs @@ -1,21 +1,13 @@ -using System; -using System.Collections.Generic; -using Content.Server.GameObjects.Components.Chemistry; +using Content.Server.GameObjects.Components.Chemistry; using Content.Server.Interfaces; using Content.Shared.Chemistry; using Content.Shared.Interfaces.GameObjects.Components; -using Microsoft.EntityFrameworkCore.Update.Internal; using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Map; -using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs index c25fc442d2b..0ea707e19c4 100644 --- a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs @@ -3,14 +3,15 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Movement; -using Content.Server.Interfaces.GameObjects.Components.Items; -using Content.Shared.GameObjects.Components.Items; using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Shared.BodySystem; +using Content.Server.Interfaces.GameObjects.Components.Items; +using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Mobs; +using Content.Shared.Health.BodySystem; using Content.Shared.Physics; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; @@ -202,7 +203,7 @@ namespace Content.Server.GameObjects.Components.GUI if (!interactionSystem.TryDroppedInteraction(Owner, item.Owner)) return false; } - + interactionSystem.DroppedInteraction(Owner, item.Owner); return true; } diff --git a/Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs b/Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs index 0bfe3b1c044..80eb1e9d757 100644 --- a/Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs @@ -1,4 +1,3 @@ -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Items.Storage; using Robust.Server.GameObjects.Components.Container; using Robust.Shared.GameObjects; @@ -7,7 +6,7 @@ using Robust.Shared.Localization; using Robust.Shared.Timers; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.GUI { // Handles the special behavior of pockets/ID card slot and their relation to uniforms. [RegisterComponent] diff --git a/Content.Server/GameObjects/Components/GUI/IInventoryController.cs b/Content.Server/GameObjects/Components/GUI/IInventoryController.cs index af6ddc9725e..e3071e2d6a7 100644 --- a/Content.Server/GameObjects/Components/GUI/IInventoryController.cs +++ b/Content.Server/GameObjects/Components/GUI/IInventoryController.cs @@ -1,7 +1,7 @@ using Robust.Shared.Interfaces.GameObjects; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.GUI { /// /// Allows for overriding inventory-related behavior on an entity. diff --git a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs index 5a9ed13f6a1..aa9f03ac104 100644 --- a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs @@ -1,15 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using Content.Server.GameObjects.Components; -using Content.Server.GameObjects.Components.GUI; -using Content.Shared.GameObjects.Components.Inventory; +using Content.Server.GameObjects.Components.Items.Clothing; using Content.Server.GameObjects.Components.Items.Storage; +using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces; using Content.Server.Interfaces.GameObjects; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects.Components.Container; using Robust.Shared.GameObjects; @@ -22,9 +20,9 @@ using Robust.Shared.Map; using Robust.Shared.Players; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; -using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage; +using static Content.Shared.GameObjects.Components.Inventory.SharedInventoryComponent.ClientInventoryMessage; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.GUI { [RegisterComponent] public class InventoryComponent : SharedInventoryComponent, IExAct, IEffectBlocker, IPressureProtection @@ -101,7 +99,7 @@ namespace Content.Server.GameObjects bool IEffectBlocker.CanSlip() { if(Owner.TryGetComponent(out InventoryComponent inventoryComponent) && - inventoryComponent.TryGetSlotItem(EquipmentSlotDefines.Slots.SHOES, out ItemComponent shoes) + inventoryComponent.TryGetSlotItem(Slots.SHOES, out ItemComponent shoes) ) { return EffectBlockerSystem.CanSlip(shoes.Owner); diff --git a/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs b/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs index 4db51104f3c..637933dd067 100644 --- a/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs +++ b/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs @@ -1,7 +1,7 @@ using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Shared.GameObjects.Components.Gravity; using Content.Shared.GameObjects.Components.Interactable; diff --git a/Content.Server/GameObjects/Components/Healing/HealingComponent.cs b/Content.Server/GameObjects/Components/Healing/HealingComponent.cs index d9beaa39168..65bbf4154a2 100644 --- a/Content.Server/GameObjects/Components/Healing/HealingComponent.cs +++ b/Content.Server/GameObjects/Components/Healing/HealingComponent.cs @@ -1,11 +1,12 @@ -using Content.Server.GameObjects.Components.Stack; +using Content.Server.GameObjects.Components.Damage; +using Content.Server.GameObjects.Components.Stack; using Content.Server.Utility; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -namespace Content.Server.GameObjects.Components.Weapon.Melee +namespace Content.Server.GameObjects.Components.Healing { [RegisterComponent] public class HealingComponent : Component, IAfterInteract, IUse diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs index 143b3e340cf..f8b7bf1d470 100644 --- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs @@ -1,10 +1,11 @@ using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Clothing; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Power; -using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.Interfaces.GameObjects.Components.Items; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs b/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs index fdaa204f910..ae8ce17a3da 100644 --- a/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs @@ -2,9 +2,8 @@ using System; using Content.Server.Atmos; using Content.Server.GameObjects.Components.Chemistry; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.EntitySystems; -using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Server.Interfaces; using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameObjects; @@ -21,7 +20,6 @@ using Robust.Shared.Utility; using Robust.Shared.ViewVariables; using Robust.Shared.Serialization; using Content.Shared.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.Components.Interactable { diff --git a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs index 290b25279ab..a94c5982bcf 100644 --- a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs @@ -1,19 +1,18 @@ using System; using System.Collections.Generic; -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.Interfaces; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Items; using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.IoC; using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Serialization; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; -using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.Items.Clothing { [RegisterComponent] [ComponentReference(typeof(ItemComponent))] diff --git a/Content.Server/GameObjects/Components/Items/DiceComponent.cs b/Content.Server/GameObjects/Components/Items/DiceComponent.cs index f916f15464c..227c0e3c4ec 100644 --- a/Content.Server/GameObjects/Components/Items/DiceComponent.cs +++ b/Content.Server/GameObjects/Components/Items/DiceComponent.cs @@ -1,5 +1,4 @@ -using Content.Server.GameObjects.EntitySystems.Click; -using Content.Shared.Audio; +using Content.Shared.Audio; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/GameObjects/Components/Items/RCDComponent.cs b/Content.Server/GameObjects/Components/Items/RCDComponent.cs index 59dbc706c88..382360ccd46 100644 --- a/Content.Server/GameObjects/Components/Items/RCDComponent.cs +++ b/Content.Server/GameObjects/Components/Items/RCDComponent.cs @@ -1,5 +1,4 @@ using System; -using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.Interfaces; using Content.Server.Utility; using Content.Shared.GameObjects.EntitySystems; diff --git a/Content.Server/GameObjects/Components/Items/Storage/CursedEntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/CursedEntityStorageComponent.cs index 7f2c5ab7111..f3068de5ce9 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/CursedEntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/CursedEntityStorageComponent.cs @@ -1,16 +1,12 @@ using System.Linq; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.Audio; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; -using Microsoft.EntityFrameworkCore.Internal; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Log; using Robust.Shared.Random; namespace Content.Server.GameObjects.Components.Items.Storage diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs index 5a22ddd354c..79bd216244c 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs @@ -2,11 +2,12 @@ using System.Linq; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Interactable; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Shared.GameObjects; +using Content.Server.GameObjects.Components.Mobs; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.GameObjects.Components.Storage; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Physics; diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/CustodialClosetFill.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/CustodialClosetFill.cs index a8a65b3fb80..db89fb17984 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/Fill/CustodialClosetFill.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/Fill/CustodialClosetFill.cs @@ -2,7 +2,6 @@ using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Random; namespace Content.Server.GameObjects.Components.Items.Storage.Fill { diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/MedkitFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/MedkitFillComponent.cs index 50221e238f4..713154661c8 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/Fill/MedkitFillComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/Fill/MedkitFillComponent.cs @@ -1,9 +1,7 @@ using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Map; namespace Content.Server.GameObjects.Components.Items.Storage.Fill { diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolLockerFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolLockerFillComponent.cs index 0a49b6fdbdf..c3b1feca9f7 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolLockerFillComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolLockerFillComponent.cs @@ -1,6 +1,5 @@ using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Random; diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs index bd48fd78c9a..ca3516f5fd3 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs @@ -3,7 +3,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Map; using Robust.Shared.Random; namespace Content.Server.GameObjects.Components.Items.Storage.Fill diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxEmergencyFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxEmergencyFillComponent.cs index 349ccb01b9d..31af8f5f8d9 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxEmergencyFillComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxEmergencyFillComponent.cs @@ -3,7 +3,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Map; using Robust.Shared.Random; namespace Content.Server.GameObjects.Components.Items.Storage.Fill diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxGoldFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxGoldFillComponent.cs index 595babd5ca3..8f6dfdf5eeb 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxGoldFillComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxGoldFillComponent.cs @@ -3,7 +3,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Map; using Robust.Shared.Random; namespace Content.Server.GameObjects.Components.Items.Storage.Fill diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/UtilityBeltClothingFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/UtilityBeltClothingFillComponent.cs index b99f03464c1..876d5c9a84a 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/Fill/UtilityBeltClothingFillComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/Fill/UtilityBeltClothingFillComponent.cs @@ -1,7 +1,6 @@ using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; namespace Content.Server.GameObjects.Components.Items.Storage.Fill diff --git a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs index a9ca9e4c78a..daf1f94d070 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs @@ -1,12 +1,12 @@ using Content.Server.GameObjects.Components.GUI; -using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Server.Throw; using Content.Server.Utility; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Containers; @@ -18,7 +18,7 @@ using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Serialization; -namespace Content.Server.GameObjects.Components +namespace Content.Server.GameObjects.Components.Items.Storage { [RegisterComponent] [ComponentReference(typeof(StorableComponent))] diff --git a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs index b2436cd3d28..dcdab4725b4 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs @@ -1,8 +1,8 @@ using Content.Server.GameObjects.Components.Access; using Content.Server.Interfaces; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Storage; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs index dc0c325a25e..5359953f39f 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.GUI; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Server.Utility; using Content.Shared.GameObjects.Components.Storage; diff --git a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs index 4acc5f59542..51b79141f93 100644 --- a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs @@ -1,34 +1,36 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; -using Content.Server.BodySystem; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.ViewVariables; using Content.Server.GameObjects.Components.Chemistry; using Content.Server.GameObjects.Components.GUI; -using Content.Shared.Chemistry; -using Robust.Shared.Serialization; -using Robust.Shared.Interfaces.GameObjects; -using Content.Shared.Prototypes.Kitchen; -using Content.Shared.Kitchen; -using Robust.Shared.Timers; -using Robust.Server.GameObjects; -using Content.Shared.GameObjects.Components.Power; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.Components.UserInterface; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Localization; -using Content.Server.Interfaces; -using Robust.Shared.Audio; -using Content.Server.Interfaces.GameObjects; -using Content.Server.Interfaces.Chat; -using Content.Shared.BodySystem; -using Robust.Shared.GameObjects.Systems; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Power.ApcNetComponents; +using Content.Server.GameObjects.EntitySystems; +using Content.Server.Health.BodySystem; +using Content.Server.Interfaces; +using Content.Server.Interfaces.Chat; +using Content.Server.Interfaces.GameObjects; +using Content.Shared.Chemistry; +using Content.Shared.GameObjects.Components.Power; +using Content.Shared.Health.BodySystem; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; +using Content.Shared.Kitchen; +using Content.Shared.Prototypes.Kitchen; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects.Components.UserInterface; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Localization; +using Robust.Shared.Serialization; +using Robust.Shared.Timers; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Kitchen { @@ -311,7 +313,7 @@ namespace Content.Server.GameObjects.Components.Kitchen (_currentCookTimerTime == (uint)recipeToCook.CookTime); SetAppearance(MicrowaveVisualState.Cooking); _audioSystem.PlayFromEntity(_startCookingSound, Owner, AudioParams.Default); - Timer.Spawn((int)(_currentCookTimerTime * _cookTimeMultiplier), (System.Action)(() => + Timer.Spawn((int)(_currentCookTimerTime * _cookTimeMultiplier), (Action)(() => { if (_lostPower) { diff --git a/Content.Server/GameObjects/Components/ListeningComponent.cs b/Content.Server/GameObjects/Components/ListeningComponent.cs index 655e594bef3..90bfb36ea1e 100644 --- a/Content.Server/GameObjects/Components/ListeningComponent.cs +++ b/Content.Server/GameObjects/Components/ListeningComponent.cs @@ -1,14 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Content.Server.GameObjects.Components.Interactable; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Interfaces; +using Content.Server.Interfaces; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; namespace Content.Server.GameObjects.Components { diff --git a/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs b/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs index 820803140a6..7521a25650d 100644 --- a/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs @@ -8,10 +8,10 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; +using Robust.Shared.Log; using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using Logger = Robust.Shared.Log.Logger; namespace Content.Server.GameObjects.Components.Markers { diff --git a/Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs b/Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs index 77b01c34a12..c1eed027611 100644 --- a/Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.GameObjects.Components.Markers; -using Content.Shared.Jobs; +using Content.Shared.Roles; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs b/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs index 24403ad67c6..0476fb8b992 100644 --- a/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs @@ -1,18 +1,13 @@ -using System; -using Content.Server.GameObjects.Components.Markers; using System.Collections.Generic; -using Content.Server.GameTicking; -using Content.Server.Interfaces.GameTicking; -using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; -using Robust.Shared.Maths; using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Maths; using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using Logger = Robust.Shared.Log.Logger; namespace Content.Server.GameObjects.Components.Markers { diff --git a/Content.Server/GameObjects/Components/Markers/WarpPointComponent.cs b/Content.Server/GameObjects/Components/Markers/WarpPointComponent.cs index 6301aa67dda..f67e91ab82f 100644 --- a/Content.Server/GameObjects/Components/Markers/WarpPointComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/WarpPointComponent.cs @@ -1,5 +1,4 @@ -using Content.Server.GameObjects.EntitySystems.Click; -using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs b/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs index 7f80981f170..c6a051b2c4d 100644 --- a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs +++ b/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs @@ -1,8 +1,13 @@ using System; using System.Collections.Generic; -using Content.Shared.GameObjects; +using Content.Server.GameObjects.Components.Damage; +using Content.Server.GameObjects.Components.Mobs; +using Content.Server.GameObjects.Components.Power.ApcNetComponents; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Medical; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.UserInterface; @@ -11,8 +16,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Utility; -using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Shared.Interfaces.GameObjects.Components; namespace Content.Server.GameObjects.Components.Medical { diff --git a/Content.Server/GameObjects/Components/Metabolism/BloodstreamComponent.cs b/Content.Server/GameObjects/Components/Metabolism/BloodstreamComponent.cs index f1f9656f4fc..e428c72f173 100644 --- a/Content.Server/GameObjects/Components/Metabolism/BloodstreamComponent.cs +++ b/Content.Server/GameObjects/Components/Metabolism/BloodstreamComponent.cs @@ -1,6 +1,6 @@ using System.Linq; using Content.Server.GameObjects.Components.Chemistry; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.Chemistry; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs b/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs index f390604b380..a7fee5d76bd 100644 --- a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs +++ b/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs @@ -1,5 +1,6 @@ -using Content.Server.GameObjects.Components.Weapon.Melee; -using Content.Shared.GameObjects; +using Content.Server.GameObjects.Components.Damage; +using Content.Server.GameObjects.Components.Weapon.Melee; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; diff --git a/Content.Server/GameObjects/Components/Mobs/DamageStates.cs b/Content.Server/GameObjects/Components/Mobs/DamageStates.cs index 69e354e7bc0..89aea5beb82 100644 --- a/Content.Server/GameObjects/Components/Mobs/DamageStates.cs +++ b/Content.Server/GameObjects/Components/Mobs/DamageStates.cs @@ -1,12 +1,11 @@ -using Content.Server.GameObjects.Components.Mobs; -using Content.Server.Mobs; +using Content.Server.Mobs; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.Mobs { /// /// Defines the blocking effect of each damage state, and what effects to apply upon entering or exiting the state diff --git a/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/DamageThresholdTemplates.cs b/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/DamageThresholdTemplates.cs index ce50ed1eef1..80295df0214 100644 --- a/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/DamageThresholdTemplates.cs +++ b/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/DamageThresholdTemplates.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; -using Content.Shared.GameObjects; +using Content.Server.GameObjects.Components.Damage; +using Content.Shared.GameObjects.Components.Damage; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.Mobs.DamageThresholdTemplates { /// /// Defines the threshold values for each damage state for any kind of species diff --git a/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs b/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs index c5ec0e5f8ea..8045758b898 100644 --- a/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs +++ b/Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; -using Content.Server.GameObjects.Components.Mobs; -using Content.Shared.GameObjects; +using Content.Server.GameObjects.Components.Damage; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs; using JetBrains.Annotations; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.Mobs.DamageThresholdTemplates { [UsedImplicitly] public class Human : DamageTemplates diff --git a/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs b/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs index 8d3283fe25e..7d21ba3124e 100644 --- a/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs @@ -1,8 +1,10 @@ using System; +using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Clothing; using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.GameObjects; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.Mobs { [RegisterComponent] public class HeatResistanceComponent : Component diff --git a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs index 1528b376154..20271f0b238 100644 --- a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs @@ -1,19 +1,18 @@ #nullable enable using Content.Server.GameObjects.Components.Observer; -using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.Interfaces.GameTicking; using Content.Server.Mobs; +using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; -using Robust.Shared.Map; using Robust.Shared.Localization; +using Robust.Shared.Map; using Robust.Shared.Serialization; using Robust.Shared.Timers; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -using Content.Shared.GameObjects.EntitySystems; namespace Content.Server.GameObjects.Components.Mobs { diff --git a/Content.Server/GameObjects/Components/Mobs/ServerOverlayEffectsComponent.cs b/Content.Server/GameObjects/Components/Mobs/ServerOverlayEffectsComponent.cs index edc74e61cd1..20a284d90b7 100644 --- a/Content.Server/GameObjects/Components/Mobs/ServerOverlayEffectsComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/ServerOverlayEffectsComponent.cs @@ -1,14 +1,10 @@ using System; using System.Collections.Generic; -using System.Linq; using Content.Shared.GameObjects.Components.Mobs; using Robust.Server.Interfaces.GameObjects; -using Robust.Server.Player; -using Robust.Shared.Enums; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.Players; -using Robust.Shared.Timers; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Mobs diff --git a/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs b/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs index ed64d334b66..61e1f671feb 100644 --- a/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs @@ -1,10 +1,11 @@ using System; using System.Collections.Generic; -using Content.Server.GameObjects.Components.Mobs; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.Interfaces; +using Content.Server.GameObjects.Components.Damage; +using Content.Server.GameObjects.Components.Mobs.DamageThresholdTemplates; +using Content.Server.GameObjects.EntitySystems; +using Content.Server.Interfaces.GameObjects; using Content.Server.Observer; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.EntitySystems; @@ -15,7 +16,7 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Players; using Robust.Shared.Serialization; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.Mobs { [RegisterComponent] [ComponentReference(typeof(SharedSpeciesComponent))] @@ -50,7 +51,7 @@ namespace Content.Server.GameObjects serializer.DataField(ref templatename, "Template", "Human"); - var type = typeof(SpeciesComponent).Assembly.GetType("Content.Server.GameObjects." + templatename); + var type = typeof(SpeciesComponent).Assembly.GetType("Content.Server.GameObjects.Components.Mobs.DamageThresholdTemplates." + templatename); DamageTemplate = (DamageTemplates) Activator.CreateInstance(type); serializer.DataFieldCached(ref _heatResistance, "HeatResistance", 323); } diff --git a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs index 16000c292bd..1a29536a5fe 100644 --- a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs @@ -1,11 +1,10 @@ using Content.Server.Mobs; using Content.Shared.GameObjects.Components.Mobs; +using Content.Shared.GameObjects.Components.Movement; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; -using Robust.Shared.ViewVariables; -using Timer = Robust.Shared.Timers.Timer; -using Content.Shared.GameObjects.Components.Movement; +using Robust.Shared.Timers; namespace Content.Server.GameObjects.Components.Mobs { diff --git a/Content.Server/GameObjects/Components/Movement/NoSlipComponent.cs b/Content.Server/GameObjects/Components/Movement/NoSlipComponent.cs index 5812dce3444..c541377f4bc 100644 --- a/Content.Server/GameObjects/Components/Movement/NoSlipComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/NoSlipComponent.cs @@ -1,5 +1,5 @@ -using Robust.Shared.GameObjects; using Content.Shared.GameObjects.EntitySystems; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Movement { diff --git a/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs b/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs index 87495abe8e1..1c5abcdfe04 100644 --- a/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs @@ -12,7 +12,6 @@ using Robust.Shared.IoC; using Robust.Shared.Serialization; using Robust.Shared.Timers; using Robust.Shared.ViewVariables; -using Robust.Shared.Utility; namespace Content.Server.GameObjects.Components.Movement { diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeContainerComponent.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeContainerComponent.cs index 100e1d67edc..23a2d1be452 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeContainerComponent.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeContainerComponent.cs @@ -1,8 +1,8 @@ -using Content.Server.GameObjects.Components.NodeContainer.Nodes; +using System.Collections.Generic; +using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System.Collections.Generic; namespace Content.Server.GameObjects.Components.NodeContainer { diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/ApcNetNodeGroup.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/ApcNetNodeGroup.cs index 310fa35dbac..ff80b1a74f0 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/ApcNetNodeGroup.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/ApcNetNodeGroup.cs @@ -1,9 +1,9 @@ -using Content.Server.GameObjects.Components.Power; -using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Robust.Shared.ViewVariables; -using System.Collections.Generic; +using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using Content.Server.GameObjects.Components.Power; +using Content.Server.GameObjects.Components.Power.ApcNetComponents; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups { diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs index 789d9ce4660..58a07022e70 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs @@ -1,7 +1,7 @@ -using Content.Server.GameObjects.Components.Power; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using Content.Server.GameObjects.Components.NodeContainer.Nodes; +using Content.Server.GameObjects.Components.Power; namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups { diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/INodeGroup.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/INodeGroup.cs index 940025d0026..b019cbf4ea7 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/INodeGroup.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/INodeGroup.cs @@ -1,7 +1,7 @@ -using Content.Server.GameObjects.Components.NodeContainer.Nodes; +using System.Collections.Generic; +using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Robust.Shared.IoC; using Robust.Shared.ViewVariables; -using System.Collections.Generic; namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups { diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs index 49cda47a7f9..7c8963544ca 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs @@ -1,8 +1,8 @@ -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.IoC; -using System; +using System; using System.Collections.Generic; using System.Reflection; +using Robust.Shared.Interfaces.Reflection; +using Robust.Shared.IoC; namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups { diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/PowerNetNodeGroup.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/PowerNetNodeGroup.cs index 8ebcc7794b4..69c39b1ec99 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/PowerNetNodeGroup.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/PowerNetNodeGroup.cs @@ -1,9 +1,9 @@ -using Content.Server.GameObjects.Components.Power.PowerNetComponents; -using Robust.Shared.IoC; -using Robust.Shared.ViewVariables; -using System; +using System; using System.Collections.Generic; using System.Diagnostics; +using Content.Server.GameObjects.Components.Power.PowerNetComponents; +using Robust.Shared.IoC; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups { diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs index 097bf8ca74f..3bb66265ea1 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs @@ -1,6 +1,6 @@ -using Robust.Shared.GameObjects.Components.Transform; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using Robust.Shared.GameObjects.Components.Transform; namespace Content.Server.GameObjects.Components.NodeContainer.Nodes { diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs index 98374bc2af7..291d681df4e 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs @@ -1,13 +1,13 @@ -using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.ViewVariables; -using System.Collections.Generic; +using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Robust.Shared.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.IoC; using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.NodeContainer.Nodes { diff --git a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs index 49e2b8b03bd..482d4608867 100644 --- a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs @@ -1,7 +1,6 @@ using Content.Server.GameObjects.Components.Chemistry; using Content.Server.GameObjects.Components.Fluids; -using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.Audio; using Content.Shared.Chemistry; using Content.Shared.GameObjects.Components.Nutrition; diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs index 9d6681c776e..33548394306 100644 --- a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Chemistry; using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Utensil; using Content.Server.Utility; using Content.Shared.Chemistry; diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs b/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs index c7735cc2b48..7769fbba052 100644 --- a/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Shared.GameObjects.Components.Nutrition; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs b/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs index 4fb6b6d2f3f..47643417bb5 100644 --- a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; +using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.Components.Movement; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Nutrition; @@ -40,7 +40,7 @@ namespace Content.Server.GameObjects.Components.Nutrition [ViewVariables(VVAccess.ReadOnly)] public override HungerThreshold CurrentHungerThreshold => _currentHungerThreshold; private HungerThreshold _currentHungerThreshold; - + private HungerThreshold _lastHungerThreshold; [ViewVariables(VVAccess.ReadWrite)] diff --git a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs b/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs index 12b7d7ae9f7..94f7b5e022f 100644 --- a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; +using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.Components.Movement; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Nutrition; @@ -40,7 +40,7 @@ namespace Content.Server.GameObjects.Components.Nutrition [ViewVariables(VVAccess.ReadOnly)] public override ThirstThreshold CurrentThirstThreshold => _currentThirstThreshold; private ThirstThreshold _currentThirstThreshold; - + private ThirstThreshold _lastThirstThreshold; [ViewVariables(VVAccess.ReadWrite)] @@ -72,7 +72,7 @@ namespace Content.Server.GameObjects.Components.Nutrition "/Textures/Interface/StatusEffects/Thirst/Parched.png", "/Textures/Interface/StatusEffects/Thirst/Dead.png", }; - + public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); diff --git a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs b/Content.Server/GameObjects/Components/PDA/PDAComponent.cs index 3edd592e37f..b3edacdfacf 100644 --- a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs +++ b/Content.Server/GameObjects/Components/PDA/PDAComponent.cs @@ -5,11 +5,12 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Access; using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.Interfaces; using Content.Server.Interfaces.PDA; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.PDA; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; diff --git a/Content.Server/GameObjects/Components/Paper/PaperComponent.cs b/Content.Server/GameObjects/Components/Paper/PaperComponent.cs index 025df877c97..0f2b48b9059 100644 --- a/Content.Server/GameObjects/Components/Paper/PaperComponent.cs +++ b/Content.Server/GameObjects/Components/Paper/PaperComponent.cs @@ -1,5 +1,4 @@ -using Content.Server.GameObjects.EntitySystems.Click; -using Content.Shared.GameObjects.Components; +using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; @@ -8,7 +7,7 @@ using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Utility; -namespace Content.Server.GameObjects.Components.Interactable +namespace Content.Server.GameObjects.Components.Paper { [RegisterComponent] public class PaperComponent : SharedPaperComponent, IExamine, IInteractUsing, IUse diff --git a/Content.Server/GameObjects/Components/Paper/WriteComponent.cs b/Content.Server/GameObjects/Components/Paper/WriteComponent.cs index d154a388fc6..1385fd4e97a 100644 --- a/Content.Server/GameObjects/Components/Paper/WriteComponent.cs +++ b/Content.Server/GameObjects/Components/Paper/WriteComponent.cs @@ -1,7 +1,6 @@ -using Content.Shared.GameObjects.Components; using Robust.Shared.GameObjects; -namespace Content.Server.GameObjects.Components.Interactable +namespace Content.Server.GameObjects.Components.Paper { [RegisterComponent] public class WriteComponent : Component diff --git a/Content.Server/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs b/Content.Server/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs index 5865bb1f82a..35706da030f 100644 --- a/Content.Server/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs +++ b/Content.Server/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs @@ -1,5 +1,4 @@ #nullable enable -using System; using System.Linq; using Content.Server.Explosions; using Content.Shared.GameObjects.Components.Pointing; diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs index 78efb7927c7..f55ded352aa 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs @@ -1,6 +1,8 @@ -using Content.Server.GameObjects.Components.Power.PowerNetComponents; +using System; using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; +using Content.Server.GameObjects.Components.Power.PowerNetComponents; using Content.Shared.GameObjects.Components.Power; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.GameObjects.EntitySystems; @@ -8,11 +10,9 @@ using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.ViewVariables; -using System; -using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.IoC; using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Power.ApcNetComponents { diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerProviderComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerProviderComponent.cs index 69cf10e6f95..5541a2a8754 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerProviderComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerProviderComponent.cs @@ -1,13 +1,13 @@ -using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; +using System; +using System.Collections.Generic; +using System.Linq; +using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System; -using System.Collections.Generic; -using System.Linq; namespace Content.Server.GameObjects.Components.Power.ApcNetComponents { diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs index bcc67552e21..01f6dbd787e 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs @@ -1,18 +1,17 @@ -using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; +using System; +using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Content.Shared.GameObjects.Components.Power; +using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; -using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; -using System; -using Content.Server.GameObjects.EntitySystems.Click; -using Robust.Shared.GameObjects.Components; using Robust.Shared.Localization; +using Robust.Shared.Serialization; using Robust.Shared.Utility; -using Content.Shared.GameObjects.EntitySystems; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Power.ApcNetComponents { diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs index 70be130114c..0bfc8444740 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs @@ -1,10 +1,10 @@ using System; using Content.Server.GameObjects.Components.GUI; -using Content.Server.GameObjects.Components.Power.ApcNetComponents; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Power; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; @@ -16,7 +16,7 @@ using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Content.Server.GameObjects.Components.Power.Chargers +namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers { [ComponentReference(typeof(IActivate))] [ComponentReference(typeof(IInteractUsing))] diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs index d704c5b545f..b33be166afe 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs @@ -13,7 +13,7 @@ using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Content.Server.GameObjects.Components.Power +namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers { public enum LightBulbState { diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs index efec4b9ca28..8c71ff18c0b 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.GameObjects.Components.Power.Chargers +namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers { /// /// Recharges an entity with a . diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs index 2c50fde2c25..a8d60ea43d9 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs @@ -1,9 +1,11 @@ using System; +using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.Components.GUI; -using Content.Server.GameObjects.Components.Power.ApcNetComponents; +using Content.Server.GameObjects.Components.Items.Storage; +using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; @@ -18,7 +20,7 @@ using Robust.Shared.IoC; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Content.Server.GameObjects.Components.Power +namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers { /// /// Component that represents a wall light. It has a light bulb that can be replaced when broken. diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs index 6ca31fef73a..e54cf3578f7 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs @@ -3,7 +3,7 @@ using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.GameObjects.Components.Power.Chargers +namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers { /// /// Recharges the battery in a . diff --git a/Content.Server/GameObjects/Components/Power/BaseNetConnectorComponent.cs b/Content.Server/GameObjects/Components/Power/BaseNetConnectorComponent.cs index d6d4362da0f..fc2148f85f9 100644 --- a/Content.Server/GameObjects/Components/Power/BaseNetConnectorComponent.cs +++ b/Content.Server/GameObjects/Components/Power/BaseNetConnectorComponent.cs @@ -1,9 +1,9 @@ -using Content.Server.GameObjects.Components.NodeContainer; +using System.Linq; +using Content.Server.GameObjects.Components.NodeContainer; using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System.Linq; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Power/BatteryComponent.cs b/Content.Server/GameObjects/Components/Power/BatteryComponent.cs index 2b52388c188..77ce70f0d40 100644 --- a/Content.Server/GameObjects/Components/Power/BatteryComponent.cs +++ b/Content.Server/GameObjects/Components/Power/BatteryComponent.cs @@ -1,8 +1,8 @@ -using Robust.Shared.GameObjects; +using System; +using Robust.Shared.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/IPowerNetManager.cs b/Content.Server/GameObjects/Components/Power/PowerNetComponents/IPowerNetManager.cs index 125695e582e..18ad79003af 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/IPowerNetManager.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNetComponents/IPowerNetManager.cs @@ -1,5 +1,5 @@ -using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; -using System.Collections.Generic; +using System.Collections.Generic; +using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; namespace Content.Server.GameObjects.Components.Power.PowerNetComponents { diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/PowerConsumerComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNetComponents/PowerConsumerComponent.cs index 15d31d9d058..28e37ad7893 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/PowerConsumerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNetComponents/PowerConsumerComponent.cs @@ -1,8 +1,8 @@ -using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; +using System.Diagnostics; +using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System.Diagnostics; 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 4bd35df8474..666befcf28d 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SmesComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SmesComponent.cs @@ -1,13 +1,12 @@ -using Content.Server.GameObjects.Components.Power.PowerNetComponents; +using System; 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 System; -namespace Content.Server.GameObjects.Components.Power +namespace Content.Server.GameObjects.Components.Power.PowerNetComponents { /// /// Handles the "user-facing" side of the actual SMES object. @@ -60,7 +59,7 @@ namespace Content.Server.GameObjects.Components.Power _lastChargeState = newChargeState; _lastChargeStateChange = _gameTiming.CurTime; _appearance.SetData(SmesVisuals.LastChargeState, newChargeState); - } + } } private int GetNewChargeLevel() diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs index 19ed2c96293..6c6d63203c3 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs @@ -1,5 +1,5 @@ -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.GameObjects.Components.Power.ApcNetComponents; +using Content.Server.GameObjects.Components.Power.ApcNetComponents; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Power; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.Components.UserInterface; @@ -8,7 +8,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -namespace Content.Server.GameObjects.Components.Power +namespace Content.Server.GameObjects.Components.Power.PowerNetComponents { [RegisterComponent] [ComponentReference(typeof(IActivate))] diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs index 04d8982e786..a86dff1b875 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs @@ -1,13 +1,12 @@ using System; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Server.GameObjects.Components.Power.PowerNetComponents; +using Content.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Timing; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Content.Server.GameObjects.Components.Power +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 3b009891af2..81333b2e077 100644 --- a/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs @@ -1,5 +1,6 @@ using Content.Server.GameObjects.Components.Stack; using Content.Server.Utility; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.Transform; @@ -7,7 +8,6 @@ using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using Content.Shared.Interfaces.GameObjects.Components; namespace Content.Server.GameObjects.Components.Power { diff --git a/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs index 756a37a44fa..d4e8dab9eb1 100644 --- a/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; using Content.Server.GameObjects.Components.Weapon; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Physics; 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 b845614bdd1..4d0bde93729 100644 --- a/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs @@ -1,19 +1,18 @@ using System; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.Physics; 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.Serialization; 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 Timer = Robust.Shared.Timers.Timer; +using Robust.Shared.Timers; namespace Content.Server.GameObjects.Components.Projectiles { @@ -26,7 +25,7 @@ namespace Content.Server.GameObjects.Components.Projectiles public override string Name => "Hitscan"; public CollisionGroup CollisionMask => (CollisionGroup) _collisionMask; private int _collisionMask; - + public float Damage { get => _damage; @@ -92,7 +91,7 @@ namespace Content.Server.GameObjects.Components.Projectiles var offset = angle.ToVec().Normalized / 2; EntitySystem.Get().PlayAtCoords(_soundHitWall, user.Transform.GridPosition.Translated(offset)); } - + Timer.Spawn((int) _deathTime.TotalMilliseconds, () => { if (!Owner.Deleted) @@ -101,16 +100,16 @@ namespace Content.Server.GameObjects.Components.Projectiles } }); } - + private EffectSystemMessage MuzzleFlash(GridCoordinates grid, Angle angle) { if (_muzzleFlash == null) { return null; } - + var offset = angle.ToVec().Normalized / 2; - + var message = new EffectSystemMessage { EffectSprite = _muzzleFlash, @@ -123,7 +122,7 @@ namespace Content.Server.GameObjects.Components.Projectiles ColorDelta = new Vector4(0, 0, 0, -1500f), Shaded = false }; - + return message; } @@ -144,7 +143,7 @@ namespace Content.Server.GameObjects.Components.Projectiles Shaded = false }; - + return message; } diff --git a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs index 9ae3d114ec7..00613c2b96c 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; +using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.Components.Mobs; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Projectiles; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs index d1b9a4d2c0e..2ae7c7f5c93 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs @@ -1,6 +1,7 @@ -using Content.Server.GameObjects.Components.Projectiles; +using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.EntitySystems.Click; using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.Physics; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; @@ -11,7 +12,7 @@ using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Timers; -namespace Content.Server.GameObjects.Components +namespace Content.Server.GameObjects.Components.Projectiles { [RegisterComponent] internal class ThrownItemComponent : ProjectileComponent, ICollideBehavior diff --git a/Content.Server/GameObjects/Components/RadioComponent.cs b/Content.Server/GameObjects/Components/RadioComponent.cs index e5e7661a5ba..daef1622b02 100644 --- a/Content.Server/GameObjects/Components/RadioComponent.cs +++ b/Content.Server/GameObjects/Components/RadioComponent.cs @@ -1,19 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Content.Server.GameObjects.EntitySystems; +using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Server.Interfaces.Chat; -using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Localization; using Robust.Shared.ViewVariables; -namespace Content.Server.GameObjects.Components.Interactable +namespace Content.Server.GameObjects.Components { [RegisterComponent] class RadioComponent : Component, IUse, IListen diff --git a/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs b/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs index 45b428d216c..8b2f31c6c4d 100644 --- a/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs +++ b/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs @@ -1,5 +1,7 @@ using System.Diagnostics.CodeAnalysis; using Content.Server.GameObjects.Components.Conveyor; +using Content.Server.GameObjects.Components.Items.Storage; +using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Construction; diff --git a/Content.Server/GameObjects/Components/Research/LatheComponent.cs b/Content.Server/GameObjects/Components/Research/LatheComponent.cs index 486b1af9b61..e848cb66eec 100644 --- a/Content.Server/GameObjects/Components/Research/LatheComponent.cs +++ b/Content.Server/GameObjects/Components/Research/LatheComponent.cs @@ -1,10 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; +using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.Components.Stack; using Content.Shared.GameObjects.Components.Materials; using Content.Shared.GameObjects.Components.Power; 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; @@ -13,8 +15,6 @@ using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; using Robust.Shared.Timers; using Robust.Shared.ViewVariables; -using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Shared.Interfaces.GameObjects.Components; namespace Content.Server.GameObjects.Components.Research { diff --git a/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs index f901b5ae64b..b57d249d3b4 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs @@ -1,4 +1,4 @@ -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Research; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.Components.UserInterface; diff --git a/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs b/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs index e636a0d3d28..cf3811f8f20 100644 --- a/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs +++ b/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +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; -using Content.Server.GameObjects.Components.Power.ApcNetComponents; namespace Content.Server.GameObjects.Components.Research { diff --git a/Content.Server/GameObjects/Components/Rotatable/FlippableComponent.cs b/Content.Server/GameObjects/Components/Rotatable/FlippableComponent.cs index 6ee47651536..c986fe04dd6 100644 --- a/Content.Server/GameObjects/Components/Rotatable/FlippableComponent.cs +++ b/Content.Server/GameObjects/Components/Rotatable/FlippableComponent.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.Interfaces; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs b/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs index 074da1aecbe..73194471c86 100644 --- a/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs +++ b/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs @@ -1,6 +1,6 @@ using Content.Server.Interfaces; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs b/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs index 812a08fec59..56e8eb19ce5 100644 --- a/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs +++ b/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs @@ -3,7 +3,6 @@ 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.Prototypes; diff --git a/Content.Server/GameObjects/Components/Stack/StackComponent.cs b/Content.Server/GameObjects/Components/Stack/StackComponent.cs index 53020796c53..aedff7d2df4 100644 --- a/Content.Server/GameObjects/Components/Stack/StackComponent.cs +++ b/Content.Server/GameObjects/Components/Stack/StackComponent.cs @@ -1,5 +1,4 @@ using System; -using Content.Server.GameObjects.EntitySystems.Click; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; diff --git a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs index 773d8f1aff2..420837f29ee 100644 --- a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs +++ b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Buckle; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Strap; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs b/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs index 9987f29093d..4e7e901ff27 100644 --- a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs +++ b/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs @@ -1,12 +1,13 @@ using System; -using Content.Shared.GameObjects; +using Content.Server.GameObjects.Components.Damage; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.Maths; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -namespace Content.Server.GameObjects +namespace Content.Server.GameObjects.Components.Temperature { public interface ITemperatureComponent : IComponent { diff --git a/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs b/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs index 66d79c8d5a7..a5bdbcb6aad 100644 --- a/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs +++ b/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs @@ -1,11 +1,11 @@ using System; -using CancellationTokenSource = System.Threading.CancellationTokenSource; +using System.Threading; using Content.Shared.GameObjects.Components.Items; using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; -using Robust.Shared.Timers; -using Robust.Shared.IoC; using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.Serialization; +using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.GameObjects.Components.Timing { diff --git a/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs b/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs index d65a7bdaae8..406e7d0535d 100644 --- a/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs +++ b/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs @@ -1,6 +1,6 @@ using System; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Shared.GameObjects.Components.Triggers; +using Content.Server.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Components.Trigger; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; @@ -8,7 +8,7 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Serialization; -namespace Content.Server.GameObjects.Components.Triggers +namespace Content.Server.GameObjects.Components.Trigger.TimerTrigger { [RegisterComponent] public class OnUseTimerTriggerComponent : Component, IUse diff --git a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs b/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs index 58e408e3eb8..6929d9f981f 100644 --- a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.VendingMachines; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; diff --git a/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs b/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs index 11499017b3a..d94e9b87ae6 100644 --- a/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs @@ -1,16 +1,11 @@ using System; -using System.Linq; using Content.Server.Utility; using Content.Shared.GameObjects.Components.Weapons; -using Content.Shared.GameObjects.EntitySystems; -using Content.Shared.Physics; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; -using Robust.Shared.Maths; 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 ab46cf1139a..9d12014cda3 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.EntitySystems.Click; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; @@ -14,9 +13,9 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; +using Robust.Shared.Timers; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.GameObjects.Components.Weapon.Melee { diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs index 2a9a7f639a8..e0dc32b98f3 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs @@ -1,8 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; +using Content.Server.GameObjects.Components.Damage; +using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Items; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs index 952593c3e21..4d52c9382e0 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; 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.GameObjects.EntitySystems.Click; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.Audio; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs index f39e8101bda..14d433e6163 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs @@ -1,10 +1,11 @@ using System; using System.Collections.Generic; 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; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs index 2939c6a6a35..e293e690d57 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs @@ -1,5 +1,4 @@ using System; -using System.Timers; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; @@ -9,12 +8,11 @@ using Robust.Shared.GameObjects.Systems; 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.Serialization; using Robust.Shared.Utility; -using Logger = Robust.Shared.Log.Logger; -using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition { diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs index c299fcfcbe7..594d1d66895 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; 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.Weapons.Ranged.Barrels; using Content.Shared.Interfaces; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs index 3e8e86e2e7a..25696a9e0d7 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; 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.Weapons.Ranged.Barrels; using Content.Shared.Interfaces; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs index 2d584cc8401..75130f5246d 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; 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.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs index ee28884cdcf..fe8488952c5 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs @@ -1,8 +1,8 @@ using System; 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.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs index 88a887b6de2..bdb9b887612 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs @@ -1,9 +1,10 @@ using System; using System.Collections.Generic; using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Power; using Content.Server.GameObjects.Components.Projectiles; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs index ff56ec7f76e..3623c4b5db8 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs @@ -1,12 +1,13 @@ using System; using System.Collections.Generic; using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; -using Content.Server.GameObjects.EntitySystems.Click; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs index 74e0cd5c4da..62ba32be5e6 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; +using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Projectiles; using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; -using Content.Server.GameObjects.EntitySystems.Click; +using Content.Server.Interfaces; using Content.Shared.Audio; 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; @@ -27,8 +29,6 @@ using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.Utility; -using Content.Server.Interfaces; -using Content.Shared.GameObjects.EntitySystems; 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 a2e0ea57c48..e87bacbe710 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs @@ -1,8 +1,10 @@ using System; +using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; diff --git a/Content.Server/GameObjects/Components/WiresComponent.cs b/Content.Server/GameObjects/Components/WiresComponent.cs index f39d297b6d7..cc9b0aba06b 100644 --- a/Content.Server/GameObjects/Components/WiresComponent.cs +++ b/Content.Server/GameObjects/Components/WiresComponent.cs @@ -4,10 +4,8 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.VendingMachines; -using Content.Server.GameObjects.EntitySystems.Click; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; -using Content.Server.Interfaces.GameObjects; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Interactable; diff --git a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs index dbca826f84f..01139bf7af6 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Content.Server.AI.Utility.AiLogic; using Content.Server.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Movement; using JetBrains.Annotations; @@ -106,7 +105,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI var processorId = args[0]; var entId = new EntityUid(int.Parse(args[1])); var ent = IoCManager.Resolve().GetEntity(entId); - var aiSystem = EntitySystem.Get(); + var aiSystem = Get(); if (!aiSystem.ProcessorTypeExists(processorId)) { diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs index 8ad08996c86..3531dcdde17 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; using Content.Server.GameObjects.Components.Access; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders; -using Content.Server.GameObjects.EntitySystems.Pathfinding; using Content.Shared.AI; using JetBrains.Annotations; using Robust.Server.GameObjects; @@ -75,7 +73,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible // Plus this way we can check if everything is equal except for vision so an entity with a lower vision radius can use an entity with a higher vision radius' cached result private Dictionary Regions)>> _cachedAccessible = new Dictionary)>>(); - + private readonly List _queuedCacheDeletions = new List(); #if DEBUG @@ -91,7 +89,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible #endif _mapmanager.OnGridRemoved += GridRemoved; } - + private void GridRemoved(GridId gridId) { _regions.Remove(gridId); @@ -457,7 +455,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible /// This is already calculated in advance so may as well re-use it /// private PathfindingRegion CalculateNode( - PathfindingNode node, + PathfindingNode node, Dictionary existingRegions, HashSet chunkRegions, int x, int y) @@ -497,15 +495,15 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible !leftRegion.IsDoor) { // We'll try and connect the left node's region to the bottom region if they're separate (yay merge) - if (bottomNeighbor != null && + if (bottomNeighbor != null && existingRegions.TryGetValue(bottomNeighbor, out bottomRegion) && - bottomRegion != leftRegion && + bottomRegion != leftRegion && !bottomRegion.IsDoor) { bottomRegion.Add(node); existingRegions.Add(node, bottomRegion); MergeInto(leftRegion, bottomRegion, existingRegions); - + // Cleanup leftRegion // MergeInto will remove it from the overall region chunk cache while we need to remove it from // our short-term ones (chunkRegions and existingRegions) @@ -515,7 +513,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible { existingRegions[leftNode] = bottomRegion; } - + return bottomRegion; } @@ -549,7 +547,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible /// /// /// - private void MergeInto(PathfindingRegion source, PathfindingRegion target, Dictionary existingRegions = null) + private void MergeInto(PathfindingRegion source, PathfindingRegion target, Dictionary existingRegions = null) { DebugTools.AssertNotNull(source); DebugTools.AssertNotNull(target); @@ -586,7 +584,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible private void ClearCache(PathfindingRegion region) { DebugTools.Assert(region.Deleted); - + // Need to forcibly clear cache for ourself and anything that includes us foreach (var (_, cachedRegions) in _cachedAccessible) { @@ -599,7 +597,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible // We could just have GetVisionAccessible remove us if it can tell we're deleted but that // seems like it could be unreliable var regionsToClear = new List(); - + foreach (var (otherRegion, cache) in cachedRegions) { if (cache.Regions.Contains(region)) @@ -613,9 +611,9 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible cachedRegions.Remove(otherRegion); } } - + #if DEBUG - if (_regions.TryGetValue(region.ParentChunk.GridId, out var chunks) && + if (_regions.TryGetValue(region.ParentChunk.GridId, out var chunks) && chunks.TryGetValue(region.ParentChunk, out var regions)) { DebugTools.Assert(!regions.Contains(region)); @@ -642,7 +640,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible _queuedCacheDeletions.Add(region); region.Shutdown(); } - + _regions[chunk.GridId].Remove(chunk); } @@ -673,7 +671,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible { DebugTools.Assert(!region.Deleted); } - + DebugTools.Assert(chunkRegions.Count < Math.Pow(PathfindingChunk.ChunkSize, 2)); SendRegionsDebugMessage(chunk.GridId); #endif diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/BFSPathfinder.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/BFSPathfinder.cs index ddb5628a02e..28e01bd0c8f 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/BFSPathfinder.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/BFSPathfinder.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders; -using Content.Server.GameObjects.EntitySystems.Pathfinding; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Map; @@ -36,7 +35,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible { startNode = pathfindingSystem.GetNode(pathfindingArgs.End); } - + PathfindingNode currentNode; openTiles.Enqueue(startNode); @@ -49,13 +48,13 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible // No distances stored so can just check closed tiles here if (closedTiles.Contains(neighbor.TileRef)) continue; closedTiles.Add(currentNode.TileRef); - + // So currently tileCost gets the octile distance between the 2 so we'll also use that for our range check var tileCost = PathfindingHelpers.GetTileCost(pathfindingArgs, startNode, neighbor); var direction = PathfindingHelpers.RelativeDirection(neighbor, currentNode); - - if (tileCost == null || - tileCost > pathfindingArgs.Proximity || + + if (tileCost == null || + tileCost > pathfindingArgs.Proximity || !PathfindingHelpers.DirectionTraversable(pathfindingArgs.CollisionMask, pathfindingArgs.Access, currentNode, direction)) { continue; @@ -67,4 +66,4 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible } } } -} \ No newline at end of file +} diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/PathfindingRegion.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/PathfindingRegion.cs index 5de05ee9252..d3e7fba4017 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/PathfindingRegion.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/PathfindingRegion.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics; -using Content.Server.GameObjects.EntitySystems.Pathfinding; -using Robust.Shared.Utility; namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible { @@ -16,7 +13,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible /// Bottom-left reference node of the region /// public PathfindingNode OriginNode { get; } - + // The shape may be anything within the bounds of a chunk, this is just a quick way to do a bounds-check /// @@ -49,13 +46,13 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible { // Tell our neighbors we no longer exist ;-/ var neighbors = new List(Neighbors); - + for (var i = 0; i < neighbors.Count; i++) { var neighbor = neighbors[i]; neighbor.Neighbors.Remove(this); } - + _nodes.Clear(); Neighbors.Clear(); @@ -81,7 +78,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible { xDistance = Math.Abs(xDistance + otherRegion.Width); } - + if (yDistance > 0) { yDistance -= Height; @@ -90,7 +87,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible { yDistance = Math.Abs(yDistance + otherRegion.Height); } - + return PathfindingHelpers.OctileDistance(xDistance, yDistance); } @@ -121,10 +118,10 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible { Height = yHeight; } - + _nodes.Add(node); } - + // HashSet wasn't working correctly so uhh we got this. public bool Equals(PathfindingRegion other) { @@ -141,4 +138,4 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible return OriginNode.GetHashCode(); } } -} \ No newline at end of file +} diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs index 0f9f4deacc2..f7aa32d3e21 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs @@ -1,10 +1,8 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using Content.Server.GameObjects.EntitySystems.JobQueues; -using Content.Server.GameObjects.EntitySystems.Pathfinding; using Content.Shared.AI; using Robust.Shared.Map; using Robust.Shared.Utility; @@ -55,7 +53,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders costSoFar[_startNode] = 0.0f; var routeFound = false; var count = 0; - + while (frontier.Count > 0) { // Handle whether we need to pause if we've taken too long @@ -69,7 +67,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders return null; } } - + // Actual pathfinding here (_, currentNode) = frontier.Take(); if (currentNode.Equals(_endNode)) diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs index 0d47f0671b2..db3639e513a 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading; using System.Threading.Tasks; using Content.Server.GameObjects.EntitySystems.JobQueues; -using Content.Server.GameObjects.EntitySystems.Pathfinding; using Content.Shared.AI; using Robust.Shared.Log; using Robust.Shared.Map; @@ -284,7 +282,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders // If we're going diagonally need to check all cardinals. // I tried just casting direction ints and offsets to make it smaller but brain no worky. // From NorthEast we check (Closed / Open) S - SE, W - NW - + PathfindingNode openNeighborOne = null; PathfindingNode closedNeighborOne = null; PathfindingNode openNeighborTwo = null; diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingComparer.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingComparer.cs index 7188542f5ee..f338cc91543 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingComparer.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingComparer.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Content.Server.GameObjects.EntitySystems.Pathfinding; namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders { diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs index ebb2b3657f6..89e909c1e65 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs @@ -1,12 +1,9 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; -using Content.Server.GameObjects.EntitySystems.Pathfinding; 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; @@ -23,7 +20,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding Chunk = chunk; } } - + public class PathfindingChunk { public TimeSpan LastUpdate { get; private set; } @@ -53,7 +50,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding CreateNode(tileRef); } } - + Dirty(); } @@ -71,7 +68,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding { var pathfindingSystem = EntitySystem.Get(); var chunkGrid = pathfindingSystem.Graph[GridId]; - + for (var x = -1; x <= 1; x++) { for (var y = -1; y <= 1; y++) @@ -159,7 +156,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding } yield break; - + } // South edge if (node.TileRef.Y == _indices.Y) diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs index cabe4e92e5e..3abd8e19667 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; -using Content.Server.GameObjects.Components.Access; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders; -using Content.Server.GameObjects.EntitySystems.Pathfinding; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; @@ -38,40 +36,40 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding // If it's a diagonal we need to check NSEW to see if we can get to it and stop corner cutting, NE needs N and E etc. // Given there's different collision layers stored for each node in the graph it's probably not worth it to cache this // Also this will help with corner-cutting - + PathfindingNode northNeighbor = null; PathfindingNode southNeighbor = null; PathfindingNode eastNeighbor = null; PathfindingNode westNeighbor = null; foreach (var neighbor in currentNode.GetNeighbors()) { - if (neighbor.TileRef.X == currentNode.TileRef.X && + if (neighbor.TileRef.X == currentNode.TileRef.X && neighbor.TileRef.Y == currentNode.TileRef.Y + 1) { northNeighbor = neighbor; continue; - } - - if (neighbor.TileRef.X == currentNode.TileRef.X + 1 && + } + + if (neighbor.TileRef.X == currentNode.TileRef.X + 1 && neighbor.TileRef.Y == currentNode.TileRef.Y) { eastNeighbor = neighbor; continue; } - - if (neighbor.TileRef.X == currentNode.TileRef.X && + + if (neighbor.TileRef.X == currentNode.TileRef.X && neighbor.TileRef.Y == currentNode.TileRef.Y - 1) { southNeighbor = neighbor; continue; - } - - if (neighbor.TileRef.X == currentNode.TileRef.X - 1 && + } + + if (neighbor.TileRef.X == currentNode.TileRef.X - 1 && neighbor.TileRef.Y == currentNode.TileRef.Y) { westNeighbor = neighbor; continue; - } + } } switch (direction) @@ -130,7 +128,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding return true; } - + public static Queue ReconstructPath(Dictionary cameFrom, PathfindingNode current) { var running = new Stack(); @@ -244,7 +242,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding return 1.4f * dstX + (dstY - dstX); } - + public static float OctileDistance(TileRef endTile, TileRef startTile) { // "Fast Euclidean" / octile. diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs index c35bf9a0f3a..a5047294cdf 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs @@ -3,16 +3,13 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Access; using Content.Server.GameObjects.Components.Doors; -using Content.Server.GameObjects.EntitySystems.AI.Pathfinding; -using Robust.Server.GameObjects; -using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Utility; -namespace Content.Server.GameObjects.EntitySystems.Pathfinding +namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding { public class PathfindingNode { @@ -20,7 +17,7 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding private readonly PathfindingChunk _parentChunk; public TileRef TileRef { get; private set; } - + /// /// Whenever there's a change in the collision layers we update the mask as the graph has more reads than writes /// @@ -46,7 +43,7 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding public static bool IsRelevant(IEntity entity, ICollidableComponent collidableComponent) { - if (entity.Transform.GridID == GridId.Invalid || + if (entity.Transform.GridID == GridId.Invalid || (PathfindingSystem.TrackedCollisionLayers & collidableComponent.CollisionLayer) == 0) { return false; @@ -66,7 +63,7 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding { neighborChunks = ParentChunk.RelevantChunks(this).ToList(); } - + for (var x = -1; x <= 1; x++) { for (var y = -1; y <= 1; y++) @@ -112,7 +109,7 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding { return ParentChunk.Nodes[chunkXOffset + 1, chunkYOffset]; } - + neighborMapIndices = new MapIndices(TileRef.X + 1, TileRef.Y); foreach (var neighbor in ParentChunk.GetNeighbors()) { @@ -129,7 +126,7 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding { return ParentChunk.Nodes[chunkXOffset + 1, chunkYOffset + 1]; } - + neighborMapIndices = new MapIndices(TileRef.X + 1, TileRef.Y + 1); foreach (var neighbor in ParentChunk.GetNeighbors()) { @@ -146,7 +143,7 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding { return ParentChunk.Nodes[chunkXOffset, chunkYOffset + 1]; } - + neighborMapIndices = new MapIndices(TileRef.X, TileRef.Y + 1); foreach (var neighbor in ParentChunk.GetNeighbors()) { @@ -163,7 +160,7 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding { return ParentChunk.Nodes[chunkXOffset - 1, chunkYOffset + 1]; } - + neighborMapIndices = new MapIndices(TileRef.X - 1, TileRef.Y + 1); foreach (var neighbor in ParentChunk.GetNeighbors()) { @@ -180,7 +177,7 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding { return ParentChunk.Nodes[chunkXOffset - 1, chunkYOffset]; } - + neighborMapIndices = new MapIndices(TileRef.X - 1, TileRef.Y); foreach (var neighbor in ParentChunk.GetNeighbors()) { @@ -197,7 +194,7 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding { return ParentChunk.Nodes[chunkXOffset - 1, chunkYOffset - 1]; } - + neighborMapIndices = new MapIndices(TileRef.X - 1, TileRef.Y - 1); foreach (var neighbor in ParentChunk.GetNeighbors()) { @@ -214,7 +211,7 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding { return ParentChunk.Nodes[chunkXOffset, chunkYOffset - 1]; } - + neighborMapIndices = new MapIndices(TileRef.X, TileRef.Y - 1); foreach (var neighbor in ParentChunk.GetNeighbors()) { @@ -231,7 +228,7 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding { return ParentChunk.Nodes[chunkXOffset + 1, chunkYOffset - 1]; } - + neighborMapIndices = new MapIndices(TileRef.X + 1, TileRef.Y - 1); foreach (var neighbor in ParentChunk.GetNeighbors()) { @@ -276,9 +273,9 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding } return; } - + DebugTools.Assert((PathfindingSystem.TrackedCollisionLayers & collidableComponent.CollisionLayer) != 0); - + if (!collidableComponent.Anchored) { _physicsLayers.Add(entity, collidableComponent.CollisionLayer); @@ -304,12 +301,12 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding if (_physicsLayers.ContainsKey(entity)) { _physicsLayers.Remove(entity); - } + } else if (_accessReaders.ContainsKey(entity)) { _accessReaders.Remove(entity); ParentChunk.Dirty(); - } + } else if (_blockedCollidables.ContainsKey(entity)) { _blockedCollidables.Remove(entity); diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs index 05069f27fd4..ff672ee6340 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs @@ -1,15 +1,11 @@ using System; using System.Collections.Generic; -using System.IO; using System.Threading; using Content.Server.GameObjects.Components.Access; -using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders; using Content.Server.GameObjects.EntitySystems.JobQueues; using Content.Server.GameObjects.EntitySystems.JobQueues.Queues; -using Content.Server.GameObjects.EntitySystems.Pathfinding; using Content.Shared.Physics; -using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.GameObjects.Systems; @@ -275,9 +271,9 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding /// private void HandleEntityAdd(IEntity entity) { - if (entity.Deleted || + if (entity.Deleted || _lastKnownPositions.ContainsKey(entity) || - !entity.TryGetComponent(out ICollidableComponent collidableComponent) || + !entity.TryGetComponent(out ICollidableComponent collidableComponent) || !PathfindingNode.IsRelevant(entity, collidableComponent)) { return; @@ -315,23 +311,23 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding private void HandleEntityMove(MoveEvent moveEvent) { // If we've moved to space or the likes then remove us. - if (moveEvent.Sender.Deleted || + if (moveEvent.Sender.Deleted || !moveEvent.Sender.TryGetComponent(out ICollidableComponent collidableComponent) || !PathfindingNode.IsRelevant(moveEvent.Sender, collidableComponent)) { HandleEntityRemove(moveEvent.Sender); return; } - + // Memory leak protection until grid parenting confirmed fix / you REALLY need the performance var gridBounds = _mapManager.GetGrid(moveEvent.Sender.Transform.GridID).WorldBounds; - + if (!gridBounds.Contains(moveEvent.Sender.Transform.WorldPosition)) { HandleEntityRemove(moveEvent.Sender); return; } - + // If we move from space to a grid we may need to start tracking it. if (!_lastKnownPositions.TryGetValue(moveEvent.Sender, out var oldNode)) { @@ -342,7 +338,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding // The pathfinding graph is tile-based so first we'll check if they're on a different tile and if we need to update. // If you get entities bigger than 1 tile wide you'll need some other system so god help you. var newTile = _mapManager.GetGrid(moveEvent.NewPosition.GridID).GetTileRef(moveEvent.NewPosition); - + if (oldNode == null || oldNode.TileRef == newTile) { return; diff --git a/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs index c6296a98ccc..ea9ca44ec18 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs @@ -8,14 +8,11 @@ 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 Robust.Server.GameObjects; using Robust.Server.Interfaces.Timing; -using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; diff --git a/Content.Server/GameObjects/EntitySystems/ActSystem.cs b/Content.Server/GameObjects/EntitySystems/ActSystem.cs index 4fd95bb847e..56be8389eae 100644 --- a/Content.Server/GameObjects/EntitySystems/ActSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ActSystem.cs @@ -5,7 +5,7 @@ using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { /// /// This interface gives components behavior on getting destoyed. diff --git a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs index 4faabfe44ba..71acf54c527 100644 --- a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using Content.Server.Atmos; -using Content.Server.GameObjects.Components.Atmos; using JetBrains.Annotations; using Robust.Server.Interfaces.Timing; using Robust.Shared.GameObjects; @@ -10,6 +9,7 @@ using Robust.Shared.GameObjects.Components.Map; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; +using Robust.Shared.IoC; using Robust.Shared.Map; namespace Content.Server.GameObjects.EntitySystems @@ -18,9 +18,9 @@ namespace Content.Server.GameObjects.EntitySystems public class AtmosphereSystem : EntitySystem { #pragma warning disable 649 - [Robust.Shared.IoC.Dependency] private readonly IMapManager _mapManager = default!; - [Robust.Shared.IoC.Dependency] private readonly IEntityManager _entityManager = default!; - [Robust.Shared.IoC.Dependency] private readonly IPauseManager _pauseManager = default!; + [Dependency] private readonly IMapManager _mapManager = default!; + [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IPauseManager _pauseManager = default!; #pragma warning restore 649 public override void Initialize() diff --git a/Content.Server/GameObjects/EntitySystems/BaseChargerSystem.cs b/Content.Server/GameObjects/EntitySystems/BaseChargerSystem.cs index 2d763020b4a..d206e074610 100644 --- a/Content.Server/GameObjects/EntitySystems/BaseChargerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/BaseChargerSystem.cs @@ -1,8 +1,8 @@ -using Content.Server.GameObjects.Components.Power.Chargers; +using Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class BaseChargerSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/BloodstreamSystem.cs b/Content.Server/GameObjects/EntitySystems/BloodstreamSystem.cs index 5a1587b6265..fc6a69f325c 100644 --- a/Content.Server/GameObjects/EntitySystems/BloodstreamSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/BloodstreamSystem.cs @@ -2,7 +2,7 @@ using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { /// /// Triggers metabolism updates for diff --git a/Content.Server/GameObjects/EntitySystems/ChemistrySystem.cs b/Content.Server/GameObjects/EntitySystems/ChemistrySystem.cs index 39cca2be0e9..69bd555460d 100644 --- a/Content.Server/GameObjects/EntitySystems/ChemistrySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ChemistrySystem.cs @@ -4,7 +4,7 @@ using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { /// /// This interface gives components behavior on whether entities solution (implying SolutionComponent is in place) is changed diff --git a/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs index cec72d85083..53fa77c516d 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs @@ -4,7 +4,6 @@ using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Maths; using Robust.Shared.Utility; namespace Content.Server.GameObjects.EntitySystems.Click diff --git a/Content.Server/GameObjects/EntitySystems/CombatModeSystem.cs b/Content.Server/GameObjects/EntitySystems/CombatModeSystem.cs index f8fd65915e3..12e4963718d 100644 --- a/Content.Server/GameObjects/EntitySystems/CombatModeSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/CombatModeSystem.cs @@ -1,17 +1,7 @@ -using Content.Server.GameObjects.Components.Mobs; -using Content.Shared.GameObjects.EntitySystems; -using Content.Shared.Input; +using Content.Shared.GameObjects.EntitySystems; using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Input; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.IoC; -using Robust.Shared.Log; -using Robust.Shared.Players; -using Robust.Shared.Random; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] public sealed class CombatModeSystem : SharedCombatModeSystem diff --git a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs b/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs index 8b7c7ddeb56..b054fd54015 100644 --- a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs @@ -1,15 +1,16 @@ using System; using System.Collections.Generic; -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Construction; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Interactable; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.Utility; using Content.Shared.Construction; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Interactable; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; using JetBrains.Annotations; using Robust.Server.GameObjects; @@ -32,7 +33,7 @@ namespace Content.Server.GameObjects.EntitySystems /// The server-side implementation of the construction system, which is used for constructing entities in game. /// [UsedImplicitly] - internal class ConstructionSystem : Shared.GameObjects.EntitySystems.SharedConstructionSystem + internal class ConstructionSystem : SharedConstructionSystem { #pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager; @@ -337,7 +338,7 @@ namespace Content.Server.GameObjects.EntitySystems } // OK WE'RE GOOD CONSTRUCTION STARTED. - EntitySystem.Get().PlayFromEntity("/Audio/Items/deconstruct.ogg", placingEnt); + Get().PlayFromEntity("/Audio/Items/deconstruct.ogg", placingEnt); if (prototype.Stages.Count == 2) { // Exactly 2 stages, so don't make an intermediate frame. diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs index 63eb8ee3784..2a409d0bfe0 100644 --- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs +++ b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs @@ -1,39 +1,40 @@ #nullable enable using System; using System.Threading.Tasks; -using Content.Server.GameObjects.Components; +using Content.Server.GameObjects.Components.Damage; 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; -namespace Content.Server.GameObjects.EntitySystems +namespace Content.Server.GameObjects.EntitySystems.DoAfter { public sealed class DoAfter { public Task AsTask { get; } - + private TaskCompletionSource Tcs { get;} - + public DoAfterEventArgs EventArgs; - + public TimeSpan StartTime { get; } - + public float Elapsed { get; set; } - + public GridCoordinates UserGrid { get; } - + public GridCoordinates TargetGrid { get; } private bool _tookDamage; public DoAfterStatus Status => AsTask.IsCompletedSuccessfully ? AsTask.Result : DoAfterStatus.Running; - + // NeedHand private string? _activeHand; private ItemComponent? _activeItem; - + public DoAfter(DoAfterEventArgs eventArgs) { EventArgs = eventArgs; @@ -57,7 +58,7 @@ namespace Content.Server.GameObjects.EntitySystems _activeHand = handsComponent.ActiveHand; _activeItem = handsComponent.GetActiveHand; } - + Tcs = new TaskCompletionSource(); AsTask = Tcs.Task; } @@ -79,15 +80,15 @@ namespace Content.Server.GameObjects.EntitySystems default: throw new ArgumentOutOfRangeException(); } - + Elapsed += frameTime; - + if (IsFinished()) { Tcs.SetResult(DoAfterStatus.Finished); return; } - + if (IsCancelled()) { Tcs.SetResult(DoAfterStatus.Cancelled); @@ -101,13 +102,13 @@ namespace Content.Server.GameObjects.EntitySystems { return true; } - + // TODO :Handle inertia in space. if (EventArgs.BreakOnUserMove && EventArgs.User.Transform.GridPosition != UserGrid) { return true; } - + if (EventArgs.BreakOnTargetMove && EventArgs.Target!.Transform.GridPosition != TargetGrid) { return true; @@ -129,7 +130,7 @@ namespace Content.Server.GameObjects.EntitySystems { return true; } - + if (EventArgs.NeedHand) { if (!EventArgs.User.TryGetComponent(out HandsComponent handsComponent)) @@ -169,4 +170,4 @@ namespace Content.Server.GameObjects.EntitySystems return true; } } -} \ No newline at end of file +} diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs index 8aca9fdc83e..7906c616eb8 100644 --- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs +++ b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs @@ -2,9 +2,10 @@ using System; using System.Threading; using Robust.Shared.Interfaces.GameObjects; + // ReSharper disable UnassignedReadonlyField -namespace Content.Server.GameObjects.EntitySystems +namespace Content.Server.GameObjects.EntitySystems.DoAfter { public sealed class DoAfterEventArgs { diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs index 8aa394b25af..1c01a789a02 100644 --- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs @@ -3,13 +3,13 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Content.Server.GameObjects.Components; +using Content.Server.GameObjects.Components.Damage; using JetBrains.Annotations; using Robust.Server.Interfaces.Timing; -using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.IoC; -namespace Content.Server.GameObjects.EntitySystems +namespace Content.Server.GameObjects.EntitySystems.DoAfter { [UsedImplicitly] public sealed class DoAfterSystem : EntitySystem @@ -19,18 +19,18 @@ namespace Content.Server.GameObjects.EntitySystems public override void Update(float frameTime) { base.Update(frameTime); - + foreach (var comp in ComponentManager.EntityQuery()) { if (_pauseManager.IsGridPaused(comp.Owner.Transform.GridID)) continue; - + var cancelled = new List(0); var finished = new List(0); foreach (var doAfter in comp.DoAfters) { doAfter.Run(frameTime); - + switch (doAfter.Status) { case DoAfterStatus.Running: @@ -59,7 +59,7 @@ namespace Content.Server.GameObjects.EntitySystems finished.Clear(); } } - + /// /// Tasks that are delayed until the specified time has passed /// These can be potentially cancelled by the user moving or when other things happen. @@ -74,7 +74,7 @@ namespace Content.Server.GameObjects.EntitySystems var doAfterComponent = eventArgs.User.GetComponent(); doAfterComponent.Add(doAfter); DamageableComponent? damageableComponent = null; - + // TODO: If the component's deleted this may not get unsubscribed? if (eventArgs.BreakOnDamage && eventArgs.User.TryGetComponent(out damageableComponent)) { @@ -82,12 +82,12 @@ namespace Content.Server.GameObjects.EntitySystems } await doAfter.AsTask; - + if (damageableComponent != null) { damageableComponent.Damaged -= doAfter.HandleDamage; } - + return doAfter.Status; } } @@ -98,4 +98,4 @@ namespace Content.Server.GameObjects.EntitySystems Cancelled, Finished, } -} \ No newline at end of file +} diff --git a/Content.Server/GameObjects/EntitySystems/DoorSystem.cs b/Content.Server/GameObjects/EntitySystems/DoorSystem.cs index d9c6a782d86..fb5d0fe4324 100644 --- a/Content.Server/GameObjects/EntitySystems/DoorSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/DoorSystem.cs @@ -1,4 +1,5 @@ -using Robust.Shared.GameObjects.Systems; +using Content.Server.GameObjects.Components.Doors; +using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs b/Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs index 79e50ced632..1f536cf500a 100644 --- a/Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs @@ -1,10 +1,5 @@ using Content.Server.GameObjects.Components.Atmos; -using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/GasTileOverlaySystem.cs b/Content.Server/GameObjects/EntitySystems/GasTileOverlaySystem.cs index 6fb9879bd77..493ef068ed6 100644 --- a/Content.Server/GameObjects/EntitySystems/GasTileOverlaySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GasTileOverlaySystem.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.CompilerServices; -using Content.Server.Atmos; using Content.Server.GameObjects.Components.Atmos; using Content.Shared.Atmos; using Content.Shared.GameObjects.EntitySystems; @@ -10,13 +9,10 @@ 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.GameObjects; using Robust.Shared.Interfaces.Map; -using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; using Robust.Shared.Map; -using Robust.Shared.Utility; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs b/Content.Server/GameObjects/EntitySystems/GravitySystem.cs index eac786be6cc..84a265b70c5 100644 --- a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/GravitySystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Random; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class GravitySystem : EntitySystem @@ -82,7 +82,7 @@ namespace Content.Server.Interfaces.GameObjects.Components.Interaction { if (player.AttachedEntity == null || player.AttachedEntity.Transform.GridID != gridId) continue; - EntitySystem.Get().PlayFromEntity("/Audio/Effects/alert.ogg", player.AttachedEntity); + Get().PlayFromEntity("/Audio/Effects/alert.ogg", player.AttachedEntity); } } diff --git a/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs b/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs index 0ffd887de58..abb68219e76 100644 --- a/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs @@ -2,7 +2,7 @@ using Content.Server.GameObjects.Components.Interactable; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class HandHeldLightSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs b/Content.Server/GameObjects/EntitySystems/HandsSystem.cs index 5d2101367a8..8243fca463c 100644 --- a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/HandsSystem.cs @@ -1,8 +1,14 @@ -using System.Linq; +using System; +using System.Linq; +using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Stack; +using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.Interfaces; +using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Server.Throw; using Content.Shared.GameObjects.Components.Inventory; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Input; using JetBrains.Annotations; using Robust.Server.GameObjects.EntitySystemMessages; @@ -15,18 +21,8 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Players; -using System; -using Content.Server.GameObjects.Components.GUI; -using Content.Server.Interfaces.GameObjects.Components.Items; -using Content.Shared.GameObjects.EntitySystems; -using Content.Server.GameObjects; -using Content.Server.GameObjects.Components; -using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.GameObjects.EntitySystems.Click; -using Content.Shared.Interfaces; -using Robust.Shared.Maths; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class HandsSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/HungerSystem.cs b/Content.Server/GameObjects/EntitySystems/HungerSystem.cs index 4cc79725285..cddc2b76dd2 100644 --- a/Content.Server/GameObjects/EntitySystems/HungerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/HungerSystem.cs @@ -2,7 +2,7 @@ using Content.Server.GameObjects.Components.Nutrition; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class HungerSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/JobQueues/IJob.cs b/Content.Server/GameObjects/EntitySystems/JobQueues/IJob.cs index e23429ae14e..6ecb5826bce 100644 --- a/Content.Server/GameObjects/EntitySystems/JobQueues/IJob.cs +++ b/Content.Server/GameObjects/EntitySystems/JobQueues/IJob.cs @@ -1,5 +1,3 @@ -using System.Collections; - namespace Content.Server.GameObjects.EntitySystems.JobQueues { public interface IJob diff --git a/Content.Server/GameObjects/EntitySystems/LatheSystem.cs b/Content.Server/GameObjects/EntitySystems/LatheSystem.cs index 7c4c96d9a1d..777c22c82c6 100644 --- a/Content.Server/GameObjects/EntitySystems/LatheSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/LatheSystem.cs @@ -2,7 +2,7 @@ using Content.Server.GameObjects.Components.Research; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class LatheSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs b/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs index 9e84644d4f3..3180063247a 100644 --- a/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs @@ -2,7 +2,7 @@ using Content.Server.GameObjects.Components.Medical; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class MedicalScannerSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/MeleeWeaponSystem.cs b/Content.Server/GameObjects/EntitySystems/MeleeWeaponSystem.cs index 9dfd278add8..82ba72537a5 100644 --- a/Content.Server/GameObjects/EntitySystems/MeleeWeaponSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MeleeWeaponSystem.cs @@ -5,7 +5,7 @@ using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Maths; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { public sealed class MeleeWeaponSystem : EntitySystem { diff --git a/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs b/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs index 3231d4db5ec..a1ccba35eda 100644 --- a/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs @@ -2,7 +2,7 @@ using Content.Server.GameObjects.Components.Kitchen; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class MicrowaveSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs index 6caaf9523bc..35c99acd982 100644 --- a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs @@ -1,6 +1,6 @@ #nullable enable -using Content.Server.GameObjects; 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; diff --git a/Content.Server/GameObjects/EntitySystems/PortalSystem.cs b/Content.Server/GameObjects/EntitySystems/PortalSystem.cs index fc16603c09f..08e06fe150f 100644 --- a/Content.Server/GameObjects/EntitySystems/PortalSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PortalSystem.cs @@ -2,7 +2,7 @@ using Content.Server.GameObjects.Components.Movement; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class PortalSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/PowerApcSystem.cs b/Content.Server/GameObjects/EntitySystems/PowerApcSystem.cs index 2bdb58b2a21..2e9253ad045 100644 --- a/Content.Server/GameObjects/EntitySystems/PowerApcSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PowerApcSystem.cs @@ -1,12 +1,12 @@ -using Content.Server.GameObjects.Components.Power.ApcNetComponents; +using System.Collections.Generic; using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; -using Robust.Shared.GameObjects.Systems; -using System.Collections.Generic; +using Content.Server.GameObjects.Components.Power.ApcNetComponents; using JetBrains.Annotations; -using Robust.Shared.IoC; using Robust.Server.Interfaces.Timing; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.IoC; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class PowerApcSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/PowerSmesSystem.cs b/Content.Server/GameObjects/EntitySystems/PowerSmesSystem.cs index 3f75198dbec..f6bc4cdeebf 100644 --- a/Content.Server/GameObjects/EntitySystems/PowerSmesSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PowerSmesSystem.cs @@ -1,9 +1,8 @@ -using Content.Server.GameObjects.Components.Power; +using Content.Server.GameObjects.Components.Power.PowerNetComponents; using JetBrains.Annotations; -using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal class PowerSmesSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/PowerSolarControlConsoleSystem.cs b/Content.Server/GameObjects/EntitySystems/PowerSolarControlConsoleSystem.cs index d2fb4e4255c..68820fbd1b5 100644 --- a/Content.Server/GameObjects/EntitySystems/PowerSolarControlConsoleSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PowerSolarControlConsoleSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.GameObjects.Components.Power; +using Content.Server.GameObjects.Components.Power.PowerNetComponents; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; diff --git a/Content.Server/GameObjects/EntitySystems/PowerSolarSystem.cs b/Content.Server/GameObjects/EntitySystems/PowerSolarSystem.cs index 4a5244302cd..d2a437b40a8 100644 --- a/Content.Server/GameObjects/EntitySystems/PowerSolarSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PowerSolarSystem.cs @@ -1,6 +1,8 @@ -using Content.Server.GameObjects.Components.Power; -using JetBrains.Annotations; +using System; +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; @@ -8,10 +10,8 @@ using Robust.Shared.Interfaces.Random; using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Maths; -using System; -using System.Linq; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { /// /// Responsible for maintaining the solar-panel sun angle and updating coverage. @@ -90,7 +90,7 @@ namespace Content.Server.Interfaces.GameObjects.Components.Interaction { // There's supposed to be rotational logic here, but that implies putting it somewhere. panel.Owner.Transform.WorldRotation = TargetPanelRotation; - + if (panel.TimeOfNextCoverageUpdate < _gameTiming.CurTime) { // Setup the next coverage check. diff --git a/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs b/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs index 86d91516571..7838ef62e0e 100644 --- a/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs @@ -2,7 +2,7 @@ using Content.Server.GameObjects.Components.Projectiles; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class ProjectileSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs b/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs index 866ad39de9e..f36783a983e 100644 --- a/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs @@ -1,13 +1,12 @@ using Content.Server.GameObjects.Components.Fluids; using JetBrains.Annotations; -using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class PuddleSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/RadioSystem.cs b/Content.Server/GameObjects/EntitySystems/RadioSystem.cs index 59f2e27c2f0..ce6be941458 100644 --- a/Content.Server/GameObjects/EntitySystems/RadioSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/RadioSystem.cs @@ -1,7 +1,7 @@ -using Content.Server.GameObjects.Components.Interactable; +using System.Collections.Generic; +using Content.Server.GameObjects.Components; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; -using System.Collections.Generic; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/ResearchSystem.cs b/Content.Server/GameObjects/EntitySystems/ResearchSystem.cs index e67bd348954..6e4734139b2 100644 --- a/Content.Server/GameObjects/EntitySystems/ResearchSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ResearchSystem.cs @@ -4,7 +4,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { public class ResearchSystem : EntitySystem { diff --git a/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs b/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs index 485ccb6b6f9..9077e941842 100644 --- a/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs @@ -6,7 +6,7 @@ using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Timer = Robust.Shared.Timers.Timer; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { public class RoundEndSystem : EntitySystem { diff --git a/Content.Server/GameObjects/EntitySystems/StomachSystem.cs b/Content.Server/GameObjects/EntitySystems/StomachSystem.cs index a6b6cad1309..ffc16af2064 100644 --- a/Content.Server/GameObjects/EntitySystems/StomachSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/StomachSystem.cs @@ -2,7 +2,7 @@ using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { /// /// Triggers digestion updates on diff --git a/Content.Server/GameObjects/EntitySystems/StorageSystem.cs b/Content.Server/GameObjects/EntitySystems/StorageSystem.cs index e33b958a935..b3f49605cbb 100644 --- a/Content.Server/GameObjects/EntitySystems/StorageSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/StorageSystem.cs @@ -6,7 +6,7 @@ using Robust.Server.GameObjects.EntitySystemMessages; using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class StorageSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/StunSystem.cs b/Content.Server/GameObjects/EntitySystems/StunSystem.cs index 8278b73b29a..6e3a4459baf 100644 --- a/Content.Server/GameObjects/EntitySystems/StunSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/StunSystem.cs @@ -2,7 +2,7 @@ using Content.Server.GameObjects.Components.Mobs; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class StunSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/TemperatureSystem.cs b/Content.Server/GameObjects/EntitySystems/TemperatureSystem.cs index 27652ad9f1d..f03b240a0b7 100644 --- a/Content.Server/GameObjects/EntitySystems/TemperatureSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/TemperatureSystem.cs @@ -1,8 +1,8 @@ -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Temperature; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class TemperatureSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs b/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs index dfc22949098..b6047a273c3 100644 --- a/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs @@ -2,7 +2,7 @@ using Content.Server.GameObjects.Components.Nutrition; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class ThirstSystem : EntitySystem diff --git a/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs b/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs index 5a8bba0802b..4519a54b7b2 100644 --- a/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs @@ -5,7 +5,7 @@ using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Timers; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { /// /// This interface gives components behavior when being "triggered" by timer or other conditions diff --git a/Content.Server/GameObjects/EntitySystems/VaporSystem.cs b/Content.Server/GameObjects/EntitySystems/VaporSystem.cs index 65823a8bb0c..c3e3b2ec5be 100644 --- a/Content.Server/GameObjects/EntitySystems/VaporSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/VaporSystem.cs @@ -1,5 +1,4 @@ using Content.Server.GameObjects.Components.Chemistry; -using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs index f2bac2c7186..b0720ccfb3f 100644 --- a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs @@ -1,15 +1,15 @@ using System.Collections.Generic; using System.Reflection; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Verbs; 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.Log; using static Content.Shared.GameObjects.EntitySystemMessages.VerbSystemMessages; -using Logger = Robust.Shared.Log.Logger; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { public class VerbSystem : EntitySystem { diff --git a/Content.Server/GameObjects/EntitySystems/WelderSystem.cs b/Content.Server/GameObjects/EntitySystems/WelderSystem.cs index e35cb6144a2..411e3546fc1 100644 --- a/Content.Server/GameObjects/EntitySystems/WelderSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/WelderSystem.cs @@ -3,7 +3,7 @@ using System.Linq; using Content.Server.GameObjects.Components.Interactable; using Robust.Shared.GameObjects.Systems; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { /// /// Despite the name, it's only really used for the welder logic in tools. Go figure. diff --git a/Content.Server/GameObjects/EntitySystems/WireHackingSystem.cs b/Content.Server/GameObjects/EntitySystems/WireHackingSystem.cs index a8da8aff92c..f13ae1c0a40 100644 --- a/Content.Server/GameObjects/EntitySystems/WireHackingSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/WireHackingSystem.cs @@ -3,7 +3,7 @@ using Robust.Shared.GameObjects.Systems; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.SharedWiresComponent; -namespace Content.Server.Interfaces.GameObjects.Components.Interaction +namespace Content.Server.GameObjects.EntitySystems { public class WireHackingSystem : EntitySystem { diff --git a/Content.Server/GameTicking/GamePreset.cs b/Content.Server/GameTicking/GamePreset.cs index 0f9642184a9..0e7ce867950 100644 --- a/Content.Server/GameTicking/GamePreset.cs +++ b/Content.Server/GameTicking/GamePreset.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using Robust.Server.Interfaces.Player; using Content.Shared.Preferences; +using Robust.Server.Interfaces.Player; namespace Content.Server.GameTicking { diff --git a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs index 9d162705ebe..50365c6569b 100644 --- a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs +++ b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs @@ -1,21 +1,17 @@ using Content.Server.GameTicking.GameRules; -using Content.Server.Interfaces; using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameTicking; using Content.Server.Mobs.Roles; using Content.Server.Players; -using Content.Shared.Antags; using Robust.Server.Interfaces.Player; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Random; -using System; using System.Collections.Generic; using System.Linq; +using Content.Shared.Roles; using Robust.Shared.Log; -using System.Threading.Tasks; -using Content.Shared.Preferences; using Robust.Shared.Maths; diff --git a/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs b/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs index ee841b599d6..05b84f8a1b5 100644 --- a/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs +++ b/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs @@ -1,6 +1,6 @@ using System; using System.Threading; -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Mobs; using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameTicking; using Robust.Server.Interfaces.Player; diff --git a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs b/Content.Server/GameTicking/GameRules/RuleSuspicion.cs index 50f236072d9..34ddc50f789 100644 --- a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs +++ b/Content.Server/GameTicking/GameRules/RuleSuspicion.cs @@ -1,21 +1,14 @@ using System; -using System.Linq; using System.Threading; -using Content.Server.GameObjects; using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.Components.Observer; using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameTicking; using Content.Server.Mobs.Roles; using Content.Server.Players; -using NFluidsynth; 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 Logger = Robust.Shared.Log.Logger; using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.GameTicking.GameRules diff --git a/Content.Server/GameTicking/GameTicker.JobController.cs b/Content.Server/GameTicking/GameTicker.JobController.cs index fd72fe545ad..271939e0761 100644 --- a/Content.Server/GameTicking/GameTicker.JobController.cs +++ b/Content.Server/GameTicking/GameTicker.JobController.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using Content.Shared.Jobs; using Content.Shared.Preferences; +using Content.Shared.Roles; using Robust.Server.Interfaces.Player; using Robust.Shared.Localization; using Robust.Shared.Random; diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 8065da1507d..b02df833776 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -3,15 +3,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Content.Server.GameObjects; -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.Access; using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Markers; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Observer; using Content.Server.GameObjects.Components.PDA; -using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible; using Content.Server.GameTicking.GamePresets; @@ -24,8 +23,8 @@ using Content.Server.Players; using Content.Shared; using Content.Shared.Chat; using Content.Shared.GameObjects.Components.PDA; -using Content.Shared.Jobs; using Content.Shared.Preferences; +using Content.Shared.Roles; using Prometheus; using Robust.Server.Interfaces; using Robust.Server.Interfaces.Maps; diff --git a/Content.Server/GameTicking/GameTickerCommands.cs b/Content.Server/GameTicking/GameTickerCommands.cs index c2878dbd402..1d37695a785 100644 --- a/Content.Server/GameTicking/GameTickerCommands.cs +++ b/Content.Server/GameTicking/GameTickerCommands.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using Content.Server.BodySystem; +using Content.Server.Health.BodySystem; +using Content.Server.Health.BodySystem.BodyPart; using Content.Server.Interfaces.GameTicking; using Content.Server.Players; -using Content.Shared.BodySystem; -using Content.Shared.Jobs; +using Content.Shared.Health.BodySystem; +using Content.Shared.Health.BodySystem.BodyPart; using Content.Shared.Maps; +using Content.Shared.Roles; using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects.Components.Transform; diff --git a/Content.Server/GlobalVerbs/ControlMobVerb.cs b/Content.Server/GlobalVerbs/ControlMobVerb.cs index 91786471fea..2b69c30c464 100644 --- a/Content.Server/GlobalVerbs/ControlMobVerb.cs +++ b/Content.Server/GlobalVerbs/ControlMobVerb.cs @@ -1,7 +1,7 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Observer; using Content.Server.Players; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Verbs; using Robust.Server.Console; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/GlobalVerbs/PointingVerb.cs b/Content.Server/GlobalVerbs/PointingVerb.cs index b15ef785ad6..d2952b60d65 100644 --- a/Content.Server/GlobalVerbs/PointingVerb.cs +++ b/Content.Server/GlobalVerbs/PointingVerb.cs @@ -1,6 +1,6 @@ using Content.Server.GameObjects.Components.Pointing; using Content.Server.GameObjects.EntitySystems; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Verbs; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/GlobalVerbs/PullingVerb.cs b/Content.Server/GlobalVerbs/PullingVerb.cs index 00f96df0a43..0b864eb075e 100644 --- a/Content.Server/GlobalVerbs/PullingVerb.cs +++ b/Content.Server/GlobalVerbs/PullingVerb.cs @@ -1,8 +1,8 @@ using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Movement; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Physics; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects.Components; diff --git a/Content.Server/GlobalVerbs/RejuvenateVerb.cs b/Content.Server/GlobalVerbs/RejuvenateVerb.cs index 3c2c69da6f0..11b11e8c2ae 100644 --- a/Content.Server/GlobalVerbs/RejuvenateVerb.cs +++ b/Content.Server/GlobalVerbs/RejuvenateVerb.cs @@ -1,7 +1,7 @@ -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Nutrition; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Verbs; using Robust.Server.Console; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/Health/BodySystem/BodyManagerComponent.cs b/Content.Server/Health/BodySystem/BodyManagerComponent.cs index 45338708590..c60ed9091c0 100644 --- a/Content.Server/Health/BodySystem/BodyManagerComponent.cs +++ b/Content.Server/Health/BodySystem/BodyManagerComponent.cs @@ -1,16 +1,22 @@ -using Robust.Shared.GameObjects; +using System; +using System.Collections.Generic; +using System.Linq; +using Content.Server.Health.BodySystem.BodyPart; +using Content.Server.Health.BodySystem.BodyPreset; +using Content.Server.Health.BodySystem.BodyTemplate; +using Content.Server.Interfaces.GameObjects.Components.Interaction; +using Content.Shared.Health.BodySystem; +using Content.Shared.Health.BodySystem.BodyPart; +using Content.Shared.Health.BodySystem.BodyPreset; +using Content.Shared.Health.BodySystem.BodyTemplate; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; -using Content.Shared.BodySystem; using Robust.Shared.ViewVariables; -using Robust.Shared.Interfaces.GameObjects; -using System.Linq; -using Content.Server.Interfaces.GameObjects.Components.Interaction; -namespace Content.Server.BodySystem { +namespace Content.Server.Health.BodySystem { /// /// Component representing a collection of BodyParts attached to each other. @@ -24,23 +30,23 @@ namespace Content.Server.BodySystem { #pragma warning restore [ViewVariables] - private BodyTemplate _template; + private BodyTemplate.BodyTemplate _template; [ViewVariables] private string _presetName; [ViewVariables] - private Dictionary _partDictionary = new Dictionary(); + private Dictionary _partDictionary = new Dictionary(); /// /// The that this BodyManagerComponent is adhering to. /// - public BodyTemplate Template => _template; + public BodyTemplate.BodyTemplate Template => _template; /// /// Maps slot name to the object filling it (if there is one). /// - public Dictionary PartDictionary => _partDictionary; + public Dictionary PartDictionary => _partDictionary; /// /// List of all occupied slots in this body, taken from the values of _parts. @@ -67,7 +73,7 @@ namespace Content.Server.BodySystem { /// /// List of all BodyParts in this body, taken from the keys of _parts. /// - public IEnumerable Parts { + public IEnumerable Parts { get { return _partDictionary.Values; } @@ -77,14 +83,14 @@ namespace Content.Server.BodySystem { /// Recursive search that returns whether a given is connected to the center . /// Not efficient (O(n^2)), but most bodies don't have a ton of BodyParts. /// - public bool ConnectedToCenterPart(BodyPart target) { + public bool ConnectedToCenterPart(BodyPart.BodyPart target) { List searchedSlots = new List { }; if (TryGetSlotName(target, out string result)) return false; return ConnectedToCenterPartRecursion(searchedSlots, result); } private bool ConnectedToCenterPartRecursion(List searchedSlots, string slotName) { - TryGetBodyPart(slotName, out BodyPart part); + TryGetBodyPart(slotName, out BodyPart.BodyPart part); if (part != null && part == GetCenterBodyPart()) return true; searchedSlots.Add(slotName); @@ -101,8 +107,8 @@ namespace Content.Server.BodySystem { /// /// Returns the central of this body based on the . For humans, this is the torso. Returns null if not found. /// - public BodyPart GetCenterBodyPart() { - _partDictionary.TryGetValue(_template.CenterSlot, out BodyPart center); + public BodyPart.BodyPart GetCenterBodyPart() { + _partDictionary.TryGetValue(_template.CenterSlot, out BodyPart.BodyPart center); return center; } @@ -119,7 +125,7 @@ namespace Content.Server.BodySystem { /// Grabs the in the given slotName if there is one. Returns true if a is found, /// false otherwise. If false, result will be null. /// - public bool TryGetBodyPart(string slotName, out BodyPart result) { + public bool TryGetBodyPart(string slotName, out BodyPart.BodyPart result) { return _partDictionary.TryGetValue(slotName, out result); } @@ -127,7 +133,7 @@ namespace Content.Server.BodySystem { /// Grabs the slotName that the given resides in. Returns true if the is /// part of this body and a slot is found, false otherwise. If false, result will be null. /// - public bool TryGetSlotName(BodyPart part, out string result) { + public bool TryGetSlotName(BodyPart.BodyPart part, out string result) { result = _partDictionary.FirstOrDefault(x => x.Value == part).Key; //We enforce that there is only one of each value in the dictionary, so we can iterate through the dictionary values to get the key from there. return result == null; } @@ -150,15 +156,15 @@ namespace Content.Server.BodySystem { /// /// Grabs all occupied slots connected to the given slot, regardless of whether the target slot is occupied. Returns true if successful, false if there was an error or no connected BodyParts were found. /// - public bool TryGetBodyPartConnections(string slotName, out List result) + public bool TryGetBodyPartConnections(string slotName, out List result) { result = null; if (!_template.Connections.TryGetValue(slotName, out List connections)) return false; - List toReturn = new List(); + List toReturn = new List(); foreach (string connection in connections) { - if (TryGetBodyPart(connection, out BodyPart bodyPartResult)) + if (TryGetBodyPart(connection, out BodyPart.BodyPart bodyPartResult)) { toReturn.Add(bodyPartResult); } @@ -192,7 +198,7 @@ namespace Content.Server.BodySystem { throw new InvalidOperationException("No BodyTemplatePrototype was found with the name " + template + " while loading a BodyTemplate!"); //Should never happen unless you fuck up the prototype. } - _template = new BodyTemplate(templateData); + _template = new BodyTemplate.BodyTemplate(templateData); }, () => _template.Name); @@ -206,7 +212,7 @@ namespace Content.Server.BodySystem { throw new InvalidOperationException("No BodyPresetPrototype was found with the name " + preset + " while loading a BodyPreset!"); //Should never happen unless you fuck up the prototype. } - LoadBodyPreset(new BodyPreset(presetData)); + LoadBodyPreset(new BodyPreset.BodyPreset(presetData)); }, () => _presetName); } @@ -214,7 +220,7 @@ namespace Content.Server.BodySystem { /// /// Loads the given - forcefully changes all limbs found in both the preset and this template! /// - public void LoadBodyPreset(BodyPreset preset) + public void LoadBodyPreset(BodyPreset.BodyPreset preset) { _presetName = preset.Name; @@ -232,7 +238,7 @@ namespace Content.Server.BodySystem { BodyPartRemoved(removedPart, slotName); } - var addedPart = new BodyPart(newPartData); + var addedPart = new BodyPart.BodyPart(newPartData); _partDictionary.Add(slotName, addedPart); //Add a new BodyPart with the BodyPartPrototype as a baseline to our BodyComponent. BodyPartAdded(addedPart, slotName); } @@ -243,7 +249,7 @@ namespace Content.Server.BodySystem { /// if there is a slot for them in both . /// public void ChangeBodyTemplate(BodyTemplatePrototype newTemplate) { - foreach (KeyValuePair part in _partDictionary) { + foreach (KeyValuePair part in _partDictionary) { //TODO: Make this work. } } @@ -251,8 +257,8 @@ namespace Content.Server.BodySystem { /// /// Grabs all BodyParts of the given type in this body. /// - public List GetBodyPartsOfType(BodyPartType type) { - List toReturn = new List(); + public List GetBodyPartsOfType(BodyPartType type) { + List toReturn = new List(); foreach (var (slotName, bodyPart) in _partDictionary) { if (bodyPart.PartType == type) toReturn.Add(bodyPart); @@ -265,11 +271,11 @@ namespace Content.Server.BodySystem { /// /// Installs the given into the given slot. Returns true if successful, false otherwise. /// - public bool InstallBodyPart(BodyPart part, string slotName) + public bool InstallBodyPart(BodyPart.BodyPart part, string slotName) { if (!SlotExists(slotName)) //Make sure the given slot exists return false; - if (TryGetBodyPart(slotName, out BodyPart result)) //And that nothing is in it + if (TryGetBodyPart(slotName, out BodyPart.BodyPart result)) //And that nothing is in it return false; _partDictionary.Add(slotName, part); BodyPartAdded(part, slotName); @@ -293,7 +299,7 @@ namespace Content.Server.BodySystem { /// Disconnects the given reference, potentially dropping other BodyParts /// if they were hanging off it. Returns the IEntity representing the dropped BodyPart. /// - public IEntity DropBodyPart(BodyPart part) + public IEntity DropBodyPart(BodyPart.BodyPart part) { if (!_partDictionary.ContainsValue(part)) return null; @@ -305,7 +311,7 @@ namespace Content.Server.BodySystem { { foreach (string connectionName in connections) //This loop is an unoptimized travesty. TODO: optimize to be less shit { - if (TryGetBodyPart(connectionName, out BodyPart result) && !ConnectedToCenterPart(result)) + if (TryGetBodyPart(connectionName, out BodyPart.BodyPart result) && !ConnectedToCenterPart(result)) { DisconnectBodyPartByName(connectionName, true); } @@ -321,7 +327,7 @@ namespace Content.Server.BodySystem { /// /// Disconnects the given reference, potentially dropping other BodyParts if they were hanging off it. /// - public void DisconnectBodyPart(BodyPart part, bool dropEntity) { + public void DisconnectBodyPart(BodyPart.BodyPart part, bool dropEntity) { if (!_partDictionary.ContainsValue(part)) return; if (part != null) { @@ -335,7 +341,7 @@ namespace Content.Server.BodySystem { { foreach (string connectionName in connections) //This loop is an unoptimized travesty. TODO: optimize to be less shit { - if (TryGetBodyPart(connectionName, out BodyPart result) && !ConnectedToCenterPart(result)) { + if (TryGetBodyPart(connectionName, out BodyPart.BodyPart result) && !ConnectedToCenterPart(result)) { DisconnectBodyPartByName(connectionName, dropEntity); } } @@ -351,7 +357,7 @@ namespace Content.Server.BodySystem { /// Internal string version of DisconnectBodyPart for performance purposes. Yes, it is actually more performant. /// private void DisconnectBodyPartByName(string name, bool dropEntity) { - if (!TryGetBodyPart(name, out BodyPart part)) + if (!TryGetBodyPart(name, out BodyPart.BodyPart part)) return; if (part != null) { if (_partDictionary.Remove(name, out var partRemoved)) @@ -361,7 +367,7 @@ namespace Content.Server.BodySystem { if (TryGetBodyPartConnections(name, out List connections)) { foreach (string connectionName in connections) { - if (TryGetBodyPart(connectionName, out BodyPart result) && !ConnectedToCenterPart(result)) { + if (TryGetBodyPart(connectionName, out BodyPart.BodyPart result) && !ConnectedToCenterPart(result)) { DisconnectBodyPartByName(connectionName, dropEntity); } } @@ -373,7 +379,7 @@ namespace Content.Server.BodySystem { } } - private void BodyPartAdded(BodyPart part, string slotName) + private void BodyPartAdded(BodyPart.BodyPart part, string slotName) { var argsAdded = new BodyPartAddedEventArgs(part, slotName); @@ -383,7 +389,7 @@ namespace Content.Server.BodySystem { } } - private void BodyPartRemoved(BodyPart part, string slotName) + private void BodyPartRemoved(BodyPart.BodyPart part, string slotName) { var args = new BodyPartRemovedEventArgs(part, slotName); diff --git a/Content.Server/Health/BodySystem/BodyPart/BodyPart.cs b/Content.Server/Health/BodySystem/BodyPart/BodyPart.cs index 32e4db26818..92addbbebd5 100644 --- a/Content.Server/Health/BodySystem/BodyPart/BodyPart.cs +++ b/Content.Server/Health/BodySystem/BodyPart/BodyPart.cs @@ -1,16 +1,19 @@ -using Content.Shared.BodySystem; +using System; +using System.Collections.Generic; +using Content.Server.Health.BodySystem.Mechanism; +using Content.Server.Health.BodySystem.Surgery.Surgeon; +using Content.Server.Health.BodySystem.Surgery.SurgeryData; +using Content.Shared.Health.BodySystem; +using Content.Shared.Health.BodySystem.BodyPart; +using Content.Shared.Health.BodySystem.Mechanism; +using Content.Shared.Health.DamageContainer; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System; -using System.Collections.Generic; - - -namespace Content.Server.BodySystem +namespace Content.Server.Health.BodySystem.BodyPart { @@ -25,7 +28,7 @@ namespace Content.Server.BodySystem private ISurgeryData _surgeryData; [ViewVariables] - private List _mechanisms = new List(); + private List _mechanisms = new List(); [ViewVariables] private int _sizeUsed = 0; @@ -44,55 +47,55 @@ namespace Content.Server.BodySystem /// /// Path to the RSI that represents this BodyPart. - /// + /// [ViewVariables] public string RSIPath { get; set; } /// /// RSI state that represents this BodyPart. - /// + /// [ViewVariables] public string RSIState { get; set; } /// - /// that this BodyPart is considered to be. For example, BodyPartType.Arm. + /// that this BodyPart is considered to be. For example, BodyPartType.Arm. /// [ViewVariables] public BodyPartType PartType { get; set; } /// /// Max HP of this BodyPart. - /// + /// [ViewVariables] public int MaxDurability { get; set; } /// /// Current HP of this BodyPart based on sum of all damage types. - /// + /// [ViewVariables] public int CurrentDurability => MaxDurability - CurrentDamages.Damage; /// /// Current damage dealt to this BodyPart. - /// + /// [ViewVariables] public AbstractDamageContainer CurrentDamages { get; set; } /// /// At what HP this BodyPartis completely destroyed. - /// + /// [ViewVariables] public int DestroyThreshold { get; set; } /// /// Armor of this BodyPart against attacks. - /// + /// [ViewVariables] public float Resistance { get; set; } /// /// Determines many things: how many mechanisms can be fit inside this BodyPart, whether a body can fit through tiny crevices, etc. - /// + /// [ViewVariables] public int Size { get; set; } @@ -112,7 +115,7 @@ namespace Content.Server.BodySystem /// List of all Mechanisms currently inside this BodyPart. /// [ViewVariables] - public List Mechanisms => _mechanisms; + public List Mechanisms => _mechanisms; public BodyPart() { } @@ -139,7 +142,7 @@ namespace Content.Server.BodySystem /// /// Returns whether the given can be installed on this BodyPart. /// - public bool CanInstallMechanism(Mechanism mechanism) + public bool CanInstallMechanism(Mechanism.Mechanism mechanism) { if (_sizeUsed + mechanism.Size > Size) return false; //No space @@ -149,7 +152,7 @@ namespace Content.Server.BodySystem /// /// Attempts to add a . Returns true if successful, false if there was an error (e.g. not enough room in BodyPart). Call InstallDroppedMechanism instead if you want to easily install an IEntity with a DroppedMechanismComponent. /// - public bool TryInstallMechanism(Mechanism mechanism) + public bool TryInstallMechanism(Mechanism.Mechanism mechanism) { if (CanInstallMechanism(mechanism)) { @@ -173,8 +176,8 @@ namespace Content.Server.BodySystem /// /// Tries to remove the given reference from this BodyPart. Returns null if there was an error in spawning the entity or removing the mechanism, otherwise returns a reference to the on the newly spawned entity. - /// - public DroppedMechanismComponent DropMechanism(IEntity dropLocation, Mechanism mechanismTarget) + /// + public DroppedMechanismComponent DropMechanism(IEntity dropLocation, Mechanism.Mechanism mechanismTarget) { if (!_mechanisms.Contains(mechanismTarget)) return null; @@ -189,8 +192,8 @@ namespace Content.Server.BodySystem /// /// Tries to destroy the given in the given BodyPart. Returns false if there was an error, true otherwise. Does NOT spawn a dropped entity. - /// - public bool DestroyMechanism(BodyPart bodyPartTarget, Mechanism mechanismTarget) + /// + public bool DestroyMechanism(BodyPart bodyPartTarget, Mechanism.Mechanism mechanismTarget) { if (!_mechanisms.Contains(mechanismTarget)) return false; @@ -225,7 +228,7 @@ namespace Content.Server.BodySystem /// /// Loads the given - current data on this will be overwritten! - /// + /// public virtual void LoadFromPrototype(BodyPartPrototype data) { Name = data.Name; @@ -249,7 +252,7 @@ namespace Content.Server.BodySystem { throw new InvalidOperationException("No MechanismPrototype was found with the name " + mechanismPrototypeID + " while loading a BodyPartPrototype!"); } - _mechanisms.Add(new Mechanism(mechanismData)); + _mechanisms.Add(new Mechanism.Mechanism(mechanismData)); } } diff --git a/Content.Server/Health/BodySystem/BodyPart/DroppedBodyPartComponent.cs b/Content.Server/Health/BodySystem/BodyPart/DroppedBodyPartComponent.cs index 2f520c44493..a49ba2c6560 100644 --- a/Content.Server/Health/BodySystem/BodyPart/DroppedBodyPartComponent.cs +++ b/Content.Server/Health/BodySystem/BodyPart/DroppedBodyPartComponent.cs @@ -1,19 +1,20 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using System.Collections.Generic; -using Content.Shared.BodySystem; -using Robust.Shared.ViewVariables; +using System.Collections.Generic; using System.Globalization; +using System.Linq; +using Content.Shared.Health.BodySystem; +using Content.Shared.Health.BodySystem.Surgery; +using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.Player; -using Content.Shared.Interfaces; -using System.Linq; -using Content.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.ViewVariables; -namespace Content.Server.BodySystem +namespace Content.Server.Health.BodySystem.BodyPart { /// diff --git a/Content.Server/Health/BodySystem/BodyPreset/BodyPreset.cs b/Content.Server/Health/BodySystem/BodyPreset/BodyPreset.cs index cf342504c8f..83bd17a1b87 100644 --- a/Content.Server/Health/BodySystem/BodyPreset/BodyPreset.cs +++ b/Content.Server/Health/BodySystem/BodyPreset/BodyPreset.cs @@ -1,8 +1,10 @@ using System.Collections.Generic; -using Content.Shared.BodySystem; +using Content.Server.Health.BodySystem.BodyPart; +using Content.Shared.Health.BodySystem.BodyPart; +using Content.Shared.Health.BodySystem.BodyPreset; using Robust.Shared.ViewVariables; -namespace Content.Server.BodySystem { +namespace Content.Server.Health.BodySystem.BodyPreset { /// /// Stores data on what BodyPartPrototypes should fill a BodyTemplate. Used for loading complete body presets, like a "basic human" with all human limbs. @@ -16,7 +18,7 @@ namespace Content.Server.BodySystem { /// /// Maps a template slot to the ID of the that should fill it. E.g. "right arm" : "BodyPart.arm.basic_human". - /// + /// [ViewVariables] public Dictionary PartIDs => _partIDs; diff --git a/Content.Server/Health/BodySystem/BodyScanner/BodyScannerComponent.cs b/Content.Server/Health/BodySystem/BodyScanner/BodyScannerComponent.cs index 2274cf790d1..ee0f7a34c65 100644 --- a/Content.Server/Health/BodySystem/BodyScanner/BodyScannerComponent.cs +++ b/Content.Server/Health/BodySystem/BodyScanner/BodyScannerComponent.cs @@ -1,11 +1,11 @@ -using Robust.Server.GameObjects.Components.UserInterface; +using System.Collections.Generic; +using Content.Shared.Health.BodySystem.BodyScanner; +using Content.Shared.Interfaces.GameObjects.Components; +using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using System.Collections.Generic; -using Content.Shared.BodySystem; -using Content.Shared.Interfaces.GameObjects.Components; -namespace Content.Server.BodySystem +namespace Content.Server.Health.BodySystem.BodyScanner { [RegisterComponent] [ComponentReference(typeof(IActivate))] @@ -45,7 +45,7 @@ namespace Content.Server.BodySystem /// /// Copy BodyTemplate and BodyPart data into a common data class that the client can read. /// - private BodyScannerInterfaceState PrepareBodyScannerInterfaceState(BodyTemplate template, Dictionary bodyParts) + private BodyScannerInterfaceState PrepareBodyScannerInterfaceState(BodyTemplate.BodyTemplate template, Dictionary bodyParts) { Dictionary partsData = new Dictionary(); foreach (var(slotname, bpart) in bodyParts) { diff --git a/Content.Server/Health/BodySystem/BodyTemplate/BodyTemplate.cs b/Content.Server/Health/BodySystem/BodyTemplate/BodyTemplate.cs index 30f85eb7c26..a5a74985430 100644 --- a/Content.Server/Health/BodySystem/BodyTemplate/BodyTemplate.cs +++ b/Content.Server/Health/BodySystem/BodyTemplate/BodyTemplate.cs @@ -1,14 +1,15 @@ using System; using System.Collections.Generic; -using Content.Shared.BodySystem; +using Content.Shared.Health.BodySystem; +using Content.Shared.Health.BodySystem.BodyTemplate; using Robust.Shared.ViewVariables; -namespace Content.Server.BodySystem { +namespace Content.Server.Health.BodySystem.BodyTemplate { /// /// This class is a data capsule representing the standard format of a . For instance, the "humanoid" BodyTemplate /// defines two arms, each connected to a torso and so on. Capable of loading data from a . - /// + /// public class BodyTemplate { [ViewVariables] @@ -16,13 +17,13 @@ namespace Content.Server.BodySystem { /// /// The name of the center BodyPart. For humans, this is set to "torso". Used in many calculations. - /// + /// [ViewVariables] public string CenterSlot { get; set; } /// /// Maps all parts on this template to its BodyPartType. For instance, "right arm" is mapped to "BodyPartType.arm" on the humanoid template. - /// + /// [ViewVariables] public Dictionary Slots { get; set; } @@ -30,7 +31,7 @@ namespace Content.Server.BodySystem { /// Maps limb name to the list of their connections to other limbs. For instance, on the humanoid template "torso" is mapped to a list containing "right arm", "left arm", /// "left leg", and "right leg". This is mapped both ways during runtime, but in the prototype only one way has to be defined, i.e., "torso" to "left arm" will automatically /// map "left arm" to "torso". - /// + /// [ViewVariables] public Dictionary> Connections { get; set; } @@ -54,7 +55,7 @@ namespace Content.Server.BodySystem { /// /// Returns whether the given slot exists in this BodyTemplate. - /// + /// public bool SlotExists(string slotName) { foreach (string slot in Slots.Keys) @@ -67,7 +68,7 @@ namespace Content.Server.BodySystem { /// /// Returns an integer unique to this BodyTemplate's layout. It does not matter in which order the Connections or Slots are defined. - /// + /// public override int GetHashCode() { int slotsHash = 0; diff --git a/Content.Server/Health/BodySystem/IBodyPartContainer.cs b/Content.Server/Health/BodySystem/IBodyPartContainer.cs index b78c925c00c..c23b8ec1f5b 100644 --- a/Content.Server/Health/BodySystem/IBodyPartContainer.cs +++ b/Content.Server/Health/BodySystem/IBodyPartContainer.cs @@ -1,9 +1,6 @@ -using Robust.Shared.Interfaces.GameObjects; -using System; -using System.Collections.Generic; -using System.Text; +using Content.Server.Health.BodySystem.Surgery.SurgeryData; -namespace Content.Server.BodySystem +namespace Content.Server.Health.BodySystem { /// diff --git a/Content.Server/Health/BodySystem/Mechanism/DroppedMechanismComponent.cs b/Content.Server/Health/BodySystem/Mechanism/DroppedMechanismComponent.cs index 4a9faafe833..788082c0d98 100644 --- a/Content.Server/Health/BodySystem/Mechanism/DroppedMechanismComponent.cs +++ b/Content.Server/Health/BodySystem/Mechanism/DroppedMechanismComponent.cs @@ -1,22 +1,24 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; -using System; +using System; using System.Collections.Generic; -using Content.Shared.BodySystem; -using Robust.Shared.ViewVariables; using System.Globalization; -using Robust.Server.GameObjects; -using Robust.Shared.Log; +using Content.Server.Health.BodySystem.BodyPart; +using Content.Shared.Health.BodySystem.Mechanism; +using Content.Shared.Health.BodySystem.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.Player; +using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -using Content.Shared.Interfaces.GameObjects.Components; +using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Log; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; -namespace Content.Server.BodySystem { +namespace Content.Server.Health.BodySystem.Mechanism { /// /// Component representing a dropped, tangible entity. @@ -138,7 +140,7 @@ namespace Content.Server.BodySystem { { _sharedNotifyManager.PopupMessage(_bodyManagerComponentCache.Owner, _performerCache, Loc.GetString("You see no useful way to use the {0} anymore.", Owner.Name)); } - BodyPart target = targetObject as BodyPart; + BodyPart.BodyPart target = targetObject as BodyPart.BodyPart; if (!target.TryInstallDroppedMechanism(this)) { _sharedNotifyManager.PopupMessage(_bodyManagerComponentCache.Owner, _performerCache, Loc.GetString("You can't fit it in!")); diff --git a/Content.Server/Health/BodySystem/Mechanism/Mechanism.cs b/Content.Server/Health/BodySystem/Mechanism/Mechanism.cs index 0cceeb4a876..1ea508a7825 100644 --- a/Content.Server/Health/BodySystem/Mechanism/Mechanism.cs +++ b/Content.Server/Health/BodySystem/Mechanism/Mechanism.cs @@ -1,15 +1,9 @@ -using System; -using System.Collections.Generic; -using Content.Shared.BodySystem; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; +using Content.Server.Health.BodySystem.BodyPart; +using Content.Shared.Health.BodySystem; +using Content.Shared.Health.BodySystem.Mechanism; using Robust.Shared.ViewVariables; -using YamlDotNet.RepresentationModel; - - - -namespace Content.Server.BodySystem { +namespace Content.Server.Health.BodySystem.Mechanism { /// /// Data class representing a persistent item inside a . This includes livers, eyes, cameras, brains, explosive implants, binary communicators, and other things. @@ -21,55 +15,55 @@ namespace Content.Server.BodySystem { /// /// Professional description of the Mechanism. - /// + /// [ViewVariables] public string Description { get; set; } /// - /// The message to display upon examining a mob with this Mechanism installed. If the string is empty (""), no message will be displayed. - /// + /// The message to display upon examining a mob with this Mechanism installed. If the string is empty (""), no message will be displayed. + /// [ViewVariables] public string ExamineMessage { get; set; } /// /// Path to the RSI that represents this Mechanism. - /// + /// [ViewVariables] public string RSIPath { get; set; } /// /// RSI state that represents this Mechanism. - /// + /// [ViewVariables] public string RSIState { get; set; } /// /// Max HP of this Mechanism. - /// + /// [ViewVariables] public int MaxDurability { get; set; } /// /// Current HP of this Mechanism. - /// + /// [ViewVariables] public int CurrentDurability { get; set; } /// /// At what HP this Mechanism is completely destroyed. - /// + /// [ViewVariables] public int DestroyThreshold { get; set; } /// /// Armor of this Mechanism against attacks. - /// + /// [ViewVariables] public int Resistance { get; set; } /// /// Determines a handful of things - mostly whether this Mechanism can fit into a BodyPart. - /// + /// [ViewVariables] public int Size { get; set; } @@ -91,7 +85,7 @@ namespace Content.Server.BodySystem { /// /// Loads the given - current data on this Mechanism will be overwritten! - /// + /// public void LoadFromPrototype(MechanismPrototype data) { Name = data.Name; diff --git a/Content.Server/Health/BodySystem/Surgery/Surgeon/ISurgeon.cs b/Content.Server/Health/BodySystem/Surgery/Surgeon/ISurgeon.cs index 75078e08342..6d586b01e5b 100644 --- a/Content.Server/Health/BodySystem/Surgery/Surgeon/ISurgeon.cs +++ b/Content.Server/Health/BodySystem/Surgery/Surgeon/ISurgeon.cs @@ -1,30 +1,29 @@ -using Content.Shared.BodySystem; +using System.Collections.Generic; +using Content.Server.Health.BodySystem.Surgery.SurgeryData; using Robust.Shared.Interfaces.GameObjects; -using System; -using System.Collections.Generic; -namespace Content.Server.BodySystem +namespace Content.Server.Health.BodySystem.Surgery.Surgeon { /// /// Interface representing an entity capable of performing surgery (performing operations on an class). /// For an example see , which inherits from this class. - /// + /// public interface ISurgeon { /// /// How long it takes to perform a single surgery step (in seconds). - /// + /// public float BaseOperationTime { get; set; } - - public delegate void MechanismRequestCallback(Mechanism target, IBodyPartContainer container, ISurgeon surgeon, IEntity performer); + + public delegate void MechanismRequestCallback(Mechanism.Mechanism target, IBodyPartContainer container, ISurgeon surgeon, IEntity performer); /// /// When performing a surgery, the may sometimes require selecting from a set of Mechanisms to operate on. /// This function is called in that scenario, and it is expected that you call the callback with one mechanism from the provided list. - /// - public void RequestMechanism(List options, MechanismRequestCallback callback); + /// + public void RequestMechanism(List options, MechanismRequestCallback callback); } } diff --git a/Content.Server/Health/BodySystem/Surgery/Surgeon/SurgeryToolComponent.cs b/Content.Server/Health/BodySystem/Surgery/Surgeon/SurgeryToolComponent.cs index f180c5501aa..42e9e3f2cae 100644 --- a/Content.Server/Health/BodySystem/Surgery/Surgeon/SurgeryToolComponent.cs +++ b/Content.Server/Health/BodySystem/Surgery/Surgeon/SurgeryToolComponent.cs @@ -1,7 +1,10 @@ using System; using System.Collections.Generic; -using Content.Shared.BodySystem; +using Content.Server.Health.BodySystem.BodyPart; +using Content.Server.Health.BodySystem.Mechanism; using Content.Shared.GameObjects; +using Content.Shared.Health.BodySystem; +using Content.Shared.Health.BodySystem.Surgery; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; @@ -14,7 +17,7 @@ using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Serialization; -namespace Content.Server.BodySystem +namespace Content.Server.Health.BodySystem.Surgery.Surgeon { //TODO: add checks to close UI if user walks too far away from tool or target. @@ -106,10 +109,10 @@ namespace Content.Server.BodySystem } } - public void RequestMechanism(List options, ISurgeon.MechanismRequestCallback callback) + public void RequestMechanism(List options, ISurgeon.MechanismRequestCallback callback) { var toSend = new Dictionary (); - foreach (Mechanism mechanism in options) + foreach (Mechanism.Mechanism mechanism in options) { _optionsCache.Add(_idHash, mechanism); toSend.Add(mechanism.Name, _idHash++); @@ -181,7 +184,7 @@ namespace Content.Server.BodySystem { SendNoUsefulWayToUseAnymorePopup(); } - BodyPart target = targetObject as BodyPart; + BodyPart.BodyPart target = targetObject as BodyPart.BodyPart; if (!target.AttemptSurgery(_surgeryType, _bodyManagerComponentCache, this, _performerCache)) { SendNoUsefulWayToUseAnymorePopup(); @@ -198,7 +201,7 @@ namespace Content.Server.BodySystem { SendNoUsefulWayToUseAnymorePopup(); } - Mechanism target = targetObject as Mechanism; + Mechanism.Mechanism target = targetObject as Mechanism.Mechanism; CloseSurgeryUI(_performerCache.GetComponent().playerSession); _callbackCache(target, _bodyManagerComponentCache, this, _performerCache); } diff --git a/Content.Server/Health/BodySystem/Surgery/SurgeryData/BiologicalSurgeryData.cs b/Content.Server/Health/BodySystem/Surgery/SurgeryData/BiologicalSurgeryData.cs index b0123f17bda..bb3917a7dc8 100644 --- a/Content.Server/Health/BodySystem/Surgery/SurgeryData/BiologicalSurgeryData.cs +++ b/Content.Server/Health/BodySystem/Surgery/SurgeryData/BiologicalSurgeryData.cs @@ -1,32 +1,26 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using Content.Shared.BodySystem; +using Content.Server.Health.BodySystem.Surgery.Surgeon; +using Content.Shared.Health.BodySystem; using Content.Shared.Interfaces; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; -using YamlDotNet.RepresentationModel; -namespace Content.Server.BodySystem +namespace Content.Server.Health.BodySystem.Surgery.SurgeryData { /// /// Data class representing the surgery state of a biological entity. - /// + /// public class BiologicalSurgeryData : ISurgeryData { protected bool _skinOpened = false; protected bool _vesselsClamped = false; protected bool _skinRetracted = false; - protected List _disconnectedOrgans = new List(); + protected List _disconnectedOrgans = new List(); - public BiologicalSurgeryData(BodyPart parent) : base(parent) { } + public BiologicalSurgeryData(BodyPart.BodyPart parent) : base(parent) { } public override SurgeryAction GetSurgeryStep(SurgeryType toolType) { @@ -79,7 +73,7 @@ namespace Content.Server.BodySystem else if (_skinOpened && _vesselsClamped && _skinRetracted) //Case: skin is fully open. { toReturn += Loc.GetString("There is an incision on {0:their} {1}.\n", target, _parent.Name); - foreach (Mechanism mechanism in _disconnectedOrgans) + foreach (Mechanism.Mechanism mechanism in _disconnectedOrgans) { toReturn += Loc.GetString("{0:their} {1} is loose.\n", target, mechanism.Name); } @@ -87,12 +81,12 @@ namespace Content.Server.BodySystem return toReturn; } - public override bool CanInstallMechanism(Mechanism toBeInstalled) + public override bool CanInstallMechanism(Mechanism.Mechanism toBeInstalled) { return _skinOpened && _vesselsClamped && _skinRetracted; } - public override bool CanAttachBodyPart(BodyPart toBeConnected) + public override bool CanAttachBodyPart(BodyPart.BodyPart toBeConnected) { return true; //TODO: if a bodypart is disconnected, you should have to do some surgery to allow another bodypart to be attached. @@ -141,8 +135,8 @@ namespace Content.Server.BodySystem { if (_parent.Mechanisms.Count <= 0) return; - List toSend = new List(); - foreach (Mechanism mechanism in _parent.Mechanisms) + List toSend = new List(); + foreach (Mechanism.Mechanism mechanism in _parent.Mechanisms) { if (!_disconnectedOrgans.Contains(mechanism)) toSend.Add(mechanism); @@ -150,7 +144,7 @@ namespace Content.Server.BodySystem if (toSend.Count > 0) surgeon.RequestMechanism(toSend, LoosenOrganSurgeryCallback); } - public void LoosenOrganSurgeryCallback(Mechanism target, IBodyPartContainer container, ISurgeon surgeon, IEntity performer) + public void LoosenOrganSurgeryCallback(Mechanism.Mechanism target, IBodyPartContainer container, ISurgeon surgeon, IEntity performer) { if (target != null && _parent.Mechanisms.Contains(target)) { @@ -172,7 +166,7 @@ namespace Content.Server.BodySystem } - public void RemoveOrganSurgeryCallback(Mechanism target, IBodyPartContainer container, ISurgeon surgeon, IEntity performer) + public void RemoveOrganSurgeryCallback(Mechanism.Mechanism target, IBodyPartContainer container, ISurgeon surgeon, IEntity performer) { if (target != null && _parent.Mechanisms.Contains(target)) { diff --git a/Content.Server/Health/BodySystem/Surgery/SurgeryData/ISurgeryData.cs b/Content.Server/Health/BodySystem/Surgery/SurgeryData/ISurgeryData.cs index 38f6f6c8541..47a0aba4c1d 100644 --- a/Content.Server/Health/BodySystem/Surgery/SurgeryData/ISurgeryData.cs +++ b/Content.Server/Health/BodySystem/Surgery/SurgeryData/ISurgeryData.cs @@ -1,58 +1,54 @@ -using System; -using System.Collections.Generic; -using Content.Shared.BodySystem; +using Content.Server.Health.BodySystem.BodyPart; +using Content.Server.Health.BodySystem.Mechanism; +using Content.Server.Health.BodySystem.Surgery.Surgeon; +using Content.Shared.Health.BodySystem; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; -using YamlDotNet.RepresentationModel; -namespace Content.Server.BodySystem +namespace Content.Server.Health.BodySystem.Surgery.SurgeryData { /// /// This data class represents the state of a in regards to everything surgery related - whether there's an incision on it, whether the bone is broken, etc. - /// + /// public abstract class ISurgeryData { /// /// The this surgeryData is attached to. The ISurgeryData class should not exist without a that it /// represents, and will throw errors if it is null. - /// - protected BodyPart _parent; + /// + protected BodyPart.BodyPart _parent; /// /// The of the parent . - /// + /// protected BodyPartType _parentType => _parent.PartType; public delegate void SurgeryAction(IBodyPartContainer container, ISurgeon surgeon, IEntity performer); - public ISurgeryData(BodyPart parent) + public ISurgeryData(BodyPart.BodyPart parent) { _parent = parent; } /// - /// Returns the description of this current to be shown upon observing the given entity. + /// Returns the description of this current to be shown upon observing the given entity. /// public abstract string GetDescription(IEntity target); /// - /// Returns whether a can be installed into the this ISurgeryData represents. + /// Returns whether a can be installed into the this ISurgeryData represents. /// - public abstract bool CanInstallMechanism(Mechanism toBeInstalled); + public abstract bool CanInstallMechanism(Mechanism.Mechanism toBeInstalled); /// /// Returns whether the given can be connected to the this ISurgeryData represents. /// - public abstract bool CanAttachBodyPart(BodyPart toBeConnected); + public abstract bool CanAttachBodyPart(BodyPart.BodyPart toBeConnected); /// /// Gets the delegate corresponding to the surgery step using the given . Returns null if no surgery step can be performed. diff --git a/Content.Server/Interfaces/Chemistry/IReactionEffect.cs b/Content.Server/Interfaces/Chemistry/IReactionEffect.cs index 4bd2eb30f02..36209aef3c0 100644 --- a/Content.Server/Interfaces/Chemistry/IReactionEffect.cs +++ b/Content.Server/Interfaces/Chemistry/IReactionEffect.cs @@ -1,7 +1,7 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Serialization; -namespace Content.Shared.Interfaces +namespace Content.Server.Interfaces.Chemistry { /// /// Chemical reaction effect on the world such as an explosion, EMP, or fire. diff --git a/Content.Server/Interfaces/GameObjects/Components/Damage/IDamageableComponent.cs b/Content.Server/Interfaces/GameObjects/Components/Damage/IDamageableComponent.cs index e45685a46b5..ad88349bdd2 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Damage/IDamageableComponent.cs +++ b/Content.Server/Interfaces/GameObjects/Components/Damage/IDamageableComponent.cs @@ -1,9 +1,9 @@ using System; -using Content.Server.GameObjects; -using Content.Shared.GameObjects; +using Content.Server.GameObjects.Components.Damage; +using Content.Shared.GameObjects.Components.Damage; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Server.Interfaces.GameObjects +namespace Content.Server.Interfaces.GameObjects.Components.Damage { public interface IDamageableComponent : IComponent { diff --git a/Content.Server/Interfaces/GameObjects/Components/Interaction/IBodyPartAdded.cs b/Content.Server/Interfaces/GameObjects/Components/Interaction/IBodyPartAdded.cs index 2a2a9b4ce8e..0cca658e909 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Interaction/IBodyPartAdded.cs +++ b/Content.Server/Interfaces/GameObjects/Components/Interaction/IBodyPartAdded.cs @@ -1,5 +1,5 @@ using System; -using Content.Server.BodySystem; +using Content.Server.Health.BodySystem.BodyPart; namespace Content.Server.Interfaces.GameObjects.Components.Interaction { diff --git a/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs b/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs index 83d1b509a7c..d631716cc99 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs +++ b/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Content.Server.GameObjects.Components; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects.Components.Container; diff --git a/Content.Server/Interfaces/GameObjects/IOnDamageBehavior.cs b/Content.Server/Interfaces/GameObjects/IOnDamageBehavior.cs index fdd8b7bb93d..911d30b031f 100644 --- a/Content.Server/Interfaces/GameObjects/IOnDamageBehavior.cs +++ b/Content.Server/Interfaces/GameObjects/IOnDamageBehavior.cs @@ -1,8 +1,7 @@ -using System; -using System.Collections.Generic; -using Content.Server.GameObjects; +using System.Collections.Generic; +using Content.Server.GameObjects.Components.Damage; -namespace Content.Server.Interfaces +namespace Content.Server.Interfaces.GameObjects { /// /// Any component/entity that has behaviour linked to taking damage should implement this interface. diff --git a/Content.Server/Interfaces/GameObjects/ISuicideAct.cs b/Content.Server/Interfaces/GameObjects/ISuicideAct.cs index 8d09775b860..fb6ed4ade51 100644 --- a/Content.Server/Interfaces/GameObjects/ISuicideAct.cs +++ b/Content.Server/Interfaces/GameObjects/ISuicideAct.cs @@ -1,8 +1,5 @@ using Content.Server.Interfaces.Chat; using Robust.Shared.Interfaces.GameObjects; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Server.Interfaces.GameObjects { diff --git a/Content.Server/Interfaces/IAccess.cs b/Content.Server/Interfaces/IAccess.cs index f2719905454..bec7cef9b7d 100644 --- a/Content.Server/Interfaces/IAccess.cs +++ b/Content.Server/Interfaces/IAccess.cs @@ -1,7 +1,7 @@ #nullable enable using System; -using Content.Server.GameObjects.Components.Access; using System.Collections.Generic; +using Content.Server.GameObjects.Components.Access; namespace Content.Server.Interfaces { diff --git a/Content.Server/Interfaces/IGasReactionEffect.cs b/Content.Server/Interfaces/IGasReactionEffect.cs index 27958cc3ccb..95148d570c0 100644 --- a/Content.Server/Interfaces/IGasReactionEffect.cs +++ b/Content.Server/Interfaces/IGasReactionEffect.cs @@ -2,7 +2,6 @@ using Content.Server.Atmos; using Content.Server.Atmos.Reactions; using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.Map; namespace Content.Server.Interfaces { diff --git a/Content.Server/Interfaces/IListen.cs b/Content.Server/Interfaces/IListen.cs index c778c0adee9..840ceac8e93 100644 --- a/Content.Server/Interfaces/IListen.cs +++ b/Content.Server/Interfaces/IListen.cs @@ -1,7 +1,4 @@ using Robust.Shared.Interfaces.GameObjects; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Server.Interfaces { diff --git a/Content.Server/Interfaces/PDA/IPDAUplinkManager.cs b/Content.Server/Interfaces/PDA/IPDAUplinkManager.cs index 34bc3d3c713..3ba9bdf5c84 100644 --- a/Content.Server/Interfaces/PDA/IPDAUplinkManager.cs +++ b/Content.Server/Interfaces/PDA/IPDAUplinkManager.cs @@ -1,7 +1,5 @@ -using System; using System.Collections.Generic; using Content.Shared.GameObjects.Components.PDA; -using Content.Shared.Prototypes.PDA; namespace Content.Server.Interfaces.PDA { diff --git a/Content.Server/Jobs/ClownSpecial.cs b/Content.Server/Jobs/ClownSpecial.cs index 72dc3000f53..29e64304e21 100644 --- a/Content.Server/Jobs/ClownSpecial.cs +++ b/Content.Server/Jobs/ClownSpecial.cs @@ -1,4 +1,5 @@ using Content.Server.GameObjects.Components.Mobs; +using Content.Shared.Roles; using JetBrains.Annotations; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/MoMMILink.cs b/Content.Server/MoMMILink.cs index 0ae57f928d0..318d98151ab 100644 --- a/Content.Server/MoMMILink.cs +++ b/Content.Server/MoMMILink.cs @@ -1,5 +1,4 @@ using System; -using System.IO; using System.Net; using System.Net.Http; using System.Text; @@ -14,7 +13,6 @@ using Robust.Shared.Asynchronous; using Robust.Shared.Interfaces.Configuration; using Robust.Shared.IoC; using Robust.Shared.Log; -using Robust.Shared.Utility; namespace Content.Server { diff --git a/Content.Server/Mobs/Commands.cs b/Content.Server/Mobs/Commands.cs index a31eac223c5..a759d8d5b4b 100644 --- a/Content.Server/Mobs/Commands.cs +++ b/Content.Server/Mobs/Commands.cs @@ -2,10 +2,9 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.Mobs.Roles; using Content.Server.Players; -using Content.Shared.Jobs; +using Content.Shared.Roles; using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; using Robust.Shared.Network; using Robust.Shared.Prototypes; diff --git a/Content.Server/Mobs/Roles/Job.cs b/Content.Server/Mobs/Roles/Job.cs index 33db5a65dc5..064bb3d769c 100644 --- a/Content.Server/Mobs/Roles/Job.cs +++ b/Content.Server/Mobs/Roles/Job.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; using Content.Server.Interfaces.Chat; -using Content.Shared.Jobs; +using Content.Shared.Roles; using Robust.Shared.IoC; namespace Content.Server.Mobs.Roles diff --git a/Content.Server/Mobs/Roles/SuspicionInnocentRole.cs b/Content.Server/Mobs/Roles/SuspicionInnocentRole.cs index 4c2f16f6a9a..e8ab7a96bec 100644 --- a/Content.Server/Mobs/Roles/SuspicionInnocentRole.cs +++ b/Content.Server/Mobs/Roles/SuspicionInnocentRole.cs @@ -1,8 +1,6 @@ -using Content.Server.GameObjects; using Content.Server.Interfaces.Chat; +using Content.Shared.Roles; using Robust.Shared.IoC; -using Robust.Shared.Utility; -using Content.Shared.Antags; namespace Content.Server.Mobs.Roles { diff --git a/Content.Server/Mobs/Roles/SuspicionTraitorRole.cs b/Content.Server/Mobs/Roles/SuspicionTraitorRole.cs index 5d198544545..753f5424e1a 100644 --- a/Content.Server/Mobs/Roles/SuspicionTraitorRole.cs +++ b/Content.Server/Mobs/Roles/SuspicionTraitorRole.cs @@ -1,8 +1,6 @@ -using Content.Server.GameObjects; using Content.Server.Interfaces.Chat; +using Content.Shared.Roles; using Robust.Shared.IoC; -using Robust.Shared.Utility; -using Content.Shared.Antags; namespace Content.Server.Mobs.Roles { diff --git a/Content.Server/Mobs/StandingStateHelper.cs b/Content.Server/Mobs/StandingStateHelper.cs index 6a43352fa88..1f6f692a0fb 100644 --- a/Content.Server/Mobs/StandingStateHelper.cs +++ b/Content.Server/Mobs/StandingStateHelper.cs @@ -1,4 +1,3 @@ -using Content.Server.Interfaces.GameObjects; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.Audio; using Content.Shared.GameObjects.Components.Mobs; diff --git a/Content.Server/Observer/Ghost.cs b/Content.Server/Observer/Ghost.cs index a2a2dda05f5..493ac615b99 100644 --- a/Content.Server/Observer/Ghost.cs +++ b/Content.Server/Observer/Ghost.cs @@ -1,18 +1,13 @@ -using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Damage; +using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Observer; -using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameTicking; using Content.Server.Players; -using Content.Shared.Atmos; -using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Damage; using Robust.Server.Interfaces.Console; -using Robust.Server.Interfaces.Placement; using Robust.Server.Interfaces.Player; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; -using Robust.Shared.Map; namespace Content.Server.Observer { diff --git a/Content.Server/PDA/PDAUplinkManager.cs b/Content.Server/PDA/PDAUplinkManager.cs index 53b9aa2e05c..0d93c95dc52 100644 --- a/Content.Server/PDA/PDAUplinkManager.cs +++ b/Content.Server/PDA/PDAUplinkManager.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; -using Content.Server.GameObjects; -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.Interfaces.PDA; using Content.Shared.GameObjects.Components.PDA; diff --git a/Content.Server/Placement/SpawnHelpers.cs b/Content.Server/Placement/SpawnHelpers.cs index e47d770aed1..a6675fa712d 100644 --- a/Content.Server/Placement/SpawnHelpers.cs +++ b/Content.Server/Placement/SpawnHelpers.cs @@ -1,8 +1,6 @@ using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.IoC; using Robust.Shared.Map; -using Robust.Shared.Maths; namespace Content.Server.Placement { diff --git a/Content.Server/Sandbox/SandboxManager.cs b/Content.Server/Sandbox/SandboxManager.cs index e695a517c3a..3492db968c9 100644 --- a/Content.Server/Sandbox/SandboxManager.cs +++ b/Content.Server/Sandbox/SandboxManager.cs @@ -1,6 +1,5 @@ -using Content.Server.GameObjects; -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; using Content.Shared.Sandbox; diff --git a/Content.Server/ServerContentIoC.cs b/Content.Server/ServerContentIoC.cs index dded2038615..c9d618b0044 100644 --- a/Content.Server/ServerContentIoC.cs +++ b/Content.Server/ServerContentIoC.cs @@ -2,6 +2,8 @@ using Content.Server.AI.Utility.Considerations; using Content.Server.AI.WorldState; using Content.Server.Cargo; using Content.Server.Chat; +using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; +using Content.Server.GameObjects.Components.Power.PowerNetComponents; using Content.Server.GameTicking; using Content.Server.Interfaces; using Content.Server.Interfaces.Chat; @@ -14,8 +16,6 @@ using Content.Server.Utility; using Content.Shared.Interfaces; using Content.Shared.Kitchen; using Robust.Shared.IoC; -using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; -using Content.Server.GameObjects.Components.Power.PowerNetComponents; namespace Content.Server { diff --git a/Content.Server/Throw/ThrowHelper.cs b/Content.Server/Throw/ThrowHelper.cs index b0ebd1133b7..6b62531a7f2 100644 --- a/Content.Server/Throw/ThrowHelper.cs +++ b/Content.Server/Throw/ThrowHelper.cs @@ -1,5 +1,5 @@ using System; -using Content.Server.GameObjects.Components; +using Content.Server.GameObjects.Components.Projectiles; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Physics; using Robust.Shared.GameObjects.Components; diff --git a/Content.Shared/Atmos/GasPrototype.cs b/Content.Shared/Atmos/GasPrototype.cs index 8237d54b4c1..8a718117608 100644 --- a/Content.Shared/Atmos/GasPrototype.cs +++ b/Content.Shared/Atmos/GasPrototype.cs @@ -1,7 +1,5 @@ -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.Prototypes; +using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -using System; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Shared/Audio/AudioHelpers.cs b/Content.Shared/Audio/AudioHelpers.cs index 4e2a68b0fb3..e996954be6e 100644 --- a/Content.Shared/Audio/AudioHelpers.cs +++ b/Content.Shared/Audio/AudioHelpers.cs @@ -1,12 +1,6 @@ -using System; -using Content.Shared.GameObjects.Components.Sound; using Robust.Shared.Audio; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; -using Robust.Shared.Log; -using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Random; diff --git a/Content.Shared/Chemistry/DefaultMetabolizable.cs b/Content.Shared/Chemistry/DefaultMetabolizable.cs index 20de8420c08..7f8a72983af 100644 --- a/Content.Shared/Chemistry/DefaultMetabolizable.cs +++ b/Content.Shared/Chemistry/DefaultMetabolizable.cs @@ -1,7 +1,6 @@ using Content.Shared.Interfaces.Chemistry; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.IoC; using Robust.Shared.Serialization; namespace Content.Shared.Chemistry diff --git a/Content.Shared/Chemistry/ReagentPrototype.cs b/Content.Shared/Chemistry/ReagentPrototype.cs index 1280c7781e8..1f476c47fcd 100644 --- a/Content.Shared/Chemistry/ReagentPrototype.cs +++ b/Content.Shared/Chemistry/ReagentPrototype.cs @@ -5,7 +5,6 @@ using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Content.Shared.Chemistry diff --git a/Content.Shared/Chemistry/ReagentUnit.cs b/Content.Shared/Chemistry/ReagentUnit.cs index 42ed972187c..ec2d6adb600 100644 --- a/Content.Shared/Chemistry/ReagentUnit.cs +++ b/Content.Shared/Chemistry/ReagentUnit.cs @@ -1,7 +1,7 @@ -using Robust.Shared.Interfaces.Serialization; -using System; +using System; using System.Globalization; using System.Linq; +using Robust.Shared.Interfaces.Serialization; namespace Content.Shared.Chemistry { diff --git a/Content.Shared/Chemistry/Solution.cs b/Content.Shared/Chemistry/Solution.cs index ff2e15ec643..9db9a0a1019 100644 --- a/Content.Shared/Chemistry/Solution.cs +++ b/Content.Shared/Chemistry/Solution.cs @@ -1,13 +1,11 @@ -using Content.Shared.Interfaces.Chemistry; -using Robust.Shared.Interfaces.Serialization; -using Robust.Shared.IoC; -using Robust.Shared.Serialization; -using Robust.Shared.Utility; -using Robust.Shared.ViewVariables; -using System; +using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; +using Robust.Shared.ViewVariables; namespace Content.Shared.Chemistry { diff --git a/Content.Shared/EntryPoint.cs b/Content.Shared/EntryPoint.cs index 6d7472d02a1..25976f6379d 100644 --- a/Content.Shared/EntryPoint.cs +++ b/Content.Shared/EntryPoint.cs @@ -1,15 +1,15 @@ using System; - using System.Collections.Generic; - using System.Globalization; - using Content.Shared.Maps; - using Robust.Shared.ContentPack; - using Robust.Shared.Interfaces.Map; - using Robust.Shared.IoC; - using Robust.Shared.Localization; +using System.Collections.Generic; +using System.Globalization; +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.Prototypes; - namespace Content.Shared +namespace Content.Shared { public class EntryPoint : GameShared { diff --git a/Content.Shared/GameObjects/Components/Cargo/SharedCargoConsoleComponent.cs b/Content.Shared/GameObjects/Components/Cargo/SharedCargoConsoleComponent.cs index a2221bfb320..66f50411846 100644 --- a/Content.Shared/GameObjects/Components/Cargo/SharedCargoConsoleComponent.cs +++ b/Content.Shared/GameObjects/Components/Cargo/SharedCargoConsoleComponent.cs @@ -1,14 +1,9 @@ -using Content.Shared.Prototypes.Cargo; +using System; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Content.Shared.GameObjects.Components.Cargo { diff --git a/Content.Shared/GameObjects/Components/Cargo/SharedCargoOrderDatabaseComponent.cs b/Content.Shared/GameObjects/Components/Cargo/SharedCargoOrderDatabaseComponent.cs index cd7debb0abc..78cbe28efd1 100644 --- a/Content.Shared/GameObjects/Components/Cargo/SharedCargoOrderDatabaseComponent.cs +++ b/Content.Shared/GameObjects/Components/Cargo/SharedCargoOrderDatabaseComponent.cs @@ -1,8 +1,8 @@ -using Content.Shared.Prototypes.Cargo; +using System; +using System.Collections.Generic; +using Content.Shared.Prototypes.Cargo; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; namespace Content.Shared.GameObjects.Components.Cargo { diff --git a/Content.Shared/GameObjects/Components/Cargo/SharedGalacticMarketComponent.cs b/Content.Shared/GameObjects/Components/Cargo/SharedGalacticMarketComponent.cs index 51cdcf28933..7636ee47ad9 100644 --- a/Content.Shared/GameObjects/Components/Cargo/SharedGalacticMarketComponent.cs +++ b/Content.Shared/GameObjects/Components/Cargo/SharedGalacticMarketComponent.cs @@ -1,11 +1,11 @@ -using Content.Shared.Prototypes.Cargo; +using System; +using System.Collections; +using System.Collections.Generic; +using Content.Shared.Prototypes.Cargo; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -using System; -using System.Collections; -using System.Collections.Generic; namespace Content.Shared.GameObjects.Components.Cargo { diff --git a/Content.Shared/GameObjects/Components/Chemistry/ChemMaster/SharedChemMasterComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/ChemMaster/SharedChemMasterComponent.cs index 8a4f630fb0c..43d1584381c 100644 --- a/Content.Shared/GameObjects/Components/Chemistry/ChemMaster/SharedChemMasterComponent.cs +++ b/Content.Shared/GameObjects/Components/Chemistry/ChemMaster/SharedChemMasterComponent.cs @@ -6,7 +6,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; -namespace Content.Shared.GameObjects.Components.Chemistry +namespace Content.Shared.GameObjects.Components.Chemistry.ChemMaster { /// diff --git a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserInventoryPrototype.cs b/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserInventoryPrototype.cs index 1c5cb64af06..aa95bfe1879 100644 --- a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserInventoryPrototype.cs +++ b/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserInventoryPrototype.cs @@ -4,7 +4,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using YamlDotNet.RepresentationModel; -namespace Content.Shared.GameObjects.Components.Chemistry +namespace Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser { /// /// Is simply a list of reagents defined in yaml. This can then be set as a diff --git a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs index b2d094a5d07..d7ff2d7521d 100644 --- a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs +++ b/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs @@ -5,7 +5,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; -namespace Content.Shared.GameObjects.Components.Chemistry +namespace Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser { /// diff --git a/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionComponent.cs index 232bea635e4..93fa5d5aaba 100644 --- a/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionComponent.cs +++ b/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionComponent.cs @@ -1,12 +1,6 @@ using System; -using System.Collections.Generic; -using Content.Shared.Chemistry; using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Maths; -using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; namespace Content.Shared.GameObjects.Components.Chemistry { diff --git a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs index 656efbaf82b..13cf0b0e932 100644 --- a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs +++ b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -namespace Content.Shared.GameObjects +namespace Content.Shared.GameObjects.Components.Damage { public abstract class SharedDamageableComponent : Component { diff --git a/Content.Shared/GameObjects/Components/Instruments/SharedInstrumentComponent.cs b/Content.Shared/GameObjects/Components/Instruments/SharedInstrumentComponent.cs index c431a25fc87..87c1fa35f34 100644 --- a/Content.Shared/GameObjects/Components/Instruments/SharedInstrumentComponent.cs +++ b/Content.Shared/GameObjects/Components/Instruments/SharedInstrumentComponent.cs @@ -1,5 +1,4 @@ using System; -using Content.Shared.BodySystem; using Robust.Shared.Audio.Midi; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs b/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs index 0415814b41d..457c0c19ef0 100644 --- a/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs +++ b/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs @@ -2,7 +2,7 @@ using JetBrains.Annotations; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; -namespace Content.Shared.GameObjects +namespace Content.Shared.GameObjects.Components.Inventory { public abstract class Inventory { @@ -47,7 +47,7 @@ namespace Content.Shared.GameObjects public override IReadOnlyList SlotMasks { get; } = new List() { Slots.EYES, Slots.HEAD, Slots.EARS, - Slots.OUTERCLOTHING, Slots.MASK, Slots.INNERCLOTHING, + Slots.OUTERCLOTHING, Slots.MASK, Slots.INNERCLOTHING, Slots.BACKPACK, Slots.BELT, Slots.GLOVES, Slots.NONE, Slots.SHOES, Slots.IDCARD, Slots.POCKET1, Slots.POCKET2, Slots.NECK diff --git a/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs b/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs index 032385d0d40..dfea45389ec 100644 --- a/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs +++ b/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs @@ -8,7 +8,7 @@ using Robust.Shared.Utility; using Robust.Shared.ViewVariables; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; -namespace Content.Shared.GameObjects +namespace Content.Shared.GameObjects.Components.Inventory { public abstract class SharedInventoryComponent : Component { diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedOverlayEffectsComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedOverlayEffectsComponent.cs index e487f8940cb..865b3092e89 100644 --- a/Content.Shared/GameObjects/Components/Mobs/SharedOverlayEffectsComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/SharedOverlayEffectsComponent.cs @@ -1,19 +1,12 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Linq; -using System.Runtime.Serialization; -using System.Threading; -using System.Timers; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; -using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using YamlDotNet.RepresentationModel; -using Component = Robust.Shared.GameObjects.Component; namespace Content.Shared.GameObjects.Components.Mobs { diff --git a/Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs b/Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs index 510216449c8..4181a2e36d1 100644 --- a/Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Physics; diff --git a/Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs b/Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs index 567f7f8b2c8..8e24cbcd952 100644 --- a/Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs +++ b/Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; -using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.Maths; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.PDA diff --git a/Content.Shared/GameObjects/Components/Pointing/SharedPointingArrowComponent.cs b/Content.Shared/GameObjects/Components/Pointing/SharedPointingArrowComponent.cs index 05e14bb666a..4bca8f7007f 100644 --- a/Content.Shared/GameObjects/Components/Pointing/SharedPointingArrowComponent.cs +++ b/Content.Shared/GameObjects/Components/Pointing/SharedPointingArrowComponent.cs @@ -1,6 +1,4 @@ -using System; -using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; +using Robust.Shared.GameObjects; namespace Content.Shared.GameObjects.Components.Pointing { diff --git a/Content.Shared/GameObjects/Components/Power/SharedApc.cs b/Content.Shared/GameObjects/Components/Power/SharedApc.cs index e68c031aa3b..0169ca2d720 100644 --- a/Content.Shared/GameObjects/Components/Power/SharedApc.cs +++ b/Content.Shared/GameObjects/Components/Power/SharedApc.cs @@ -1,5 +1,4 @@ using System; -using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Power/SharedSolarControlConsoleComponent.cs b/Content.Shared/GameObjects/Components/Power/SharedSolarControlConsoleComponent.cs index a42e68287a9..54ce97e831e 100644 --- a/Content.Shared/GameObjects/Components/Power/SharedSolarControlConsoleComponent.cs +++ b/Content.Shared/GameObjects/Components/Power/SharedSolarControlConsoleComponent.cs @@ -1,8 +1,8 @@ using System; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.Serialization; using Robust.Shared.Maths; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Power { diff --git a/Content.Shared/GameObjects/Components/SharedDoAfterComponent.cs b/Content.Shared/GameObjects/Components/SharedDoAfterComponent.cs index b84d2387004..9cea4de79d8 100644 --- a/Content.Shared/GameObjects/Components/SharedDoAfterComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedDoAfterComponent.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/SharedGasAnalyzerComponent.cs b/Content.Shared/GameObjects/Components/SharedGasAnalyzerComponent.cs index d5ab8162add..641ab79ac8b 100644 --- a/Content.Shared/GameObjects/Components/SharedGasAnalyzerComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedGasAnalyzerComponent.cs @@ -1,10 +1,8 @@ -using Robust.Shared.GameObjects; +using System; +using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Localization; using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Shared.GameObjects.Components { diff --git a/Content.Shared/GameObjects/Components/SharedPaperComponent.cs b/Content.Shared/GameObjects/Components/SharedPaperComponent.cs index 71b4317d9c4..ea8ab84577e 100644 --- a/Content.Shared/GameObjects/Components/SharedPaperComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedPaperComponent.cs @@ -1,5 +1,4 @@ using System; -using System.Net.Mime; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Trigger/TriggerVisuals.cs b/Content.Shared/GameObjects/Components/Trigger/TriggerVisuals.cs index a8d90904fe3..d64a3bcdaac 100644 --- a/Content.Shared/GameObjects/Components/Trigger/TriggerVisuals.cs +++ b/Content.Shared/GameObjects/Components/Trigger/TriggerVisuals.cs @@ -1,7 +1,7 @@ using System; using Robust.Shared.Serialization; -namespace Content.Shared.GameObjects.Components.Triggers +namespace Content.Shared.GameObjects.Components.Trigger { [NetSerializable] [Serializable] diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedBarrelComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedBarrelComponent.cs index bbda3adeb6c..5130abf347f 100644 --- a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedBarrelComponent.cs +++ b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedBarrelComponent.cs @@ -1,6 +1,5 @@ using System; using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Weapons.Ranged { diff --git a/Content.Shared/GameObjects/DrawDepth.cs b/Content.Shared/GameObjects/DrawDepth.cs index 5d9524ea3d1..9f445d2e487 100644 --- a/Content.Shared/GameObjects/DrawDepth.cs +++ b/Content.Shared/GameObjects/DrawDepth.cs @@ -1,5 +1,5 @@ -using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth; using Robust.Shared.Serialization; +using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth; namespace Content.Shared.GameObjects { diff --git a/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs b/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs index 3c220978488..89e53b7db5c 100644 --- a/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs +++ b/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using Content.Shared.GameObjects.Verbs; using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs b/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs index 10aba7551f1..0e09c98af22 100644 --- a/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs +++ b/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs @@ -40,7 +40,7 @@ namespace Content.Shared.GameObjects.EntitySystems return false; } - return EntitySystem.Get() + return Get() .InRangeUnobstructed(examiner.Transform.MapPosition, examined.Transform.MapPosition, ExamineRange, predicate: entity => entity == examiner || entity == examined, ignoreInsideBlocker:true); } diff --git a/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs index 53833a14d00..0c17b7c518d 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs @@ -1,12 +1,7 @@ using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.EntitySystemMessages; -using Content.Shared.Interfaces; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.IoC; -using Robust.Shared.Random; -using Logger = Robust.Shared.Log.Logger; namespace Content.Shared.GameObjects.EntitySystems { diff --git a/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs index 1a3ddb7f6ec..eb046d4902b 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs @@ -1,6 +1,5 @@ using System; using Content.Shared.Construction; -using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.IoC; diff --git a/Content.Shared/GameObjects/EntitySystems/SharedGasTileOverlaySystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedGasTileOverlaySystem.cs index 111f81f10d9..346f44d733f 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedGasTileOverlaySystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedGasTileOverlaySystem.cs @@ -2,7 +2,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Map; -using Robust.Shared.Maths; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.EntitySystems diff --git a/Content.Shared/GameObjects/Verbs/GlobalVerb.cs b/Content.Shared/GameObjects/Verbs/GlobalVerb.cs index e1b55f14a58..ad5ebed6284 100644 --- a/Content.Shared/GameObjects/Verbs/GlobalVerb.cs +++ b/Content.Shared/GameObjects/Verbs/GlobalVerb.cs @@ -2,7 +2,7 @@ using JetBrains.Annotations; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Shared.GameObjects +namespace Content.Shared.GameObjects.Verbs { /// /// A verb is an action in the right click menu of an entity. diff --git a/Content.Shared/GameObjects/Verbs/Verb.cs b/Content.Shared/GameObjects/Verbs/Verb.cs index a2381082c4f..b4b1f27751b 100644 --- a/Content.Shared/GameObjects/Verbs/Verb.cs +++ b/Content.Shared/GameObjects/Verbs/Verb.cs @@ -2,7 +2,7 @@ using JetBrains.Annotations; using Robust.Shared.Interfaces.GameObjects; -namespace Content.Shared.GameObjects +namespace Content.Shared.GameObjects.Verbs { /// /// A verb is an action in the right click menu of an entity. @@ -48,7 +48,7 @@ namespace Content.Shared.GameObjects /// /// - /// Sub class of that works on a specific type of component, + /// Sub class of that works on a specific type of component, /// to reduce casting boiler plate for implementations. /// /// The type of component that this verb will run on. diff --git a/Content.Shared/GameObjects/Verbs/VerbCategories.cs b/Content.Shared/GameObjects/Verbs/VerbCategories.cs index bd5c168eaac..4311a7366b5 100644 --- a/Content.Shared/GameObjects/Verbs/VerbCategories.cs +++ b/Content.Shared/GameObjects/Verbs/VerbCategories.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.GameObjects +namespace Content.Shared.GameObjects.Verbs { /// /// Standard verb categories. diff --git a/Content.Shared/GameObjects/Verbs/VerbCategoryData.cs b/Content.Shared/GameObjects/Verbs/VerbCategoryData.cs index 4e19f040476..ad555cd4478 100644 --- a/Content.Shared/GameObjects/Verbs/VerbCategoryData.cs +++ b/Content.Shared/GameObjects/Verbs/VerbCategoryData.cs @@ -1,6 +1,6 @@ using Robust.Shared.Utility; -namespace Content.Shared.GameObjects +namespace Content.Shared.GameObjects.Verbs { /// /// Contains combined name and icon information for a verb category. diff --git a/Content.Shared/GameObjects/Verbs/VerbData.cs b/Content.Shared/GameObjects/Verbs/VerbData.cs index eeed3981b44..94f72e72f37 100644 --- a/Content.Shared/GameObjects/Verbs/VerbData.cs +++ b/Content.Shared/GameObjects/Verbs/VerbData.cs @@ -2,7 +2,7 @@ using JetBrains.Annotations; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Utility; -namespace Content.Shared.GameObjects +namespace Content.Shared.GameObjects.Verbs { /// /// Stores visual data for a verb. diff --git a/Content.Shared/GameObjects/Verbs/VerbUtility.cs b/Content.Shared/GameObjects/Verbs/VerbUtility.cs index 2c46838320a..275a00330fa 100644 --- a/Content.Shared/GameObjects/Verbs/VerbUtility.cs +++ b/Content.Shared/GameObjects/Verbs/VerbUtility.cs @@ -4,7 +4,7 @@ using System.Reflection; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Utility; -namespace Content.Shared.GameObjects +namespace Content.Shared.GameObjects.Verbs { public static class VerbUtility { diff --git a/Content.Shared/GameObjects/Verbs/VerbVisibility.cs b/Content.Shared/GameObjects/Verbs/VerbVisibility.cs index 05fcaa218b1..dde0621f78e 100644 --- a/Content.Shared/GameObjects/Verbs/VerbVisibility.cs +++ b/Content.Shared/GameObjects/Verbs/VerbVisibility.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.GameObjects +namespace Content.Shared.GameObjects.Verbs { /// /// Possible states of visibility for the verb in the right click menu. diff --git a/Content.Shared/Health/BodySystem/BodyPart/BodyPartProperties/ArmLength.cs b/Content.Shared/Health/BodySystem/BodyPart/BodyPartProperties/ArmLength.cs index 5ae478412cd..617bd450509 100644 --- a/Content.Shared/Health/BodySystem/BodyPart/BodyPartProperties/ArmLength.cs +++ b/Content.Shared/Health/BodySystem/BodyPart/BodyPartProperties/ArmLength.cs @@ -1,15 +1,13 @@ - - +using System; using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; -using System; -namespace Content.Shared.BodySystem { +namespace Content.Shared.Health.BodySystem.BodyPart.BodyPartProperties { [NetSerializable, Serializable] class ArmLength : IExposeData { private float _length; - + public void ExposeData(ObjectSerializer serializer){ serializer.DataField(ref _length, "length", 2f); } diff --git a/Content.Shared/Health/BodySystem/BodyPart/BodyPartPrototype.cs b/Content.Shared/Health/BodySystem/BodyPart/BodyPartPrototype.cs index 4edc6a1d8d1..d400501f6d8 100644 --- a/Content.Shared/Health/BodySystem/BodyPart/BodyPartPrototype.cs +++ b/Content.Shared/Health/BodySystem/BodyPart/BodyPartPrototype.cs @@ -6,13 +6,12 @@ using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using YamlDotNet.RepresentationModel; - -namespace Content.Shared.BodySystem { +namespace Content.Shared.Health.BodySystem.BodyPart { /// /// Prototype for the BodyPart class. - /// + /// [Prototype("bodyPart")] [NetSerializable, Serializable] public class BodyPartPrototype : IPrototype, IIndexedPrototype { @@ -36,7 +35,7 @@ namespace Content.Shared.BodySystem { [ViewVariables] public string Name => _name; - + [ViewVariables] public string Plural => _plural; @@ -48,19 +47,19 @@ namespace Content.Shared.BodySystem { [ViewVariables] public BodyPartType PartType => _partType; - + [ViewVariables] public int Durability => _durability; - + [ViewVariables] - public int DestroyThreshold => _destroyThreshold; - + public int DestroyThreshold => _destroyThreshold; + [ViewVariables] public float Resistance => _resistance; - + [ViewVariables] public int Size => _size; - + [ViewVariables] public BodyPartCompatibility Compatibility => _compatibility; diff --git a/Content.Shared/Health/BodySystem/BodyPreset/BodyPresetPrototype.cs b/Content.Shared/Health/BodySystem/BodyPreset/BodyPresetPrototype.cs index 7020bdf84c5..f36202a5a4a 100644 --- a/Content.Shared/Health/BodySystem/BodyPreset/BodyPresetPrototype.cs +++ b/Content.Shared/Health/BodySystem/BodyPreset/BodyPresetPrototype.cs @@ -1,16 +1,15 @@ using System; using System.Collections.Generic; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using YamlDotNet.RepresentationModel; -namespace Content.Shared.BodySystem { +namespace Content.Shared.Health.BodySystem.BodyPreset { /// /// Prototype for the BodyPreset class. - /// + /// [Prototype("bodyPreset")] [NetSerializable, Serializable] public class BodyPresetPrototype : IPrototype, IIndexedPrototype { @@ -23,7 +22,7 @@ namespace Content.Shared.BodySystem { [ViewVariables] public string Name => _name; - + [ViewVariables] public Dictionary PartIDs => _partIDs; diff --git a/Content.Shared/Health/BodySystem/BodyScanner/BodyScannerSharedValues.cs b/Content.Shared/Health/BodySystem/BodyScanner/BodyScannerSharedValues.cs index ef4611b5d96..0f9f83cf6cf 100644 --- a/Content.Shared/Health/BodySystem/BodyScanner/BodyScannerSharedValues.cs +++ b/Content.Shared/Health/BodySystem/BodyScanner/BodyScannerSharedValues.cs @@ -1,17 +1,9 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components.UserInterface; -using Robust.Shared.IoC; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; -using System; +using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Robust.Shared.GameObjects.Components.UserInterface; +using Robust.Shared.Serialization; - - -namespace Content.Shared.BodySystem +namespace Content.Shared.Health.BodySystem.BodyScanner { diff --git a/Content.Shared/Health/BodySystem/BodyTemplate/BodyTemplatePrototype.cs b/Content.Shared/Health/BodySystem/BodyTemplate/BodyTemplatePrototype.cs index 11f7ad93f38..50ac37c0651 100644 --- a/Content.Shared/Health/BodySystem/BodyTemplate/BodyTemplatePrototype.cs +++ b/Content.Shared/Health/BodySystem/BodyTemplate/BodyTemplatePrototype.cs @@ -1,16 +1,15 @@ using System; using System.Collections.Generic; -using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using YamlDotNet.RepresentationModel; -namespace Content.Shared.BodySystem { +namespace Content.Shared.Health.BodySystem.BodyTemplate { /// /// Prototype for the BodyTemplate class. - /// + /// [Prototype("bodyTemplate")] [NetSerializable, Serializable] public class BodyTemplatePrototype : IPrototype, IIndexedPrototype { @@ -25,13 +24,13 @@ namespace Content.Shared.BodySystem { [ViewVariables] public string Name => _name; - + [ViewVariables] public string CenterSlot => _centerSlot; - + [ViewVariables] public Dictionary Slots => _slots; - + [ViewVariables] public Dictionary> Connections => _connections; diff --git a/Content.Shared/Health/BodySystem/BodysystemValues.cs b/Content.Shared/Health/BodySystem/BodysystemValues.cs index cb361356807..ce16122f8db 100644 --- a/Content.Shared/Health/BodySystem/BodysystemValues.cs +++ b/Content.Shared/Health/BodySystem/BodysystemValues.cs @@ -1,5 +1,5 @@  -namespace Content.Shared.BodySystem +namespace Content.Shared.Health.BodySystem { /// /// Used to determine whether a BodyPart can connect to another BodyPart. diff --git a/Content.Shared/Health/BodySystem/Mechanism/MechanismPrototype.cs b/Content.Shared/Health/BodySystem/Mechanism/MechanismPrototype.cs index aa9f2f00627..3a37046b206 100644 --- a/Content.Shared/Health/BodySystem/Mechanism/MechanismPrototype.cs +++ b/Content.Shared/Health/BodySystem/Mechanism/MechanismPrototype.cs @@ -1,19 +1,15 @@ using System; -using System.Collections.Generic; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; using YamlDotNet.RepresentationModel; - - - -namespace Content.Shared.BodySystem +namespace Content.Shared.Health.BodySystem.Mechanism { /// /// Prototype for the Mechanism class. - /// + /// [Prototype("mechanism")] [NetSerializable, Serializable] public class MechanismPrototype : IPrototype, IIndexedPrototype diff --git a/Content.Shared/Health/BodySystem/Surgery/GenericSurgeryUIMessages.cs b/Content.Shared/Health/BodySystem/Surgery/GenericSurgeryUIMessages.cs index c1657e4ac10..eee26afde08 100644 --- a/Content.Shared/Health/BodySystem/Surgery/GenericSurgeryUIMessages.cs +++ b/Content.Shared/Health/BodySystem/Surgery/GenericSurgeryUIMessages.cs @@ -1,11 +1,9 @@ -using Robust.Shared.GameObjects; +using System; +using System.Collections.Generic; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; -using System.Text; -namespace Content.Shared.BodySystem +namespace Content.Shared.Health.BodySystem.Surgery { [Serializable, NetSerializable] diff --git a/Content.Shared/Health/DamageContainer/AbstractDamageContainer.cs b/Content.Shared/Health/DamageContainer/AbstractDamageContainer.cs index 80b258e284a..fb146adf462 100644 --- a/Content.Shared/Health/DamageContainer/AbstractDamageContainer.cs +++ b/Content.Shared/Health/DamageContainer/AbstractDamageContainer.cs @@ -1,10 +1,10 @@ -using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; -using System; +using System; using System.Collections.Generic; using System.Linq; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; -namespace Content.Shared.BodySystem +namespace Content.Shared.Health.DamageContainer { public enum DamageClass { Brute, Burn, Toxin, Airloss } public enum DamageType { Blunt, Piercing, Heat, Disintegration, Cellular, DNA, Airloss } diff --git a/Content.Shared/Health/DamageContainer/BiologicalDamageContainer.cs b/Content.Shared/Health/DamageContainer/BiologicalDamageContainer.cs index 04741abb222..e2b26b04e56 100644 --- a/Content.Shared/Health/DamageContainer/BiologicalDamageContainer.cs +++ b/Content.Shared/Health/DamageContainer/BiologicalDamageContainer.cs @@ -1,9 +1,8 @@ -using Robust.Shared.Serialization; -using System; +using System; using System.Collections.Generic; -using System.Linq; +using Robust.Shared.Serialization; -namespace Content.Shared.BodySystem +namespace Content.Shared.Health.DamageContainer { [NetSerializable, Serializable] public class BiologicalDamageContainer : AbstractDamageContainer diff --git a/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs b/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs index 1973012d52d..3cb72d5a9dc 100644 --- a/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs +++ b/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using Content.Shared.Chemistry; +using Content.Shared.Chemistry; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Serialization; diff --git a/Content.Shared/Interfaces/IModuleManager.cs b/Content.Shared/Interfaces/IModuleManager.cs index f6e4ecc2222..420c15dde05 100644 --- a/Content.Shared/Interfaces/IModuleManager.cs +++ b/Content.Shared/Interfaces/IModuleManager.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Content.Shared.Interfaces +namespace Content.Shared.Interfaces { /// /// Provides a simple way to check whether calling code is being run by diff --git a/Content.Shared/Kitchen/RecipeManager.cs b/Content.Shared/Kitchen/RecipeManager.cs index c731d8994f4..c5f7657a693 100644 --- a/Content.Shared/Kitchen/RecipeManager.cs +++ b/Content.Shared/Kitchen/RecipeManager.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using Content.Shared.Prototypes.Kitchen; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Kitchen/SharedMicrowaveComponent.cs b/Content.Shared/Kitchen/SharedMicrowaveComponent.cs index ba8ae5c499b..92e6e9324d7 100644 --- a/Content.Shared/Kitchen/SharedMicrowaveComponent.cs +++ b/Content.Shared/Kitchen/SharedMicrowaveComponent.cs @@ -1,10 +1,9 @@ using System; -using System.Collections.Generic; using Content.Shared.Chemistry; using Content.Shared.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; 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 c00e62fa87a..1cf66f57eb9 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -1,13 +1,10 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; using Robust.Shared.Interfaces.Map; using Robust.Shared.Prototypes; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; -using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; namespace Content.Shared.Maps { diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs index 688d4e7e0cc..8ef86b5a6fe 100644 --- a/Content.Shared/Physics/CollisionGroup.cs +++ b/Content.Shared/Physics/CollisionGroup.cs @@ -1,8 +1,8 @@ using System; using JetBrains.Annotations; using Robust.Shared.Map; -using RobustPhysics = Robust.Shared.Physics; using Robust.Shared.Serialization; +using RobustPhysics = Robust.Shared.Physics; namespace Content.Shared.Physics { diff --git a/Content.Shared/Physics/VaporController.cs b/Content.Shared/Physics/VaporController.cs index 190dd62b547..55a2f9d827c 100644 --- a/Content.Shared/Physics/VaporController.cs +++ b/Content.Shared/Physics/VaporController.cs @@ -1,8 +1,5 @@ using Robust.Shared.Maths; using Robust.Shared.Physics; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Shared.Physics { diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index db068e358d0..58633d2a2a9 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Content.Shared.Antags; -using Robust.Shared.IoC; -using Robust.Shared.Prototypes; using Robust.Shared.Serialization; namespace Content.Shared.Preferences diff --git a/Content.Shared/Prototypes/Cargo/CargoOrderData.cs b/Content.Shared/Prototypes/Cargo/CargoOrderData.cs index 0882db8e0d0..171ec99bd4e 100644 --- a/Content.Shared/Prototypes/Cargo/CargoOrderData.cs +++ b/Content.Shared/Prototypes/Cargo/CargoOrderData.cs @@ -1,9 +1,5 @@ -using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; +using Robust.Shared.Serialization; namespace Content.Shared.Prototypes.Cargo { diff --git a/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs b/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs index 57b1aedc760..3cfc1497f56 100644 --- a/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs +++ b/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs @@ -1,10 +1,10 @@ -using Robust.Shared.GameObjects; +using System; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -using System; using YamlDotNet.RepresentationModel; namespace Content.Shared.Prototypes.Cargo diff --git a/Content.Shared/Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs b/Content.Shared/Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs index 0d64a7d0738..d0c6d443571 100644 --- a/Content.Shared/Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs +++ b/Content.Shared/Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using System.Collections.Generic; using Robust.Shared.Localization; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Content.Shared.Prototypes.Kitchen diff --git a/Content.Shared/Prototypes/PDA/UplinkStoreListingPrototype.cs b/Content.Shared/Prototypes/PDA/UplinkStoreListingPrototype.cs index a4af3f95409..a00d5ff666f 100644 --- a/Content.Shared/Prototypes/PDA/UplinkStoreListingPrototype.cs +++ b/Content.Shared/Prototypes/PDA/UplinkStoreListingPrototype.cs @@ -1,5 +1,4 @@ using Content.Shared.GameObjects.Components.PDA; -using Robust.Shared.Maths; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using YamlDotNet.RepresentationModel; diff --git a/Content.Shared/Roles/AntagPrototype.cs b/Content.Shared/Roles/AntagPrototype.cs index a253d13a1a7..caa0776fcae 100644 --- a/Content.Shared/Roles/AntagPrototype.cs +++ b/Content.Shared/Roles/AntagPrototype.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; using Robust.Shared.Localization; using Robust.Shared.Prototypes; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; -namespace Content.Shared.Antags +namespace Content.Shared.Roles { /// /// Describes information for a single antag. diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs index 298a33530ac..63aea01f214 100644 --- a/Content.Shared/Roles/JobPrototype.cs +++ b/Content.Shared/Roles/JobPrototype.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; -using Content.Server.Jobs; using Robust.Shared.Localization; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using YamlDotNet.RepresentationModel; -namespace Content.Shared.Jobs +namespace Content.Shared.Roles { /// /// Describes information for a single job on the station. diff --git a/Content.Shared/Roles/JobSpecial.cs b/Content.Shared/Roles/JobSpecial.cs index 6b77fa5400f..edc3f091de5 100644 --- a/Content.Shared/Roles/JobSpecial.cs +++ b/Content.Shared/Roles/JobSpecial.cs @@ -2,7 +2,7 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Serialization; -namespace Content.Server.Jobs +namespace Content.Shared.Roles { /// /// Provides special hooks for when jobs get spawned in/equipped. diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs index 154e0dbe3e5..e8213cea740 100644 --- a/Content.Shared/Roles/StartingGearPrototype.cs +++ b/Content.Shared/Roles/StartingGearPrototype.cs @@ -7,7 +7,7 @@ using Robust.Shared.ViewVariables; using YamlDotNet.RepresentationModel; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; -namespace Content.Shared.Jobs +namespace Content.Shared.Roles { [Prototype("startingGear")] public class StartingGearPrototype : IPrototype, IIndexedPrototype diff --git a/Content.Shared/SharedGameTicker.cs b/Content.Shared/SharedGameTicker.cs index 2fea6dd16ba..cd16b79191a 100644 --- a/Content.Shared/SharedGameTicker.cs +++ b/Content.Shared/SharedGameTicker.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Lidgren.Network; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; diff --git a/Content.Shared/Utility/TemperatureHelpers.cs b/Content.Shared/Utility/TemperatureHelpers.cs index 529c8d67469..1d4e61ca482 100644 --- a/Content.Shared/Utility/TemperatureHelpers.cs +++ b/Content.Shared/Utility/TemperatureHelpers.cs @@ -1,7 +1,4 @@ using Content.Shared.Maths; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Shared.Utility { diff --git a/Content.Tests/Shared/BodyTemplateTest.cs b/Content.Tests/Shared/BodyTemplateTest.cs index bb246529ddf..87b34559892 100644 --- a/Content.Tests/Shared/BodyTemplateTest.cs +++ b/Content.Tests/Shared/BodyTemplateTest.cs @@ -1,10 +1,8 @@ - -using Content.Server.BodySystem; -using Content.Shared.BodySystem; +using System.Collections.Generic; +using Content.Server.Health.BodySystem.BodyTemplate; +using Content.Shared.Health.BodySystem; using NUnit.Framework; using Robust.UnitTesting; -using System; -using System.Collections.Generic; namespace Content.Tests.Shared { diff --git a/Content.Tests/Shared/Chemistry/ReagentUnit_Tests.cs b/Content.Tests/Shared/Chemistry/ReagentUnit_Tests.cs index e06290fb543..8e6e6ab5917 100644 --- a/Content.Tests/Shared/Chemistry/ReagentUnit_Tests.cs +++ b/Content.Tests/Shared/Chemistry/ReagentUnit_Tests.cs @@ -1,6 +1,6 @@ -using Content.Shared.Chemistry; +using System; +using Content.Shared.Chemistry; using NUnit.Framework; -using System; namespace Content.Tests.Shared.Chemistry { diff --git a/Content.Tests/Shared/Gamestates/ComponentStateNullTest.cs b/Content.Tests/Shared/Gamestates/ComponentStateNullTest.cs index 5bf4709ff58..93bfa94513a 100644 --- a/Content.Tests/Shared/Gamestates/ComponentStateNullTest.cs +++ b/Content.Tests/Shared/Gamestates/ComponentStateNullTest.cs @@ -8,7 +8,7 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Reflection; using Robust.Shared.Reflection; -namespace Content.Tests.Shared.GameStates +namespace Content.Tests.Shared.Gamestates { [TestFixture] public class ComponentStateNullTest