From 20fbb117a723745183aefa0d0e9d75710f85d769 Mon Sep 17 00:00:00 2001 From: null <56081759+NullWanderer@users.noreply.github.com> Date: Wed, 15 May 2024 19:56:18 +0200 Subject: [PATCH] Auto namespace cleanup for Delta/Nyano gamerules --- .../Tests/GameRules/FailAndStartPresetTest.cs | 2 +- .../Components/GlimmerMobRuleComponent.cs | 1 + .../PirateRadioSpawnRuleComponent.cs | 1 + .../Events/GlimmerMobSpawnRule.cs | 10 ++++++---- .../Events/PirateRadioSpawnRule.cs | 18 ++++++++---------- .../SophicScribe/SophicScribeSystem.cs | 1 + .../Components/FreeProberRuleComponent.cs | 1 + .../GlimmerRandomSentienceRuleComponent.cs | 1 + .../GlimmerRevenantSpawnRuleComponent.cs | 1 + .../Components/GlimmerWispRuleComponent.cs | 1 + .../Components/MassMindSwapRuleComponent.cs | 1 + .../Components/MidRoundAntagRuleComponent.cs | 1 + .../Components/NoosphericFryRuleComponent.cs | 1 + .../Components/NoosphericStormRuleComponent.cs | 1 + .../Components/NoosphericZapRuleComponent.cs | 1 + .../PsionicCatGotYourTongueRuleComponent.cs | 1 + .../StationEvents/Events/FreeProberRule.cs | 11 ++++++----- .../StationEvents/Events/GlimmerEventSystem.cs | 5 +++-- .../Events/GlimmerRandomSentienceRule.cs | 6 +++--- .../Events/GlimmerRevenantSpawnRule.cs | 7 ++++--- .../Events/GlimmerWispSpawnRule.cs | 11 ++++++----- .../StationEvents/Events/MassMindSwapRule.cs | 8 ++++---- .../StationEvents/Events/MidRoundAntagRule.cs | 6 ++++-- .../StationEvents/Events/NoosphericFryRule.cs | 13 +++++++------ .../Events/NoosphericStormRule.cs | 9 +++++---- .../StationEvents/Events/NoosphericZapRule.cs | 5 +++-- .../Events/PsionicCatGotYourTongueRule.cs | 13 +++++++------ .../Zombies/ZombieSystem.Transform.cs | 1 - 28 files changed, 80 insertions(+), 58 deletions(-) diff --git a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs index faaecc69ec..1fed226bee 100644 --- a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs @@ -1,7 +1,7 @@ #nullable enable using Content.Server.GameTicking; +using Content.Server.GameTicking.Components; using Content.Server.GameTicking.Presets; -using Content.Server.GameTicking.Rules.Components; using Content.Shared.CCVar; using Content.Shared.GameTicking; using Robust.Shared.GameObjects; diff --git a/Content.Server/DeltaV/StationEvents/Components/GlimmerMobRuleComponent.cs b/Content.Server/DeltaV/StationEvents/Components/GlimmerMobRuleComponent.cs index bde0422a1a..06f30a15f6 100644 --- a/Content.Server/DeltaV/StationEvents/Components/GlimmerMobRuleComponent.cs +++ b/Content.Server/DeltaV/StationEvents/Components/GlimmerMobRuleComponent.cs @@ -1,3 +1,4 @@ +using Content.Server.DeltaV.StationEvents.Events; using Content.Server.StationEvents.Events; using Robust.Shared.Prototypes; diff --git a/Content.Server/DeltaV/StationEvents/Components/PirateRadioSpawnRuleComponent.cs b/Content.Server/DeltaV/StationEvents/Components/PirateRadioSpawnRuleComponent.cs index 432fbfb4ac..07ea5425cf 100644 --- a/Content.Server/DeltaV/StationEvents/Components/PirateRadioSpawnRuleComponent.cs +++ b/Content.Server/DeltaV/StationEvents/Components/PirateRadioSpawnRuleComponent.cs @@ -4,6 +4,7 @@ * See AGPLv3.txt for details. */ +using Content.Server.DeltaV.StationEvents.Events; using Content.Server.StationEvents.Events; namespace Content.Server.StationEvents.Components; diff --git a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs index e7bb8c6d1b..e4fa15dbf7 100644 --- a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs +++ b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs @@ -1,13 +1,15 @@ using System.Linq; -using Robust.Shared.Random; -using Content.Server.GameTicking.Rules.Components; +using Content.Server.GameTicking.Components; using Content.Server.Psionics.Glimmer; +using Content.Server.StationEvents; using Content.Server.StationEvents.Components; -using Content.Shared.Psionics.Glimmer; +using Content.Server.StationEvents.Events; using Content.Shared.Abilities.Psionics; using Content.Shared.NPC.Components; +using Content.Shared.Psionics.Glimmer; +using Robust.Shared.Random; -namespace Content.Server.StationEvents.Events; +namespace Content.Server.DeltaV.StationEvents.Events; public sealed class GlimmerMobRule : StationEventSystem { diff --git a/Content.Server/DeltaV/StationEvents/Events/PirateRadioSpawnRule.cs b/Content.Server/DeltaV/StationEvents/Events/PirateRadioSpawnRule.cs index ba042d8966..6fad44d2c5 100644 --- a/Content.Server/DeltaV/StationEvents/Events/PirateRadioSpawnRule.cs +++ b/Content.Server/DeltaV/StationEvents/Events/PirateRadioSpawnRule.cs @@ -4,6 +4,13 @@ * See AGPLv3.txt for details. */ +using System.Linq; +using Content.Server.GameTicking.Components; +using Content.Server.Station.Components; +using Content.Server.StationEvents.Components; +using Content.Server.StationEvents.Events; +using Content.Shared.CCVar; +using Content.Shared.Salvage; using Robust.Server.GameObjects; using Robust.Server.Maps; using Robust.Shared.Configuration; @@ -11,17 +18,8 @@ using Robust.Shared.Map; using Robust.Shared.Map.Components; using Robust.Shared.Prototypes; using Robust.Shared.Random; -using Robust.Shared.Utility; -using Content.Server.GameTicking; -using Content.Server.GameTicking.Rules.Components; -using Content.Server.StationEvents.Components; -using Content.Server.Station.Components; -using Content.Shared.Salvage; -using Content.Shared.Random.Helpers; -using System.Linq; -using Content.Shared.CCVar; -namespace Content.Server.StationEvents.Events; +namespace Content.Server.DeltaV.StationEvents.Events; public sealed class PirateRadioSpawnRule : StationEventSystem { diff --git a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs index bc3c22cc35..ce6fe2b527 100644 --- a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs +++ b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs @@ -1,5 +1,6 @@ using Content.Server.Abilities.Psionics; using Content.Server.Chat.Systems; +using Content.Server.Nyanotrasen.StationEvents.Events; using Content.Server.Radio.Components; using Content.Server.Radio.EntitySystems; using Content.Server.StationEvents.Events; diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/FreeProberRuleComponent.cs b/Content.Server/Nyanotrasen/StationEvents/Components/FreeProberRuleComponent.cs index 1a23a49631..cbe9236d71 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Components/FreeProberRuleComponent.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Components/FreeProberRuleComponent.cs @@ -1,3 +1,4 @@ +using Content.Server.Nyanotrasen.StationEvents.Events; using Content.Server.StationEvents.Events; namespace Content.Server.StationEvents.Components; diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRandomSentienceRuleComponent.cs b/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRandomSentienceRuleComponent.cs index d8ada8699c..764cb807ba 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRandomSentienceRuleComponent.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRandomSentienceRuleComponent.cs @@ -1,3 +1,4 @@ +using Content.Server.Nyanotrasen.StationEvents.Events; using Content.Server.StationEvents.Events; namespace Content.Server.StationEvents.Components; diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRevenantSpawnRuleComponent.cs b/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRevenantSpawnRuleComponent.cs index c612ba617b..808daa5767 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRevenantSpawnRuleComponent.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRevenantSpawnRuleComponent.cs @@ -1,3 +1,4 @@ +using Content.Server.Nyanotrasen.StationEvents.Events; using Content.Server.StationEvents.Events; namespace Content.Server.StationEvents.Components; diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerWispRuleComponent.cs b/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerWispRuleComponent.cs index 60477e6a6a..d395741f14 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerWispRuleComponent.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerWispRuleComponent.cs @@ -1,3 +1,4 @@ +using Content.Server.Nyanotrasen.StationEvents.Events; using Content.Server.StationEvents.Events; namespace Content.Server.StationEvents.Components; diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/MassMindSwapRuleComponent.cs b/Content.Server/Nyanotrasen/StationEvents/Components/MassMindSwapRuleComponent.cs index 8302188e80..fd82761de8 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Components/MassMindSwapRuleComponent.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Components/MassMindSwapRuleComponent.cs @@ -1,3 +1,4 @@ +using Content.Server.Nyanotrasen.StationEvents.Events; using Content.Server.StationEvents.Events; namespace Content.Server.StationEvents.Components; diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/MidRoundAntagRuleComponent.cs b/Content.Server/Nyanotrasen/StationEvents/Components/MidRoundAntagRuleComponent.cs index c951e5d929..21050a50ca 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Components/MidRoundAntagRuleComponent.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Components/MidRoundAntagRuleComponent.cs @@ -1,3 +1,4 @@ +using Content.Server.Nyanotrasen.StationEvents.Events; using Content.Server.StationEvents.Events; using Robust.Shared.Prototypes; diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericFryRuleComponent.cs b/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericFryRuleComponent.cs index 845cef461c..6f5b0f4d9c 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericFryRuleComponent.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericFryRuleComponent.cs @@ -1,3 +1,4 @@ +using Content.Server.Nyanotrasen.StationEvents.Events; using Content.Server.StationEvents.Events; namespace Content.Server.StationEvents.Components; diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericStormRuleComponent.cs b/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericStormRuleComponent.cs index 3720d938a3..fe3911ccfa 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericStormRuleComponent.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericStormRuleComponent.cs @@ -1,3 +1,4 @@ +using Content.Server.Nyanotrasen.StationEvents.Events; using Content.Server.StationEvents.Events; namespace Content.Server.StationEvents.Components; diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericZapRuleComponent.cs b/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericZapRuleComponent.cs index bfa82644cd..e6fa370f93 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericZapRuleComponent.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericZapRuleComponent.cs @@ -1,3 +1,4 @@ +using Content.Server.Nyanotrasen.StationEvents.Events; using Content.Server.StationEvents.Events; namespace Content.Server.StationEvents.Components; diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/PsionicCatGotYourTongueRuleComponent.cs b/Content.Server/Nyanotrasen/StationEvents/Components/PsionicCatGotYourTongueRuleComponent.cs index bc94eb8d67..8f35639982 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Components/PsionicCatGotYourTongueRuleComponent.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Components/PsionicCatGotYourTongueRuleComponent.cs @@ -1,3 +1,4 @@ +using Content.Server.Nyanotrasen.StationEvents.Events; using Robust.Shared.Audio; using Content.Server.StationEvents.Events; diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs index 0aa8ecc47c..aba6bb71b7 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs @@ -1,14 +1,15 @@ -using Robust.Shared.Map; -using Robust.Shared.Random; -using Content.Server.GameTicking.Rules.Components; +using Content.Server.GameTicking.Components; using Content.Server.Power.Components; +using Content.Server.Psionics.Glimmer; using Content.Server.Station.Systems; using Content.Server.StationEvents.Components; -using Content.Server.Psionics.Glimmer; +using Content.Server.StationEvents.Events; using Content.Shared.Construction.EntitySystems; using Content.Shared.Psionics.Glimmer; +using Robust.Shared.Map; +using Robust.Shared.Random; -namespace Content.Server.StationEvents.Events; +namespace Content.Server.Nyanotrasen.StationEvents.Events; internal sealed class FreeProberRule : StationEventSystem { diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs index a3d36ae715..9e5eb328b7 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs @@ -1,8 +1,9 @@ -using Content.Server.GameTicking.Rules.Components; +using Content.Server.GameTicking.Components; using Content.Server.Psionics.Glimmer; +using Content.Server.StationEvents.Events; using Content.Shared.Psionics.Glimmer; -namespace Content.Server.StationEvents.Events +namespace Content.Server.Nyanotrasen.StationEvents.Events { public sealed class GlimmerEventSystem : StationEventSystem { diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRandomSentienceRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRandomSentienceRule.cs index c086462b40..fc2b40f76c 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRandomSentienceRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRandomSentienceRule.cs @@ -1,12 +1,12 @@ -using System.Linq; -using Content.Server.GameTicking.Rules.Components; +using Content.Server.GameTicking.Components; using Content.Server.Ghost.Roles.Components; using Content.Server.Psionics; using Content.Server.Speech.Components; using Content.Server.StationEvents.Components; +using Content.Server.StationEvents.Events; using Content.Shared.Mobs.Systems; -namespace Content.Server.StationEvents.Events; +namespace Content.Server.Nyanotrasen.StationEvents.Events; /// /// Glimmer version of the (removed) random sentience event diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRevenantSpawnRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRevenantSpawnRule.cs index 8bab321db7..96a75d52ef 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRevenantSpawnRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRevenantSpawnRule.cs @@ -1,9 +1,10 @@ -using Robust.Shared.Random; -using Content.Server.GameTicking.Rules.Components; +using Content.Server.GameTicking.Components; using Content.Server.Psionics.Glimmer; using Content.Server.StationEvents.Components; +using Content.Server.StationEvents.Events; +using Robust.Shared.Random; -namespace Content.Server.StationEvents.Events; +namespace Content.Server.Nyanotrasen.StationEvents.Events; internal sealed class GlimmerRevenantRule : StationEventSystem { diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs index aeff2efb87..69b52766d9 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs @@ -1,14 +1,15 @@ using System.Linq; -using Robust.Shared.Random; -using Content.Server.GameTicking.Rules.Components; -using Content.Server.NPC.Components; +using Content.Server.GameTicking.Components; using Content.Server.Psionics.Glimmer; +using Content.Server.StationEvents; using Content.Server.StationEvents.Components; -using Content.Shared.Psionics.Glimmer; +using Content.Server.StationEvents.Events; using Content.Shared.Abilities.Psionics; using Content.Shared.NPC.Components; +using Content.Shared.Psionics.Glimmer; +using Robust.Shared.Random; -namespace Content.Server.StationEvents.Events; +namespace Content.Server.Nyanotrasen.StationEvents.Events; internal sealed class GlimmerWispRule : StationEventSystem { diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs index 6394456326..5b5f4081d6 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs @@ -1,15 +1,15 @@ -using Robust.Server.GameObjects; -using Robust.Shared.Random; using Content.Server.Abilities.Psionics; -using Content.Server.GameTicking.Rules.Components; +using Content.Server.GameTicking.Components; using Content.Server.Psionics; using Content.Server.StationEvents.Components; +using Content.Server.StationEvents.Events; using Content.Shared.Abilities.Psionics; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Robust.Shared.Player; +using Robust.Shared.Random; -namespace Content.Server.StationEvents.Events; +namespace Content.Server.Nyanotrasen.StationEvents.Events; /// /// Forces a mind swap on all non-insulated potential psionic entities. diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MidRoundAntagRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/MidRoundAntagRule.cs index 7abbdcdab3..9cdcdee844 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/MidRoundAntagRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/MidRoundAntagRule.cs @@ -1,8 +1,10 @@ -using Content.Server.GameTicking.Rules.Components; +using Content.Server.GameTicking.Components; +using Content.Server.StationEvents; using Content.Server.StationEvents.Components; +using Content.Server.StationEvents.Events; using Robust.Shared.Random; -namespace Content.Server.StationEvents.Events; +namespace Content.Server.Nyanotrasen.StationEvents.Events; public sealed class MidRoundAntagRule : StationEventSystem { diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs index c04543d219..aa4d60fd80 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs @@ -1,24 +1,25 @@ -using Robust.Shared.Map; -using Robust.Shared.Physics.Components; -using Robust.Shared.Player; using Content.Server.Atmos.Components; using Content.Server.Atmos.EntitySystems; -using Content.Shared.Construction.EntitySystems; -using Content.Server.GameTicking.Rules.Components; +using Content.Server.GameTicking.Components; using Content.Server.Popups; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Server.Psionics.Glimmer; using Content.Server.StationEvents.Components; +using Content.Server.StationEvents.Events; using Content.Shared.Abilities.Psionics; +using Content.Shared.Construction.EntitySystems; using Content.Shared.Damage; using Content.Shared.Inventory; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Content.Shared.Psionics.Glimmer; using Robust.Shared.Audio.Systems; +using Robust.Shared.Map; +using Robust.Shared.Physics.Components; +using Robust.Shared.Player; -namespace Content.Server.StationEvents.Events; +namespace Content.Server.Nyanotrasen.StationEvents.Events; /// /// Fries tinfoil hats and cages diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs index 175318e15b..6490067db1 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs @@ -1,14 +1,15 @@ -using Robust.Shared.Random; using Content.Server.Abilities.Psionics; -using Content.Server.GameTicking.Rules.Components; -using Content.Server.StationEvents.Components; +using Content.Server.GameTicking.Components; using Content.Server.Psionics; +using Content.Server.StationEvents.Components; +using Content.Server.StationEvents.Events; using Content.Shared.Abilities.Psionics; using Content.Shared.Mobs.Systems; using Content.Shared.Psionics.Glimmer; using Content.Shared.Zombies; +using Robust.Shared.Random; -namespace Content.Server.StationEvents.Events; +namespace Content.Server.Nyanotrasen.StationEvents.Events; internal sealed class NoosphericStormRule : StationEventSystem { diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs index 82c3d72b13..531dd9443d 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs @@ -1,14 +1,15 @@ -using Content.Server.GameTicking.Rules.Components; +using Content.Server.GameTicking.Components; using Content.Server.Popups; using Content.Server.Psionics; using Content.Server.StationEvents.Components; +using Content.Server.StationEvents.Events; using Content.Server.Stunnable; using Content.Shared.Abilities.Psionics; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Content.Shared.StatusEffect; -namespace Content.Server.StationEvents.Events; +namespace Content.Server.Nyanotrasen.StationEvents.Events; /// /// Zaps everyone, rolling psionics and disorienting them diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs index 63e0a435cb..b6d62ddd5a 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs @@ -1,15 +1,16 @@ -using Robust.Shared.Random; -using Robust.Shared.Player; +using Content.Server.GameTicking.Components; using Content.Server.Psionics; -using Content.Server.GameTicking.Rules.Components; using Content.Server.StationEvents.Components; -using Content.Shared.Mobs.Components; +using Content.Server.StationEvents.Events; using Content.Shared.Abilities.Psionics; -using Content.Shared.StatusEffect; +using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; +using Content.Shared.StatusEffect; using Robust.Shared.Audio.Systems; +using Robust.Shared.Player; +using Robust.Shared.Random; -namespace Content.Server.StationEvents.Events; +namespace Content.Server.Nyanotrasen.StationEvents.Events; /// /// Mutes everyone for a random amount of time. diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs index da066737a7..9a5933e233 100644 --- a/Content.Server/Zombies/ZombieSystem.Transform.cs +++ b/Content.Server/Zombies/ZombieSystem.Transform.cs @@ -62,7 +62,6 @@ namespace Content.Server.Zombies [Dependency] private readonly MindSystem _mind = default!; [Dependency] private readonly SharedRoleSystem _roles = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ActionsSystem _actions = default!; // DeltaV - No psionic zombies /// /// Handles an entity turning into a zombie when they die or go into crit