diff --git a/Content.Client/Audio/BackgroundAudioSystem.cs b/Content.Client/Audio/BackgroundAudioSystem.cs index c426ffec08..a35bc858ab 100644 --- a/Content.Client/Audio/BackgroundAudioSystem.cs +++ b/Content.Client/Audio/BackgroundAudioSystem.cs @@ -4,6 +4,7 @@ using Content.Client.Lobby; using Content.Client.Viewport; using Content.Shared; using Content.Shared.Audio; +using Content.Shared.CCVar; using JetBrains.Annotations; using Robust.Client; using Robust.Client.State; diff --git a/Content.Client/Commands/GroupingContextMenuCommand.cs b/Content.Client/Commands/GroupingContextMenuCommand.cs index 9e9ee961e4..58d162a8ba 100644 --- a/Content.Client/Commands/GroupingContextMenuCommand.cs +++ b/Content.Client/Commands/GroupingContextMenuCommand.cs @@ -1,6 +1,7 @@ #nullable enable using Content.Client.GameObjects.EntitySystems; using Content.Shared; +using Content.Shared.CCVar; using Robust.Shared.Configuration; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Client/Commands/ToggleOutlineCommand.cs b/Content.Client/Commands/ToggleOutlineCommand.cs index 7f18fdc84a..d8ad084c23 100644 --- a/Content.Client/Commands/ToggleOutlineCommand.cs +++ b/Content.Client/Commands/ToggleOutlineCommand.cs @@ -1,4 +1,5 @@ using Content.Shared; +using Content.Shared.CCVar; using Robust.Shared.Configuration; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs b/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs index e76b8f215c..21ca65f75a 100644 --- a/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs +++ b/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs @@ -8,6 +8,7 @@ using Content.Client.Items.Managers; using Content.Client.Verbs; using Content.Client.Viewport; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.Input; using Content.Shared.Verbs; using Robust.Client.GameObjects; diff --git a/Content.Client/Credits/CreditsWindow.cs b/Content.Client/Credits/CreditsWindow.cs index ab4541a931..91616d6f90 100644 --- a/Content.Client/Credits/CreditsWindow.cs +++ b/Content.Client/Credits/CreditsWindow.cs @@ -4,6 +4,7 @@ using System.Linq; using Content.Client.Links; using Content.Client.Stylesheets; using Content.Shared; +using Content.Shared.CCVar; using Robust.Client.Credits; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; diff --git a/Content.Client/DragDrop/DragDropSystem.cs b/Content.Client/DragDrop/DragDropSystem.cs index 1fa5f83ca7..25bca35f4d 100644 --- a/Content.Client/DragDrop/DragDropSystem.cs +++ b/Content.Client/DragDrop/DragDropSystem.cs @@ -5,6 +5,7 @@ using Content.Shared.DragDrop; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Client.Graphics; diff --git a/Content.Client/EntryPoint/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs similarity index 99% rename from Content.Client/EntryPoint/EntryPoint.cs rename to Content.Client/Entry/EntryPoint.cs index 95499045a9..32528ca286 100644 --- a/Content.Client/EntryPoint/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -51,7 +51,7 @@ using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Timing; -namespace Content.Client.EntryPoint +namespace Content.Client.Entry { public class EntryPoint : GameClient { diff --git a/Content.Client/EntryPoint/IgnoredComponents.cs b/Content.Client/Entry/IgnoredComponents.cs similarity index 99% rename from Content.Client/EntryPoint/IgnoredComponents.cs rename to Content.Client/Entry/IgnoredComponents.cs index d1ef41aad7..4d4bf23392 100644 --- a/Content.Client/EntryPoint/IgnoredComponents.cs +++ b/Content.Client/Entry/IgnoredComponents.cs @@ -1,5 +1,5 @@ // ReSharper disable ArrangeTrailingCommaInMultilineLists -namespace Content.Client.EntryPoint +namespace Content.Client.Entry { public static class IgnoredComponents { diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs index e867757c2a..40815acde2 100644 --- a/Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs +++ b/Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs @@ -1,6 +1,7 @@ using Content.Client.HUD.UI; using Content.Client.Stylesheets; using Content.Shared; +using Content.Shared.CCVar; using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs index 6727ce9c23..88e67f702c 100644 --- a/Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs +++ b/Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs @@ -1,5 +1,6 @@ using Content.Client.HUD.UI; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.HUD; using Robust.Client.Graphics; using Robust.Client.UserInterface; diff --git a/Content.Client/HUD/GameHud.cs b/Content.Client/HUD/GameHud.cs index da1887bbc8..c8699f0598 100644 --- a/Content.Client/HUD/GameHud.cs +++ b/Content.Client/HUD/GameHud.cs @@ -7,6 +7,7 @@ using Content.Client.Resources; using Content.Client.Stylesheets; using Content.Client.Targeting; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.HUD; using Content.Shared.Input; using Content.Shared.Targeting; diff --git a/Content.Client/HUD/UI/MainViewport.cs b/Content.Client/HUD/UI/MainViewport.cs index 098458efef..0a596550a8 100644 --- a/Content.Client/HUD/UI/MainViewport.cs +++ b/Content.Client/HUD/UI/MainViewport.cs @@ -1,5 +1,6 @@ using Content.Client.Viewport; using Content.Shared; +using Content.Shared.CCVar; using Robust.Client.UserInterface; using Robust.Shared.Configuration; using Robust.Shared.IoC; diff --git a/Content.Client/Hands/HandsGui.cs b/Content.Client/Hands/HandsGui.cs index 9bdb225499..76dbca4678 100644 --- a/Content.Client/Hands/HandsGui.cs +++ b/Content.Client/Hands/HandsGui.cs @@ -6,6 +6,7 @@ using Content.Client.Items.Managers; using Content.Client.Items.UI; using Content.Client.Resources; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.Hands.Components; using Content.Shared.Input; using Robust.Client.Graphics; diff --git a/Content.Client/Instruments/InstrumentSystem.cs b/Content.Client/Instruments/InstrumentSystem.cs index 6225b15617..837dd87487 100644 --- a/Content.Client/Instruments/InstrumentSystem.cs +++ b/Content.Client/Instruments/InstrumentSystem.cs @@ -1,4 +1,5 @@ using Content.Shared; +using Content.Shared.CCVar; using JetBrains.Annotations; using Robust.Shared.Configuration; using Robust.Shared.GameObjects; diff --git a/Content.Client/Inventory/HumanInventoryInterfaceController.cs b/Content.Client/Inventory/HumanInventoryInterfaceController.cs index 9cc3466577..ebc5147c6b 100644 --- a/Content.Client/Inventory/HumanInventoryInterfaceController.cs +++ b/Content.Client/Inventory/HumanInventoryInterfaceController.cs @@ -4,6 +4,7 @@ using Content.Client.HUD; using Content.Client.Items.Managers; using Content.Client.Items.UI; using Content.Shared; +using Content.Shared.CCVar; using JetBrains.Annotations; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs index fbf7a149af..fd34dacefd 100644 --- a/Content.Client/IoC/ClientContentIoC.cs +++ b/Content.Client/IoC/ClientContentIoC.cs @@ -21,6 +21,7 @@ using Content.Shared.Actions; using Content.Shared.Alert; using Content.Shared.Module; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.IoC; namespace Content.Client.IoC diff --git a/Content.Client/IoC/ClientModuleTestingCallbacks.cs b/Content.Client/IoC/ClientModuleTestingCallbacks.cs index a24b89bf1f..143bb544a7 100644 --- a/Content.Client/IoC/ClientModuleTestingCallbacks.cs +++ b/Content.Client/IoC/ClientModuleTestingCallbacks.cs @@ -1,5 +1,6 @@ using System; using Content.Shared; +using Content.Shared.Module; namespace Content.Client.IoC { diff --git a/Content.Client/Notifications/Managers/ClientNotifyManager.cs b/Content.Client/Notifications/Managers/ClientNotifyManager.cs index a8fd79dd4d..3e2a3ca573 100644 --- a/Content.Client/Notifications/Managers/ClientNotifyManager.cs +++ b/Content.Client/Notifications/Managers/ClientNotifyManager.cs @@ -2,6 +2,8 @@ using System; using System.Collections.Generic; using Content.Client.Stylesheets; using Content.Shared; +using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Client.UserInterface; diff --git a/Content.Client/Notifications/Managers/IClientNotifyManager.cs b/Content.Client/Notifications/Managers/IClientNotifyManager.cs index b4baab491c..159b6579a0 100644 --- a/Content.Client/Notifications/Managers/IClientNotifyManager.cs +++ b/Content.Client/Notifications/Managers/IClientNotifyManager.cs @@ -1,4 +1,5 @@ using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.Map; using Robust.Shared.Timing; diff --git a/Content.Client/Parallax/Managers/ParallaxManager.cs b/Content.Client/Parallax/Managers/ParallaxManager.cs index 24fbe71d05..f69f45f906 100644 --- a/Content.Client/Parallax/Managers/ParallaxManager.cs +++ b/Content.Client/Parallax/Managers/ParallaxManager.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; using Content.Shared; +using Content.Shared.CCVar; using Nett; using Robust.Client.Graphics; using Robust.Client.ResourceManagement; diff --git a/Content.Client/Suspicion/SuspicionGui.xaml.cs b/Content.Client/Suspicion/SuspicionGui.xaml.cs index b515a9a83f..8e7aa39b93 100644 --- a/Content.Client/Suspicion/SuspicionGui.xaml.cs +++ b/Content.Client/Suspicion/SuspicionGui.xaml.cs @@ -3,6 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Linq; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Client.AutoGenerated; using Robust.Client.Player; using Robust.Client.UserInterface; diff --git a/Content.Client/Viewport/GameScreenBase.cs b/Content.Client/Viewport/GameScreenBase.cs index db9f12e4c4..c9e4590837 100644 --- a/Content.Client/Viewport/GameScreenBase.cs +++ b/Content.Client/Viewport/GameScreenBase.cs @@ -6,6 +6,7 @@ using Content.Client.Interactable; using Content.Client.Interactable.Components; using Content.Client.State; using Content.Shared; +using Content.Shared.CCVar; using Robust.Client.GameObjects; using Robust.Client.Input; using Robust.Client.Player; diff --git a/Content.Client/Viewport/ViewportManager.cs b/Content.Client/Viewport/ViewportManager.cs index cc5f6ba8fe..ddcab69799 100644 --- a/Content.Client/Viewport/ViewportManager.cs +++ b/Content.Client/Viewport/ViewportManager.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Content.Client.HUD.UI; using Content.Shared; +using Content.Shared.CCVar; using Robust.Shared.Configuration; using Robust.Shared.IoC; diff --git a/Content.IntegrationTests/ContentIntegrationTest.cs b/Content.IntegrationTests/ContentIntegrationTest.cs index 41f254d5e6..1b1970a282 100644 --- a/Content.IntegrationTests/ContentIntegrationTest.cs +++ b/Content.IntegrationTests/ContentIntegrationTest.cs @@ -1,12 +1,10 @@ using System; using System.Threading.Tasks; -using Content.Client; using Content.Client.IoC; using Content.Client.Parallax.Managers; -using Content.Server; using Content.Server.GameTicking; using Content.Server.IoC; -using Content.Shared; +using Content.Shared.CCVar; using NUnit.Framework; using Robust.Server.Maps; using Robust.Shared; @@ -17,7 +15,7 @@ using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Timing; using Robust.UnitTesting; -using EntryPoint = Content.Client.EntryPoint.EntryPoint; +using EntryPoint = Content.Client.Entry.EntryPoint; namespace Content.IntegrationTests { @@ -35,7 +33,7 @@ namespace Content.IntegrationTests options.ContentAssemblies = new[] { - typeof(Shared.EntryPoint).Assembly, + typeof(Shared.Entry.EntryPoint).Assembly, typeof(EntryPoint).Assembly, typeof(ContentIntegrationTest).Assembly }; @@ -78,8 +76,8 @@ namespace Content.IntegrationTests options.ContentAssemblies = new[] { - typeof(Shared.EntryPoint).Assembly, - typeof(Server.EntryPoint.EntryPoint).Assembly, + typeof(Shared.Entry.EntryPoint).Assembly, + typeof(Server.Entry.EntryPoint).Assembly, typeof(ContentIntegrationTest).Assembly }; diff --git a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs index 078bb9edea..0f6f4d8338 100644 --- a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs +++ b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Content.Server.GameTicking; using Content.Server.GameTicking.Commands; using Content.Shared; +using Content.Shared.CCVar; using NUnit.Framework; using Robust.Shared.Configuration; using Robust.Shared.GameObjects; diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs index 2dc01db2bb..954006aa4b 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Content.Client; -using Content.Client.EntryPoint; +using Content.Client.Entry; using NUnit.Framework; using Robust.Shared.ContentPack; using Robust.Shared.GameObjects; @@ -15,7 +15,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components { [TestFixture] [TestOf(typeof(IgnoredComponents))] - [TestOf(typeof(Server.EntryPoint.IgnoredComponents))] + [TestOf(typeof(Server.Entry.IgnoredComponents))] public class EntityPrototypeComponentsTest : ContentIntegrationTest { [Test] diff --git a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs index 94ffe489cb..b534711fa4 100644 --- a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs +++ b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs @@ -8,6 +8,7 @@ using Content.Server.Interfaces; using Content.Server.Preferences; using Content.Server.Preferences.Managers; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.Preferences; using NUnit.Framework; using Robust.Client.State; diff --git a/Content.Server/AI/EntitySystems/AiSystem.cs b/Content.Server/AI/EntitySystems/AiSystem.cs index 88fb2c1b82..e6f55087ef 100644 --- a/Content.Server/AI/EntitySystems/AiSystem.cs +++ b/Content.Server/AI/EntitySystems/AiSystem.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using Content.Server.AI.Components; using Content.Server.AI.Utility.AiLogic; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.MobState; using JetBrains.Annotations; using Robust.Shared.Configuration; diff --git a/Content.Server/AME/Components/AMEControllerComponent.cs b/Content.Server/AME/Components/AMEControllerComponent.cs index add646c0ed..f861ed6a55 100644 --- a/Content.Server/AME/Components/AMEControllerComponent.cs +++ b/Content.Server/AME/Components/AMEControllerComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.AME; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Containers; diff --git a/Content.Server/AME/Components/AMEPartComponent.cs b/Content.Server/AME/Components/AMEPartComponent.cs index 0741dcc53d..fc2e0a8438 100644 --- a/Content.Server/AME/Components/AMEPartComponent.cs +++ b/Content.Server/AME/Components/AMEPartComponent.cs @@ -5,6 +5,7 @@ using Content.Server.Hands.Components; using Content.Server.Tools.Components; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Tool; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/APC/Components/ApcComponent.cs b/Content.Server/APC/Components/ApcComponent.cs index d7ecbd5247..1c6b72f4e6 100644 --- a/Content.Server/APC/Components/ApcComponent.cs +++ b/Content.Server/APC/Components/ApcComponent.cs @@ -7,6 +7,7 @@ using Content.Server.UserInterface; using Content.Shared.APC; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; diff --git a/Content.Server/Access/Components/IdCardConsoleComponent.cs b/Content.Server/Access/Components/IdCardConsoleComponent.cs index a6b88944ae..c3d18c1c3b 100644 --- a/Content.Server/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Server/Access/Components/IdCardConsoleComponent.cs @@ -11,6 +11,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Acts; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Server.GameObjects; using Robust.Shared.Containers; diff --git a/Content.Server/Actions/Actions/CombatMode.cs b/Content.Server/Actions/Actions/CombatMode.cs index a43ee87840..ea0a356a06 100644 --- a/Content.Server/Actions/Actions/CombatMode.cs +++ b/Content.Server/Actions/Actions/CombatMode.cs @@ -2,6 +2,7 @@ using Content.Server.CombatMode; using Content.Shared.Actions.Behaviors; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using JetBrains.Annotations; using Robust.Shared.Localization; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Actions/Actions/DisarmAction.cs b/Content.Server/Actions/Actions/DisarmAction.cs index 1d63a9efef..84b1f78e2f 100644 --- a/Content.Server/Actions/Actions/DisarmAction.cs +++ b/Content.Server/Actions/Actions/DisarmAction.cs @@ -13,6 +13,7 @@ using Content.Shared.Audio; using Content.Shared.Cooldown; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs index 7a16d6872f..f63195d412 100644 --- a/Content.Server/Administration/Managers/AdminManager.cs +++ b/Content.Server/Administration/Managers/AdminManager.cs @@ -10,6 +10,7 @@ using Content.Server.Players; using Content.Shared; using Content.Shared.Administration; using Content.Shared.Administration.Menu; +using Content.Shared.CCVar; using Robust.Server.Console; using Robust.Server.Player; using Robust.Shared.Configuration; diff --git a/Content.Server/Body/Mechanism/MechanismComponent.cs b/Content.Server/Body/Mechanism/MechanismComponent.cs index c5485900d1..82fdc15326 100644 --- a/Content.Server/Body/Mechanism/MechanismComponent.cs +++ b/Content.Server/Body/Mechanism/MechanismComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.Body.Part; using Content.Shared.Body.Surgery; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.GameObjects; diff --git a/Content.Server/Body/Part/BodyPartComponent.cs b/Content.Server/Body/Part/BodyPartComponent.cs index a2afc97e2d..1397012a5d 100644 --- a/Content.Server/Body/Part/BodyPartComponent.cs +++ b/Content.Server/Body/Part/BodyPartComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.Body.Part; using Content.Shared.Body.Surgery; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Random.Helpers; using Content.Shared.Verbs; using Robust.Server.Console; diff --git a/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs b/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs index 827b305ea2..edb8de8282 100644 --- a/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs +++ b/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs @@ -9,6 +9,7 @@ using Content.Shared.Body.Mechanism; using Content.Shared.Body.Part; using Content.Shared.Body.Surgery; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using static Content.Shared.Body.Surgery.ISurgeryData; diff --git a/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs index 23428eccc7..ff1939b081 100644 --- a/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs +++ b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs @@ -12,6 +12,7 @@ using Content.Shared.Body.Surgery; using Content.Shared.Interaction; using Content.Shared.NetIDs; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.GameObjects; diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs index a0022d46af..a7a1e28ae5 100644 --- a/Content.Server/Botany/Components/PlantHolderComponent.cs +++ b/Content.Server/Botany/Components/PlantHolderComponent.cs @@ -16,6 +16,7 @@ using Content.Shared.Chemistry.Solution.Components; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Random.Helpers; using Content.Shared.Tag; using Robust.Server.GameObjects; diff --git a/Content.Server/Botany/Components/SeedExtractorComponent.cs b/Content.Server/Botany/Components/SeedExtractorComponent.cs index 88b82e3bcb..8b0099fa71 100644 --- a/Content.Server/Botany/Components/SeedExtractorComponent.cs +++ b/Content.Server/Botany/Components/SeedExtractorComponent.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Content.Server.Power.Components; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/Botany/Seed.cs b/Content.Server/Botany/Seed.cs index ecb6c81a8b..b0043fdf78 100644 --- a/Content.Server/Botany/Seed.cs +++ b/Content.Server/Botany/Seed.cs @@ -7,6 +7,7 @@ using Content.Server.GameObjects.EntitySystems; using Content.Server.Plants; using Content.Shared.Atmos; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Random.Helpers; using Content.Shared.Tag; using Robust.Server.GameObjects; diff --git a/Content.Server/Buckle/Components/BuckleComponent.cs b/Content.Server/Buckle/Components/BuckleComponent.cs index 13c6a8184f..7ff1d3a3e4 100644 --- a/Content.Server/Buckle/Components/BuckleComponent.cs +++ b/Content.Server/Buckle/Components/BuckleComponent.cs @@ -12,6 +12,7 @@ using Content.Shared.Alert; using Content.Shared.Buckle.Components; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/Cabinet/ItemCabinetSystem.cs b/Content.Server/Cabinet/ItemCabinetSystem.cs index db63565aea..b0e49e0821 100644 --- a/Content.Server/Cabinet/ItemCabinetSystem.cs +++ b/Content.Server/Cabinet/ItemCabinetSystem.cs @@ -4,6 +4,7 @@ using Content.Shared.Audio; using Content.Shared.Cabinet; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; diff --git a/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs b/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs index 80a6873390..8096438fa2 100644 --- a/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs +++ b/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs @@ -4,6 +4,7 @@ using Content.Shared.CharacterAppearance; using Content.Shared.CharacterAppearance.Components; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Chat/Commands/SuicideCommand.cs b/Content.Server/Chat/Commands/SuicideCommand.cs index 7ad4b8b998..e3a82898e2 100644 --- a/Content.Server/Chat/Commands/SuicideCommand.cs +++ b/Content.Server/Chat/Commands/SuicideCommand.cs @@ -11,6 +11,7 @@ using Content.Server.Players; using Content.Shared.Damage; using Content.Shared.Damage.Components; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.Enums; diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index ef884c9e2d..68fca92a0b 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -11,9 +11,11 @@ using Content.Server.Radio.EntitySystems; using Content.Shared; using Content.Shared.ActionBlocker; using Content.Shared.Administration; +using Content.Shared.CCVar; using Content.Shared.Chat; using Content.Shared.Inventory; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.Configuration; diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs index f187fb111f..499b49a70d 100644 --- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs +++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs @@ -13,6 +13,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Solution; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Random.Helpers; using Content.Shared.Verbs; using Robust.Server.GameObjects; diff --git a/Content.Server/Chemistry/Components/HyposprayComponent.cs b/Content.Server/Chemistry/Components/HyposprayComponent.cs index a8bc5f32db..384f7186a8 100644 --- a/Content.Server/Chemistry/Components/HyposprayComponent.cs +++ b/Content.Server/Chemistry/Components/HyposprayComponent.cs @@ -5,6 +5,7 @@ using Content.Shared.Chemistry; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Chemistry/Components/InjectorComponent.cs b/Content.Server/Chemistry/Components/InjectorComponent.cs index 49628289d5..3d1a22d835 100644 --- a/Content.Server/Chemistry/Components/InjectorComponent.cs +++ b/Content.Server/Chemistry/Components/InjectorComponent.cs @@ -9,6 +9,7 @@ using Content.Shared.Chemistry.Solution.Components; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Players; diff --git a/Content.Server/Chemistry/Components/PillComponent.cs b/Content.Server/Chemistry/Components/PillComponent.cs index ab78e823b1..ff3fd642f9 100644 --- a/Content.Server/Chemistry/Components/PillComponent.cs +++ b/Content.Server/Chemistry/Components/PillComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs index 50ab14f1a7..5b85dd799d 100644 --- a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs +++ b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs @@ -14,6 +14,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Solution; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using JetBrains.Annotations; using Robust.Server.GameObjects; diff --git a/Content.Server/Chemistry/Components/SolutionTransferComponent.cs b/Content.Server/Chemistry/Components/SolutionTransferComponent.cs index 00e31ab7d5..54ccb883b6 100644 --- a/Content.Server/Chemistry/Components/SolutionTransferComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionTransferComponent.cs @@ -5,6 +5,7 @@ using Content.Shared.Chemistry.Solution.Components; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Climbing/Components/ClimbableComponent.cs b/Content.Server/Climbing/Components/ClimbableComponent.cs index 3e13d67ac2..562a6b40bc 100644 --- a/Content.Server/Climbing/Components/ClimbableComponent.cs +++ b/Content.Server/Climbing/Components/ClimbableComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.Climbing; using Content.Shared.DragDrop; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Cloning/Components/CloningPodComponent.cs b/Content.Server/Cloning/Components/CloningPodComponent.cs index 331d52359a..6ea991f200 100644 --- a/Content.Server/Cloning/Components/CloningPodComponent.cs +++ b/Content.Server/Cloning/Components/CloningPodComponent.cs @@ -7,6 +7,7 @@ using Content.Server.UserInterface; using Content.Shared.Cloning; using Content.Shared.MobState; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.Containers; diff --git a/Content.Server/Clothing/Components/ClothingComponent.cs b/Content.Server/Clothing/Components/ClothingComponent.cs index 25c26d10a3..a3281287f4 100644 --- a/Content.Server/Clothing/Components/ClothingComponent.cs +++ b/Content.Server/Clothing/Components/ClothingComponent.cs @@ -6,6 +6,7 @@ using Content.Shared.Interaction; using Content.Shared.Item; using Content.Shared.NetIDs; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.GameObjects; using Robust.Shared.Players; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs index e4067f0ba9..bbc1382935 100644 --- a/Content.Server/Connection/ConnectionManager.cs +++ b/Content.Server/Connection/ConnectionManager.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Content.Server.Database; using Content.Server.Preferences.Managers; using Content.Shared; +using Content.Shared.CCVar; using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Network; diff --git a/Content.Server/Construction/Completions/PopupUser.cs b/Content.Server/Construction/Completions/PopupUser.cs index 94f80ec320..026de3f7b0 100644 --- a/Content.Server/Construction/Completions/PopupUser.cs +++ b/Content.Server/Construction/Completions/PopupUser.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Content.Shared.Construction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Construction/Components/ConstructionComponent.Verbs.cs b/Content.Server/Construction/Components/ConstructionComponent.Verbs.cs index 5e209521e6..1a6f9d5b8c 100644 --- a/Content.Server/Construction/Components/ConstructionComponent.Verbs.cs +++ b/Content.Server/Construction/Components/ConstructionComponent.Verbs.cs @@ -1,5 +1,6 @@ using Content.Shared.ActionBlocker; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Construction/ConstructionSystem.cs b/Content.Server/Construction/ConstructionSystem.cs index 97860e7975..e173305795 100644 --- a/Content.Server/Construction/ConstructionSystem.cs +++ b/Content.Server/Construction/ConstructionSystem.cs @@ -17,6 +17,7 @@ using Content.Shared.Construction.Steps; using Content.Shared.Coordinates; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using JetBrains.Annotations; using Robust.Shared.Containers; using Robust.Shared.GameObjects; diff --git a/Content.Server/Crayon/CrayonComponent.cs b/Content.Server/Crayon/CrayonComponent.cs index e629a761b9..2f458aba1d 100644 --- a/Content.Server/Crayon/CrayonComponent.cs +++ b/Content.Server/Crayon/CrayonComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.DragDrop; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; diff --git a/Content.Server/Cuffs/Components/CuffableComponent.cs b/Content.Server/Cuffs/Components/CuffableComponent.cs index 65a569f687..3112dcb9b9 100644 --- a/Content.Server/Cuffs/Components/CuffableComponent.cs +++ b/Content.Server/Cuffs/Components/CuffableComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Alert; using Content.Shared.Cuffs.Components; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/Cuffs/Components/HandcuffComponent.cs b/Content.Server/Cuffs/Components/HandcuffComponent.cs index fadaddca3b..f0003e97d5 100644 --- a/Content.Server/Cuffs/Components/HandcuffComponent.cs +++ b/Content.Server/Cuffs/Components/HandcuffComponent.cs @@ -9,6 +9,7 @@ using Content.Shared.Cuffs.Components; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs index e79c5bb66e..3618aec44e 100644 --- a/Content.Server/Database/ServerDbManager.cs +++ b/Content.Server/Database/ServerDbManager.cs @@ -6,6 +6,7 @@ using System.Net; using System.Threading; using System.Threading.Tasks; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.Preferences; using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs index d1bb9f07e4..6cc58614ac 100644 --- a/Content.Server/Database/ServerDbSqlite.cs +++ b/Content.Server/Database/ServerDbSqlite.cs @@ -10,6 +10,7 @@ using Content.Server.IP; using Content.Server.Preferences; using Content.Server.Preferences.Managers; using Content.Shared; +using Content.Shared.CCVar; using Microsoft.EntityFrameworkCore; using Robust.Shared.Configuration; using Robust.Shared.IoC; diff --git a/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs b/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs index c0c157cec0..8ff3e7cabd 100644 --- a/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs +++ b/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs @@ -22,6 +22,7 @@ using Content.Shared.Disposal.Components; using Content.Shared.DragDrop; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs index 4ab7856da7..e5450d1f9c 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs @@ -8,6 +8,7 @@ using Content.Server.UserInterface; using Content.Shared.ActionBlocker; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Server.Console; using Robust.Server.GameObjects; diff --git a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs index b6ff0b2528..0f4aad0d48 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs @@ -5,6 +5,7 @@ using Content.Server.UserInterface; using Content.Shared.ActionBlocker; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Server.Console; using Robust.Server.GameObjects; diff --git a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs index 0f18584b37..660baf69eb 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs @@ -6,6 +6,7 @@ using Content.Server.Disposal.Unit.Components; using Content.Shared.Acts; using Content.Shared.Disposal.Components; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Server.Console; using Robust.Server.GameObjects; diff --git a/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs b/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs index 00d370a86b..4df838bd9a 100644 --- a/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs +++ b/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs @@ -19,6 +19,7 @@ using Content.Shared.Disposal.Components; using Content.Shared.DragDrop; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Throwing; using Content.Shared.Verbs; using Robust.Server.GameObjects; diff --git a/Content.Server/Doors/Components/AirlockComponent.cs b/Content.Server/Doors/Components/AirlockComponent.cs index f95053c256..3072c99085 100644 --- a/Content.Server/Doors/Components/AirlockComponent.cs +++ b/Content.Server/Doors/Components/AirlockComponent.cs @@ -7,6 +7,7 @@ using Content.Server.Wires.Components; using Content.Shared.Doors; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; diff --git a/Content.Server/EntryPoint/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs similarity index 99% rename from Content.Server/EntryPoint/EntryPoint.cs rename to Content.Server/Entry/EntryPoint.cs index 35dd8a6318..31500cd8e8 100644 --- a/Content.Server/EntryPoint/EntryPoint.cs +++ b/Content.Server/Entry/EntryPoint.cs @@ -27,7 +27,7 @@ using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Timing; -namespace Content.Server.EntryPoint +namespace Content.Server.Entry { public class EntryPoint : GameServer { diff --git a/Content.Server/EntryPoint/IgnoredComponents.cs b/Content.Server/Entry/IgnoredComponents.cs similarity index 94% rename from Content.Server/EntryPoint/IgnoredComponents.cs rename to Content.Server/Entry/IgnoredComponents.cs index ecd4cce0f7..0670b50806 100644 --- a/Content.Server/EntryPoint/IgnoredComponents.cs +++ b/Content.Server/Entry/IgnoredComponents.cs @@ -1,5 +1,5 @@ // ReSharper disable ArrangeTrailingCommaInMultilineLists -namespace Content.Server.EntryPoint +namespace Content.Server.Entry { public static class IgnoredComponents { diff --git a/Content.Server/Extinguisher/FireExtinguisherComponent.cs b/Content.Server/Extinguisher/FireExtinguisherComponent.cs index 309a1f7754..15eb150b60 100644 --- a/Content.Server/Extinguisher/FireExtinguisherComponent.cs +++ b/Content.Server/Extinguisher/FireExtinguisherComponent.cs @@ -4,6 +4,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Solution.Components; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs index c7204ab13c..80995e48a3 100644 --- a/Content.Server/Flash/FlashSystem.cs +++ b/Content.Server/Flash/FlashSystem.cs @@ -4,6 +4,7 @@ using Content.Server.Weapon.Melee; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; diff --git a/Content.Server/Fluids/Components/BucketComponent.cs b/Content.Server/Fluids/Components/BucketComponent.cs index d98c35139b..c35b374f1b 100644 --- a/Content.Server/Fluids/Components/BucketComponent.cs +++ b/Content.Server/Fluids/Components/BucketComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Fluids/Components/MopComponent.cs b/Content.Server/Fluids/Components/MopComponent.cs index 72dbcf2327..c39b1faca3 100644 --- a/Content.Server/Fluids/Components/MopComponent.cs +++ b/Content.Server/Fluids/Components/MopComponent.cs @@ -6,6 +6,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Fluids/Components/SpillableComponent.cs b/Content.Server/Fluids/Components/SpillableComponent.cs index a8b1a7ac43..d32cebdf8d 100644 --- a/Content.Server/Fluids/Components/SpillableComponent.cs +++ b/Content.Server/Fluids/Components/SpillableComponent.cs @@ -3,6 +3,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Solution.Components; using Content.Shared.DragDrop; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Fluids/Components/SprayComponent.cs b/Content.Server/Fluids/Components/SprayComponent.cs index 8f41632a2a..45dd21b2da 100644 --- a/Content.Server/Fluids/Components/SprayComponent.cs +++ b/Content.Server/Fluids/Components/SprayComponent.cs @@ -9,6 +9,7 @@ using Content.Shared.DragDrop; using Content.Shared.Fluids; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Vapor; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs b/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs index 6d1afa9b3d..fafe18aaaa 100644 --- a/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs @@ -7,6 +7,7 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.Doors; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.Localization; namespace Content.Server.GameObjects.Components.Atmos diff --git a/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs b/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs index bb0f511faf..318f13206b 100644 --- a/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs @@ -14,6 +14,7 @@ using Content.Shared.Damage.Components; using Content.Shared.GameObjects.Components.Atmos; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Temperature; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs b/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs index 5fa19d74f9..fbb4790a35 100644 --- a/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs @@ -11,6 +11,7 @@ using Content.Shared.GameObjects.Components.Atmos; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/EntitySystems/Atmos/AtmosDebugOverlaySystem.cs b/Content.Server/GameObjects/EntitySystems/Atmos/AtmosDebugOverlaySystem.cs index f555c6c25a..e5dcd19ed1 100644 --- a/Content.Server/GameObjects/EntitySystems/Atmos/AtmosDebugOverlaySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Atmos/AtmosDebugOverlaySystem.cs @@ -4,6 +4,7 @@ using Content.Server.GameObjects.Components.Atmos; using Content.Server.Atmos; using Content.Shared; using Content.Shared.Atmos; +using Content.Shared.CCVar; using Content.Shared.GameObjects.EntitySystems.Atmos; using JetBrains.Annotations; using Robust.Server.Player; diff --git a/Content.Server/GameObjects/EntitySystems/Atmos/GasTileOverlaySystem.cs b/Content.Server/GameObjects/EntitySystems/Atmos/GasTileOverlaySystem.cs index 4d05c10588..01b5d67c9a 100644 --- a/Content.Server/GameObjects/EntitySystems/Atmos/GasTileOverlaySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Atmos/GasTileOverlaySystem.cs @@ -6,6 +6,7 @@ using System.Runtime.CompilerServices; using Content.Server.GameObjects.Components.Atmos; using Content.Shared; using Content.Shared.Atmos; +using Content.Shared.CCVar; using Content.Shared.GameObjects.EntitySystems.Atmos; using Content.Shared.GameTicking; using JetBrains.Annotations; diff --git a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs index 50137e559c..faf8734fd5 100644 --- a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs @@ -7,6 +7,7 @@ using Content.Server.Atmos.Reactions; using Content.Server.GameObjects.Components.Atmos; using Content.Shared; using Content.Shared.Atmos; +using Content.Shared.CCVar; using Content.Shared.GameObjects.EntitySystems.Atmos; using Content.Shared.Maps; using JetBrains.Annotations; diff --git a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs index d3787877a0..7af132be38 100644 --- a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs +++ b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs @@ -3,6 +3,7 @@ using System; using Content.Server.Administration; using Content.Shared; using Content.Shared.Administration; +using Content.Shared.CCVar; using Robust.Shared.Configuration; using Robust.Shared.Console; using Robust.Shared.IoC; diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 3c04ebce54..0574f599ac 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -24,6 +24,7 @@ using Content.Server.Spawners.Components; using Content.Server.Speech.Components; using Content.Shared; using Content.Shared.Audio; +using Content.Shared.CCVar; using Content.Shared.Chat; using Content.Shared.Coordinates; using Content.Shared.GameTicking; diff --git a/Content.Server/GameTicking/Presets/PresetSuspicion.cs b/Content.Server/GameTicking/Presets/PresetSuspicion.cs index 67489d954a..59d3a83ffc 100644 --- a/Content.Server/GameTicking/Presets/PresetSuspicion.cs +++ b/Content.Server/GameTicking/Presets/PresetSuspicion.cs @@ -8,6 +8,7 @@ using Content.Server.Players; using Content.Server.Suspicion; using Content.Server.Suspicion.Roles; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.Inventory; using Content.Shared.PDA; using Content.Shared.Roles; diff --git a/Content.Server/GameTicking/Presets/PresetTraitor.cs b/Content.Server/GameTicking/Presets/PresetTraitor.cs index 304de91e35..c551356612 100644 --- a/Content.Server/GameTicking/Presets/PresetTraitor.cs +++ b/Content.Server/GameTicking/Presets/PresetTraitor.cs @@ -10,6 +10,7 @@ using Content.Server.PDA; using Content.Server.Players; using Content.Server.Traitor; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.Dataset; using Content.Shared.Inventory; using Content.Shared.PDA; diff --git a/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs b/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs index 83eed2dda1..aab1512755 100644 --- a/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs +++ b/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs @@ -12,6 +12,7 @@ using Content.Server.Spawners.Components; using Content.Server.Traitor; using Content.Server.TraitorDeathMatch.Components; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.Damage; using Content.Shared.Damage.Components; using Content.Shared.Inventory; diff --git a/Content.Server/GameTicking/Rules/RuleDeathMatch.cs b/Content.Server/GameTicking/Rules/RuleDeathMatch.cs index 1f1f0a1d87..d87bf3ceb7 100644 --- a/Content.Server/GameTicking/Rules/RuleDeathMatch.cs +++ b/Content.Server/GameTicking/Rules/RuleDeathMatch.cs @@ -2,6 +2,7 @@ using System.Threading; using Content.Server.Chat.Managers; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.Damage; using Content.Shared.MobState; using Robust.Server.Player; diff --git a/Content.Server/GameTicking/Rules/RuleSuspicion.cs b/Content.Server/GameTicking/Rules/RuleSuspicion.cs index 6bed47bd8a..96f190f4d6 100644 --- a/Content.Server/GameTicking/Rules/RuleSuspicion.cs +++ b/Content.Server/GameTicking/Rules/RuleSuspicion.cs @@ -7,6 +7,7 @@ using Content.Server.Suspicion; using Content.Server.Suspicion.EntitySystems; using Content.Server.Suspicion.Roles; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.MobState; using Robust.Server.Player; using Robust.Shared.Audio; diff --git a/Content.Server/Hands/Components/HandsComponent.cs b/Content.Server/Hands/Components/HandsComponent.cs index 04e2f696b6..764cf561e9 100644 --- a/Content.Server/Hands/Components/HandsComponent.cs +++ b/Content.Server/Hands/Components/HandsComponent.cs @@ -13,6 +13,7 @@ using Content.Shared.Audio; using Content.Shared.Body.Part; using Content.Shared.Hands.Components; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Physics.Pull; using Content.Shared.Pulling.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/Hands/HandsSystem.cs b/Content.Server/Hands/HandsSystem.cs index 8bbf5ca41f..179d7c23a8 100644 --- a/Content.Server/Hands/HandsSystem.cs +++ b/Content.Server/Hands/HandsSystem.cs @@ -13,6 +13,7 @@ using Content.Shared.Input; using Content.Shared.Interaction; using Content.Shared.Movement.Components; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using JetBrains.Annotations; using Robust.Server.Player; using Robust.Shared.Containers; diff --git a/Content.Server/Holiday/HolidayManager.cs b/Content.Server/Holiday/HolidayManager.cs index f82bd40312..5fe12b523a 100644 --- a/Content.Server/Holiday/HolidayManager.cs +++ b/Content.Server/Holiday/HolidayManager.cs @@ -4,6 +4,7 @@ using Content.Server.Chat.Managers; using Content.Server.GameTicking; using Content.Server.Holiday.Interfaces; using Content.Shared; +using Content.Shared.CCVar; using Robust.Shared.Configuration; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Server/Instruments/InstrumentComponent.cs b/Content.Server/Instruments/InstrumentComponent.cs index a567b03ec9..9eaa37ec9a 100644 --- a/Content.Server/Instruments/InstrumentComponent.cs +++ b/Content.Server/Instruments/InstrumentComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Hands; using Content.Shared.Instruments; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Throwing; using Robust.Server.GameObjects; using Robust.Server.Player; diff --git a/Content.Server/Instruments/InstrumentSystem.cs b/Content.Server/Instruments/InstrumentSystem.cs index a26e0aeecc..f2149993fb 100644 --- a/Content.Server/Instruments/InstrumentSystem.cs +++ b/Content.Server/Instruments/InstrumentSystem.cs @@ -1,4 +1,5 @@ using Content.Shared; +using Content.Shared.CCVar; using JetBrains.Annotations; using Robust.Shared.Configuration; using Robust.Shared.GameObjects; diff --git a/Content.Server/Interaction/InRangeUnoccludedVerb.cs b/Content.Server/Interaction/InRangeUnoccludedVerb.cs index f5f1530688..6f47ff7a83 100644 --- a/Content.Server/Interaction/InRangeUnoccludedVerb.cs +++ b/Content.Server/Interaction/InRangeUnoccludedVerb.cs @@ -1,5 +1,6 @@ using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Server.Console; using Robust.Server.GameObjects; diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs index 5ede40ca4c..9743761e50 100644 --- a/Content.Server/Interaction/InteractionSystem.cs +++ b/Content.Server/Interaction/InteractionSystem.cs @@ -17,6 +17,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Inventory; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Rotatable; using Content.Shared.Throwing; using Content.Shared.Weapons.Melee; diff --git a/Content.Server/Inventory/Components/DebugEquipComponent.cs b/Content.Server/Inventory/Components/DebugEquipComponent.cs index e2f91ddae3..5fe20dd515 100644 --- a/Content.Server/Inventory/Components/DebugEquipComponent.cs +++ b/Content.Server/Inventory/Components/DebugEquipComponent.cs @@ -1,6 +1,7 @@ using Content.Shared.Hands; using Content.Shared.Inventory; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.GameObjects; namespace Content.Server.Inventory.Components diff --git a/Content.Server/Inventory/Components/InventoryComponent.cs b/Content.Server/Inventory/Components/InventoryComponent.cs index f321243b50..cddbd60f79 100644 --- a/Content.Server/Inventory/Components/InventoryComponent.cs +++ b/Content.Server/Inventory/Components/InventoryComponent.cs @@ -15,6 +15,7 @@ using Content.Shared.EffectBlocker; using Content.Shared.Inventory; using Content.Shared.Movement.Components; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Server.Console; using Robust.Server.GameObjects; diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs index 612aeaf2d2..66782d5f8e 100644 --- a/Content.Server/IoC/ServerContentIoC.cs +++ b/Content.Server/IoC/ServerContentIoC.cs @@ -28,6 +28,7 @@ using Content.Shared.Alert; using Content.Shared.Kitchen; using Content.Shared.Module; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.IoC; namespace Content.Server.IoC diff --git a/Content.Server/IoC/ServerModuleTestingCallbacks.cs b/Content.Server/IoC/ServerModuleTestingCallbacks.cs index de9cf838e4..445519b224 100644 --- a/Content.Server/IoC/ServerModuleTestingCallbacks.cs +++ b/Content.Server/IoC/ServerModuleTestingCallbacks.cs @@ -1,5 +1,6 @@ using System; using Content.Shared; +using Content.Shared.Module; namespace Content.Server.IoC { diff --git a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs index 43c8bc717a..4403a12c4f 100644 --- a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs +++ b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Interaction; using Content.Shared.Kitchen.Components; using Content.Shared.MobState; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Nutrition.Components; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs index a90b26a978..e69389637a 100644 --- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs +++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs @@ -21,6 +21,7 @@ using Content.Shared.Interaction; using Content.Shared.Kitchen; using Content.Shared.Kitchen.Components; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Power; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs index 38d5f2ec42..1e49397ecf 100644 --- a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs +++ b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs @@ -11,6 +11,7 @@ using Content.Shared.Chemistry.Solution; using Content.Shared.Interaction; using Content.Shared.Kitchen.Components; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Random.Helpers; using Content.Shared.Tag; using Robust.Server.GameObjects; diff --git a/Content.Server/Light/Components/HandheldLightComponent.cs b/Content.Server/Light/Components/HandheldLightComponent.cs index 5aee7b75dd..b1fe18ea89 100644 --- a/Content.Server/Light/Components/HandheldLightComponent.cs +++ b/Content.Server/Light/Components/HandheldLightComponent.cs @@ -11,6 +11,7 @@ using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Light.Component; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Rounding; using Content.Shared.Verbs; using JetBrains.Annotations; diff --git a/Content.Server/Light/Components/LightReplacerComponent.cs b/Content.Server/Light/Components/LightReplacerComponent.cs index 9a7fca1f9b..21a4044f7a 100644 --- a/Content.Server/Light/Components/LightReplacerComponent.cs +++ b/Content.Server/Light/Components/LightReplacerComponent.cs @@ -5,6 +5,7 @@ using System.Linq; using Content.Server.Storage.Components; using Content.Shared.NetIDs; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Containers; diff --git a/Content.Server/Light/Components/PoweredLightComponent.cs b/Content.Server/Light/Components/PoweredLightComponent.cs index 33fabefb27..e08cc21203 100644 --- a/Content.Server/Light/Components/PoweredLightComponent.cs +++ b/Content.Server/Light/Components/PoweredLightComponent.cs @@ -14,6 +14,7 @@ using Content.Shared.Damage.Components; using Content.Shared.Interaction; using Content.Shared.Light; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Containers; diff --git a/Content.Server/MachineLinking/Components/SignalButtonComponent.cs b/Content.Server/MachineLinking/Components/SignalButtonComponent.cs index 2b83e50b67..792377266c 100644 --- a/Content.Server/MachineLinking/Components/SignalButtonComponent.cs +++ b/Content.Server/MachineLinking/Components/SignalButtonComponent.cs @@ -1,6 +1,7 @@ using Content.Server.MachineLinking.Signals; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/MachineLinking/Components/SignalReceiverComponent.cs b/Content.Server/MachineLinking/Components/SignalReceiverComponent.cs index 127f05f578..164a979805 100644 --- a/Content.Server/MachineLinking/Components/SignalReceiverComponent.cs +++ b/Content.Server/MachineLinking/Components/SignalReceiverComponent.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Content.Server.Tools.Components; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Tool; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs b/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs index 202b031e1e..da6c1539a1 100644 --- a/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs +++ b/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs @@ -2,6 +2,7 @@ using Content.Shared.Interaction; using Content.Shared.MachineLinking; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; diff --git a/Content.Server/MachineLinking/Components/SignalTransmitterComponent.cs b/Content.Server/MachineLinking/Components/SignalTransmitterComponent.cs index 2c8a184f12..19225aafe4 100644 --- a/Content.Server/MachineLinking/Components/SignalTransmitterComponent.cs +++ b/Content.Server/MachineLinking/Components/SignalTransmitterComponent.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Content.Server.Tools.Components; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Tool; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs b/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs index 39c796786f..963486fdc7 100644 --- a/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs +++ b/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs @@ -2,6 +2,7 @@ using Content.Shared.Interaction; using Content.Shared.MachineLinking; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Medical/Components/MedicalScannerComponent.cs b/Content.Server/Medical/Components/MedicalScannerComponent.cs index a2e405a1d1..b6db43289d 100644 --- a/Content.Server/Medical/Components/MedicalScannerComponent.cs +++ b/Content.Server/Medical/Components/MedicalScannerComponent.cs @@ -15,6 +15,7 @@ using Content.Shared.Interaction; using Content.Shared.MedicalScanner; using Content.Shared.MobState; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Preferences; using Content.Shared.Verbs; using Robust.Server.GameObjects; diff --git a/Content.Server/Metabolism/MetabolismComponent.cs b/Content.Server/Metabolism/MetabolismComponent.cs index 9d2d5b1a70..b6d25f2bf6 100644 --- a/Content.Server/Metabolism/MetabolismComponent.cs +++ b/Content.Server/Metabolism/MetabolismComponent.cs @@ -15,6 +15,7 @@ using Content.Shared.Damage; using Content.Shared.Damage.Components; using Content.Shared.MobState; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/MoMMI/MoMMILink.cs b/Content.Server/MoMMI/MoMMILink.cs index 02ac3bf196..1228c95dc6 100644 --- a/Content.Server/MoMMI/MoMMILink.cs +++ b/Content.Server/MoMMI/MoMMILink.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using Content.Server.Chat.Managers; using Content.Shared; +using Content.Shared.CCVar; using Newtonsoft.Json; using Robust.Server.ServerStatus; using Robust.Shared.Asynchronous; diff --git a/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs index f0bf3628c4..0d80fcc8ab 100644 --- a/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs @@ -11,6 +11,7 @@ using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Morgue; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Server.GameObjects; using Robust.Shared.Containers; diff --git a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs index 68d7e0d0bc..5c1ca7e936 100644 --- a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs @@ -11,6 +11,7 @@ using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Morgue; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Standing; using Content.Shared.Verbs; using Robust.Server.Player; diff --git a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs index 71d908d895..6aee6efc9a 100644 --- a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Morgue; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Physics; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/Notification/Managers/IServerNotifyManager.cs b/Content.Server/Notification/Managers/IServerNotifyManager.cs index 76548ebcf5..5b2307e00e 100644 --- a/Content.Server/Notification/Managers/IServerNotifyManager.cs +++ b/Content.Server/Notification/Managers/IServerNotifyManager.cs @@ -1,4 +1,5 @@ using Content.Shared.Notification; +using Content.Shared.Notification.Managers; namespace Content.Server.Notification.Managers { diff --git a/Content.Server/Notification/Managers/ServerNotifyManager.cs b/Content.Server/Notification/Managers/ServerNotifyManager.cs index cb4aeb3729..be4b012b9d 100644 --- a/Content.Server/Notification/Managers/ServerNotifyManager.cs +++ b/Content.Server/Notification/Managers/ServerNotifyManager.cs @@ -1,4 +1,6 @@ using Content.Shared; +using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Notification/NotifyExtensions.cs b/Content.Server/Notification/NotifyExtensions.cs index ca6b3f713c..685885a09b 100644 --- a/Content.Server/Notification/NotifyExtensions.cs +++ b/Content.Server/Notification/NotifyExtensions.cs @@ -1,4 +1,5 @@ using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.Player; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Notification/PopupMsgCommand.cs b/Content.Server/Notification/PopupMsgCommand.cs index 63239ae9cd..212e7adca6 100644 --- a/Content.Server/Notification/PopupMsgCommand.cs +++ b/Content.Server/Notification/PopupMsgCommand.cs @@ -1,6 +1,7 @@ using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.Console; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Nutrition/Components/CreamPiedComponent.cs b/Content.Server/Nutrition/Components/CreamPiedComponent.cs index dd77efe25e..cefd0250da 100644 --- a/Content.Server/Nutrition/Components/CreamPiedComponent.cs +++ b/Content.Server/Nutrition/Components/CreamPiedComponent.cs @@ -1,6 +1,7 @@ using Content.Server.Notification; using Content.Server.Stunnable.Components; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Nutrition.Components; using Content.Shared.Throwing; using Robust.Server.GameObjects; diff --git a/Content.Server/Nutrition/Components/DrinkComponent.cs b/Content.Server/Nutrition/Components/DrinkComponent.cs index 4ebe9a4f51..42f3da43d0 100644 --- a/Content.Server/Nutrition/Components/DrinkComponent.cs +++ b/Content.Server/Nutrition/Components/DrinkComponent.cs @@ -13,6 +13,7 @@ using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Nutrition.Components; using Content.Shared.Throwing; using JetBrains.Annotations; diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs index 64376386d6..7b285ec805 100644 --- a/Content.Server/Nutrition/Components/FoodComponent.cs +++ b/Content.Server/Nutrition/Components/FoodComponent.cs @@ -12,6 +12,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/PDA/PDAComponent.cs b/Content.Server/PDA/PDAComponent.cs index 941078f034..f4bddd439f 100644 --- a/Content.Server/PDA/PDAComponent.cs +++ b/Content.Server/PDA/PDAComponent.cs @@ -12,6 +12,7 @@ using Content.Server.UserInterface; using Content.Shared.ActionBlocker; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.PDA; using Content.Shared.Tag; using Content.Shared.Verbs; diff --git a/Content.Server/Plants/Components/PottedPlantHideComponent.cs b/Content.Server/Plants/Components/PottedPlantHideComponent.cs index 3a75cbab75..485c5d4699 100644 --- a/Content.Server/Plants/Components/PottedPlantHideComponent.cs +++ b/Content.Server/Plants/Components/PottedPlantHideComponent.cs @@ -3,6 +3,7 @@ using Content.Server.Storage.Components; using Content.Shared.Audio; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs index 51bf6994aa..0fa783f264 100644 --- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs +++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs @@ -9,6 +9,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Input; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Server.Player; diff --git a/Content.Server/Power/Components/BaseCharger.cs b/Content.Server/Power/Components/BaseCharger.cs index 156d158aee..71be0a02dd 100644 --- a/Content.Server/Power/Components/BaseCharger.cs +++ b/Content.Server/Power/Components/BaseCharger.cs @@ -8,6 +8,7 @@ using Content.Server.Weapon.Ranged.Barrels.Components; using Content.Shared.ActionBlocker; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Power; using Content.Shared.Verbs; using Robust.Server.GameObjects; diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs index a089f01aba..7412d1c36e 100644 --- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs +++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Content.Server.Database; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.Preferences; using Content.Shared.Roles; using Robust.Server.Player; diff --git a/Content.Server/RCD/Components/RCDAmmoComponent.cs b/Content.Server/RCD/Components/RCDAmmoComponent.cs index 605cfe6bfa..29c7d36c8d 100644 --- a/Content.Server/RCD/Components/RCDAmmoComponent.cs +++ b/Content.Server/RCD/Components/RCDAmmoComponent.cs @@ -4,6 +4,7 @@ using Content.Server.Hands.Components; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/RCD/Components/RCDComponent.cs b/Content.Server/RCD/Components/RCDComponent.cs index eae80da66b..b1c95b5b54 100644 --- a/Content.Server/RCD/Components/RCDComponent.cs +++ b/Content.Server/RCD/Components/RCDComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Maps; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; diff --git a/Content.Server/Radio/Components/HandheldRadioComponent.cs b/Content.Server/Radio/Components/HandheldRadioComponent.cs index 0c06afb81e..bcb4ca1bd6 100644 --- a/Content.Server/Radio/Components/HandheldRadioComponent.cs +++ b/Content.Server/Radio/Components/HandheldRadioComponent.cs @@ -4,6 +4,7 @@ using Content.Server.Radio.EntitySystems; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/Recycling/Components/RecyclerComponent.cs b/Content.Server/Recycling/Components/RecyclerComponent.cs index 55caa74127..82b543ac5b 100644 --- a/Content.Server/Recycling/Components/RecyclerComponent.cs +++ b/Content.Server/Recycling/Components/RecyclerComponent.cs @@ -10,6 +10,7 @@ using Content.Server.Players; using Content.Server.Power.Components; using Content.Shared.Body.Components; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Recycling; using Robust.Server.GameObjects; using Robust.Server.Player; diff --git a/Content.Server/Repairable/RepairableComponent.cs b/Content.Server/Repairable/RepairableComponent.cs index 59befd3793..cc0b28bd25 100644 --- a/Content.Server/Repairable/RepairableComponent.cs +++ b/Content.Server/Repairable/RepairableComponent.cs @@ -4,6 +4,7 @@ using Content.Server.Tools.Components; using Content.Shared.Damage.Components; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Tool; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Rotation/Components/FlippableComponent.cs b/Content.Server/Rotation/Components/FlippableComponent.cs index 69a5f6a998..f1b11e1cee 100644 --- a/Content.Server/Rotation/Components/FlippableComponent.cs +++ b/Content.Server/Rotation/Components/FlippableComponent.cs @@ -1,6 +1,7 @@ #nullable enable using Content.Shared.ActionBlocker; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Rotation/Components/RotatableComponent.cs b/Content.Server/Rotation/Components/RotatableComponent.cs index de94373d52..5c91279a54 100644 --- a/Content.Server/Rotation/Components/RotatableComponent.cs +++ b/Content.Server/Rotation/Components/RotatableComponent.cs @@ -1,6 +1,7 @@ #nullable enable using Content.Shared.ActionBlocker; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Rotatable; using Content.Shared.Verbs; using Robust.Shared.GameObjects; diff --git a/Content.Server/Singularity/Components/EmitterComponent.cs b/Content.Server/Singularity/Components/EmitterComponent.cs index be562c4d22..0a34f6b09b 100644 --- a/Content.Server/Singularity/Components/EmitterComponent.cs +++ b/Content.Server/Singularity/Components/EmitterComponent.cs @@ -8,6 +8,7 @@ using Content.Server.Projectiles.Components; using Content.Shared.Audio; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Singularity.Components; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs index 90f7ca57e5..31c4413f58 100644 --- a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs +++ b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs @@ -4,6 +4,7 @@ using Content.Server.Battery.Components; using Content.Server.Power.Components; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Radiation; using Content.Shared.Singularity.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs index 18af48a271..a81bbecffb 100644 --- a/Content.Server/Stack/StackSystem.cs +++ b/Content.Server/Stack/StackSystem.cs @@ -1,6 +1,7 @@ using System; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Stacks; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/StationEvents/StationEventSystem.cs b/Content.Server/StationEvents/StationEventSystem.cs index 535c45281f..b38dbb62cb 100644 --- a/Content.Server/StationEvents/StationEventSystem.cs +++ b/Content.Server/StationEvents/StationEventSystem.cs @@ -6,6 +6,7 @@ using System.Text; using Content.Server.GameTicking; using Content.Server.StationEvents.Events; using Content.Shared; +using Content.Shared.CCVar; using Content.Shared.GameTicking; using Content.Shared.StationEvents; using JetBrains.Annotations; diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs index 09ea579722..55f7ca3c51 100644 --- a/Content.Server/Storage/Components/EntityStorageComponent.cs +++ b/Content.Server/Storage/Components/EntityStorageComponent.cs @@ -11,6 +11,7 @@ using Content.Shared.Body.Components; using Content.Shared.Interaction; using Content.Shared.Item; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Physics; using Content.Shared.Storage; using Content.Shared.Tool; diff --git a/Content.Server/Storage/Components/SecretStashComponent.cs b/Content.Server/Storage/Components/SecretStashComponent.cs index 224fdbc7b6..ba786ab793 100644 --- a/Content.Server/Storage/Components/SecretStashComponent.cs +++ b/Content.Server/Storage/Components/SecretStashComponent.cs @@ -4,6 +4,7 @@ using Content.Server.Items; using Content.Shared.Acts; using Content.Shared.Item; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Storage/Components/SecureEntityStorageComponent.cs b/Content.Server/Storage/Components/SecureEntityStorageComponent.cs index e3e2333959..0f01a44ed7 100644 --- a/Content.Server/Storage/Components/SecureEntityStorageComponent.cs +++ b/Content.Server/Storage/Components/SecureEntityStorageComponent.cs @@ -2,6 +2,7 @@ using Content.Server.Access.Components; using Content.Shared.ActionBlocker; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Storage; using Content.Shared.Verbs; using Robust.Server.GameObjects; diff --git a/Content.Server/Storage/Components/ServerStorageComponent.cs b/Content.Server/Storage/Components/ServerStorageComponent.cs index b6689861b2..1821841e8b 100644 --- a/Content.Server/Storage/Components/ServerStorageComponent.cs +++ b/Content.Server/Storage/Components/ServerStorageComponent.cs @@ -14,6 +14,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Item; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Storage; using Robust.Server.GameObjects; using Robust.Server.Player; diff --git a/Content.Server/Strip/StrippableComponent.cs b/Content.Server/Strip/StrippableComponent.cs index c856061d19..fb3ba9a38a 100644 --- a/Content.Server/Strip/StrippableComponent.cs +++ b/Content.Server/Strip/StrippableComponent.cs @@ -10,6 +10,7 @@ using Content.Server.UserInterface; using Content.Shared.ActionBlocker; using Content.Shared.DragDrop; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Strip.Components; using Content.Shared.Verbs; using Robust.Server.GameObjects; diff --git a/Content.Server/Stunnable/Components/StunnableComponent.cs b/Content.Server/Stunnable/Components/StunnableComponent.cs index 95a30f8ab6..61dc8e35cd 100644 --- a/Content.Server/Stunnable/Components/StunnableComponent.cs +++ b/Content.Server/Stunnable/Components/StunnableComponent.cs @@ -5,6 +5,7 @@ using Content.Server.Standing; using Content.Shared.Audio; using Content.Shared.MobState; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Stunnable; using Robust.Shared.Audio; using Robust.Shared.GameObjects; diff --git a/Content.Server/Stunnable/StunbatonSystem.cs b/Content.Server/Stunnable/StunbatonSystem.cs index 905b6e9f8b..95bd066ff5 100644 --- a/Content.Server/Stunnable/StunbatonSystem.cs +++ b/Content.Server/Stunnable/StunbatonSystem.cs @@ -8,6 +8,7 @@ using Content.Shared.Audio; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Throwing; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/Toilet/ToiletComponent.cs b/Content.Server/Toilet/ToiletComponent.cs index d1ea2dd99f..c96e35959d 100644 --- a/Content.Server/Toilet/ToiletComponent.cs +++ b/Content.Server/Toilet/ToiletComponent.cs @@ -12,6 +12,7 @@ using Content.Shared.Body.Part; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Toilet; using Content.Shared.Tool; using Robust.Server.GameObjects; diff --git a/Content.Server/Tools/Components/WelderComponent.cs b/Content.Server/Tools/Components/WelderComponent.cs index 3ad52d4619..fcb21158d3 100644 --- a/Content.Server/Tools/Components/WelderComponent.cs +++ b/Content.Server/Tools/Components/WelderComponent.cs @@ -15,6 +15,7 @@ using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.NetIDs; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Temperature; using Content.Shared.Tool; using Robust.Server.GameObjects; diff --git a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs index 4dd855db3b..42c0705485 100644 --- a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs +++ b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs @@ -6,6 +6,7 @@ using Content.Server.PDA; using Content.Shared.Interaction; using Content.Shared.Inventory; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Robust.Shared.GameObjects; using Robust.Shared.Localization; diff --git a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs index a1a5582bab..02a469a471 100644 --- a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs +++ b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using Content.Shared; +using Content.Shared.CCVar; using Robust.Server.Player; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs index 42799c0a6b..6de341f7b4 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs index 81da530c7c..c0a1c86f89 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs @@ -7,6 +7,7 @@ using Content.Server.Weapon.Ranged.Barrels.Components; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Server.GameObjects; using Robust.Shared.Containers; diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs index a54422e5c1..3bfbdd025a 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs @@ -5,6 +5,7 @@ using Content.Server.Items; using Content.Server.Weapon.Ranged.Barrels.Components; using Content.Shared.Interaction; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Server.GameObjects; using Robust.Shared.Containers; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs index 76b0f2fbf2..71d957829d 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs @@ -6,6 +6,7 @@ using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.NetIDs; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs index af8fa16f4e..db7b27e9ba 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs @@ -4,6 +4,7 @@ using Content.Server.Weapon.Ranged.Ammunition.Components; using Content.Shared.Interaction; using Content.Shared.NetIDs; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs index b9ebb29884..9f2a1433d0 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs @@ -5,6 +5,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Interaction; using Content.Shared.NetIDs; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs index 6266a8742d..ed7fe68fd8 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs @@ -9,6 +9,7 @@ using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.NetIDs; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Verbs; using Content.Shared.Weapons.Ranged; using Content.Shared.Weapons.Ranged.Barrels.Components; diff --git a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs index 9f8572c97e..b50d22e4fd 100644 --- a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs +++ b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Damage; using Content.Shared.Damage.Components; using Content.Shared.Hands; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.Audio; using Robust.Shared.GameObjects; diff --git a/Content.Server/Wires/Components/WiresComponent.cs b/Content.Server/Wires/Components/WiresComponent.cs index d872e11deb..a97137d1f2 100644 --- a/Content.Server/Wires/Components/WiresComponent.cs +++ b/Content.Server/Wires/Components/WiresComponent.cs @@ -11,6 +11,7 @@ using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Tool; using Content.Shared.Wires; using JetBrains.Annotations; diff --git a/Content.Shared/CCVars.cs b/Content.Shared/CCVar/CCVars.cs similarity index 99% rename from Content.Shared/CCVars.cs rename to Content.Shared/CCVar/CCVars.cs index 646c348bed..08e2378b55 100644 --- a/Content.Shared/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -2,7 +2,7 @@ using Robust.Shared; using Robust.Shared.Configuration; -namespace Content.Shared +namespace Content.Shared.CCVar { // ReSharper disable once InconsistentNaming [CVarDefs] diff --git a/Content.Shared/EntryPoint.cs b/Content.Shared/Entry/EntryPoint.cs similarity index 98% rename from Content.Shared/EntryPoint.cs rename to Content.Shared/Entry/EntryPoint.cs index 1cedeedf4e..b00bbb2832 100644 --- a/Content.Shared/EntryPoint.cs +++ b/Content.Shared/Entry/EntryPoint.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using Content.Shared.CharacterAppearance; -using Content.Shared.Chemistry; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; +using Content.Shared.IoC; using Content.Shared.Localizations; using Content.Shared.Maps; using Robust.Shared.ContentPack; @@ -13,7 +13,7 @@ using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Prototypes; -namespace Content.Shared +namespace Content.Shared.Entry { public class EntryPoint : GameShared { diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index 9bb6595578..d908454683 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -1,5 +1,6 @@ using System.Linq; using Content.Shared.Notification; +using Content.Shared.Notification.Managers; using Content.Shared.Physics; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/SharedContentIoC.cs b/Content.Shared/IoC/SharedContentIoC.cs similarity index 90% rename from Content.Shared/SharedContentIoC.cs rename to Content.Shared/IoC/SharedContentIoC.cs index abfac4b07d..cacd9c6102 100644 --- a/Content.Shared/SharedContentIoC.cs +++ b/Content.Shared/IoC/SharedContentIoC.cs @@ -1,7 +1,7 @@ using Content.Shared.CharacterAppearance; using Robust.Shared.IoC; -namespace Content.Shared +namespace Content.Shared.IoC { public static class SharedContentIoC { diff --git a/Content.Shared/SharedModuleTestingCallbacks.cs b/Content.Shared/Module/SharedModuleTestingCallbacks.cs similarity index 87% rename from Content.Shared/SharedModuleTestingCallbacks.cs rename to Content.Shared/Module/SharedModuleTestingCallbacks.cs index 70027bfc80..12074296e3 100644 --- a/Content.Shared/SharedModuleTestingCallbacks.cs +++ b/Content.Shared/Module/SharedModuleTestingCallbacks.cs @@ -2,7 +2,7 @@ using System; using Robust.Shared.ContentPack; -namespace Content.Shared +namespace Content.Shared.Module { public abstract class SharedModuleTestingCallbacks : ModuleTestingCallbacks { diff --git a/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs b/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs index c3c4d66c5d..8cf0f6cebf 100644 --- a/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs +++ b/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs @@ -1,5 +1,6 @@ #nullable enable using System; +using Content.Shared.CCVar; using Content.Shared.NetIDs; using Robust.Shared.Configuration; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Notification/ISharedNotifyManager.cs b/Content.Shared/Notification/Managers/ISharedNotifyManager.cs similarity index 98% rename from Content.Shared/Notification/ISharedNotifyManager.cs rename to Content.Shared/Notification/Managers/ISharedNotifyManager.cs index 330df93ed8..542bde46ed 100644 --- a/Content.Shared/Notification/ISharedNotifyManager.cs +++ b/Content.Shared/Notification/Managers/ISharedNotifyManager.cs @@ -2,7 +2,7 @@ using Robust.Shared.IoC; using Robust.Shared.Map; -namespace Content.Shared.Notification +namespace Content.Shared.Notification.Managers { /// /// Allows the ability to create floating text messages at locations in the world. diff --git a/Content.Shared/SharedNotifyManager.cs b/Content.Shared/Notification/Managers/SharedNotifyManager.cs similarity index 97% rename from Content.Shared/SharedNotifyManager.cs rename to Content.Shared/Notification/Managers/SharedNotifyManager.cs index 9964f18caf..7ae578ab7e 100644 --- a/Content.Shared/SharedNotifyManager.cs +++ b/Content.Shared/Notification/Managers/SharedNotifyManager.cs @@ -1,11 +1,10 @@ #nullable enable -using Content.Shared.Notification; using Lidgren.Network; using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Network; -namespace Content.Shared +namespace Content.Shared.Notification.Managers { public abstract class SharedNotifyManager : ISharedNotifyManager { diff --git a/Content.Shared/Physics/Controllers/SharedTileFrictionController.cs b/Content.Shared/Physics/Controllers/SharedTileFrictionController.cs index 46adc9f773..78f8b0511e 100644 --- a/Content.Shared/Physics/Controllers/SharedTileFrictionController.cs +++ b/Content.Shared/Physics/Controllers/SharedTileFrictionController.cs @@ -1,4 +1,5 @@ using System; +using Content.Shared.CCVar; using Content.Shared.Movement.Components; using JetBrains.Annotations; using Robust.Shared; diff --git a/Content.Tests/ContentUnitTest.cs b/Content.Tests/ContentUnitTest.cs index 0a3b1b58d8..16f9d4130b 100644 --- a/Content.Tests/ContentUnitTest.cs +++ b/Content.Tests/ContentUnitTest.cs @@ -5,8 +5,9 @@ using Content.Client.IoC; using Content.Server; using Content.Server.IoC; using Content.Shared; +using Content.Shared.IoC; using Robust.UnitTesting; -using EntryPoint = Content.Server.EntryPoint.EntryPoint; +using EntryPoint = Content.Server.Entry.EntryPoint; namespace Content.Tests { @@ -32,7 +33,7 @@ namespace Content.Tests { var l = new List { - typeof(Content.Shared.EntryPoint).Assembly + typeof(Content.Shared.Entry.EntryPoint).Assembly }; if (Project == UnitTestProject.Server) @@ -41,7 +42,7 @@ namespace Content.Tests } else if (Project == UnitTestProject.Client) { - l.Add(typeof(Content.Client.EntryPoint.EntryPoint).Assembly); + l.Add(typeof(Content.Client.Entry.EntryPoint).Assembly); } l.Add(typeof(ContentUnitTest).Assembly);