diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs index d94a277173..b445b499f9 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs @@ -3,7 +3,6 @@ using Content.Server.Administration.Managers; using Content.Server.Administration.UI; using Content.Server.Disposal.Tube; using Content.Server.EUI; -using Content.Server.GameTicking; using Content.Server.Ghost.Roles; using Content.Server.Mind; using Content.Server.Mind.Commands; @@ -54,7 +53,6 @@ namespace Content.Server.Administration.Systems [Dependency] private readonly AdminSystem _adminSystem = default!; [Dependency] private readonly DisposalTubeSystem _disposalTubes = default!; [Dependency] private readonly EuiManager _euiManager = default!; - [Dependency] private readonly GameTicker _ticker = default!; [Dependency] private readonly GhostRoleSystem _ghostRoleSystem = default!; [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; [Dependency] private readonly PrayerSystem _prayerSystem = default!; @@ -146,7 +144,7 @@ namespace Content.Server.Administration.Systems var stationUid = _stations.GetOwningStation(args.Target); - var profile = _ticker.GetPlayerProfile(targetActor.PlayerSession); + var profile = _gameTicker.GetPlayerProfile(targetActor.PlayerSession); var mobUid = _spawning.SpawnPlayerMob(coords.Value, null, profile, stationUid); if (_mindSystem.TryGetMind(args.Target, out var mindId, out var mindComp)) @@ -172,7 +170,7 @@ namespace Content.Server.Administration.Systems var stationUid = _stations.GetOwningStation(args.Target); - var profile = _ticker.GetPlayerProfile(targetActor.PlayerSession); + var profile = _gameTicker.GetPlayerProfile(targetActor.PlayerSession); _spawning.SpawnPlayerMob(coords.Value, null, profile, stationUid); }, ConfirmationPopup = true, diff --git a/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs index 025bb87e17..6391dd533b 100644 --- a/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs +++ b/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs @@ -7,9 +7,7 @@ using Content.Shared.Hands.EntitySystems; using Content.Shared.Labels.EntitySystems; using Content.Shared.Paper; using Content.Shared.Popups; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; -using Robust.Shared.Random; using Robust.Shared.Timing; using System.Text; @@ -19,7 +17,6 @@ public sealed class LogProbeCartridgeSystem : EntitySystem { [Dependency] private readonly CartridgeLoaderSystem _cartridge = default!; [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedHandsSystem _hands = default!; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index 2aeefeb46c..8f25b43747 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -2,7 +2,6 @@ using System.Linq; using System.Numerics; using Content.Server.Administration.Logs; using Content.Server.Atmos.Components; -using Content.Server.Chat.Managers; using Content.Server.NodeContainer.EntitySystems; using Content.Server.NPC.Pathfinding; using Content.Shared.Camera; @@ -46,7 +45,6 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem [Dependency] private readonly PathfindingSystem _pathfindingSystem = default!; [Dependency] private readonly SharedCameraRecoilSystem _recoilSystem = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IChatManager _chat = default!; [Dependency] private readonly ThrowingSystem _throwingSystem = default!; [Dependency] private readonly PvsOverrideSystem _pvsSys = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs index c062b95361..84a93da955 100644 --- a/Content.Server/GameTicking/GameTicker.GamePreset.cs +++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using Content.Server.GameTicking.Presets; using Content.Server.Maps; using Content.Shared.CCVar; -using Content.Shared.Mobs.Systems; using JetBrains.Annotations; using Robust.Shared.Player; @@ -12,8 +11,6 @@ namespace Content.Server.GameTicking; public sealed partial class GameTicker { - [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; - public const float PresetFailedCooldownIncrease = 30f; /// diff --git a/Content.Server/Mapping/MappingCommand.cs b/Content.Server/Mapping/MappingCommand.cs index b44a09869e..7482ef811f 100644 --- a/Content.Server/Mapping/MappingCommand.cs +++ b/Content.Server/Mapping/MappingCommand.cs @@ -16,7 +16,6 @@ namespace Content.Server.Mapping sealed class MappingCommand : IConsoleCommand { [Dependency] private readonly IEntityManager _entities = default!; - [Dependency] private readonly IMapManager _map = default!; public string Command => "mapping"; public string Description => Loc.GetString("cmd-mapping-desc"); diff --git a/Content.Server/Maps/MapMigrationSystem.cs b/Content.Server/Maps/MapMigrationSystem.cs index e04cfa1793..28b10e3c58 100644 --- a/Content.Server/Maps/MapMigrationSystem.cs +++ b/Content.Server/Maps/MapMigrationSystem.cs @@ -1,7 +1,6 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; -using Robust.Server.GameObjects; using Robust.Shared.ContentPack; using Robust.Shared.EntitySerialization.Systems; using Robust.Shared.Map.Events; diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs index 9f4b6599b8..e75801d6de 100644 --- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs +++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs @@ -5,7 +5,6 @@ using Content.Server.Afk; using Content.Server.Afk.Events; using Content.Server.GameTicking; using Content.Server.GameTicking.Events; -using Content.Server.Mind; using Content.Server.Preferences.Managers; using Content.Server.Station.Events; using Content.Shared.CCVar; @@ -33,7 +32,6 @@ public sealed class PlayTimeTrackingSystem : EntitySystem [Dependency] private readonly IAdminManager _adminManager = default!; [Dependency] private readonly IAfkManager _afk = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly MindSystem _minds = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IServerPreferencesManager _preferencesManager = default!; [Dependency] private readonly IPrototypeManager _prototypes = default!; diff --git a/Content.Server/Roles/Jobs/JobSystem.cs b/Content.Server/Roles/Jobs/JobSystem.cs index 3603225dfb..2ef66617ac 100644 --- a/Content.Server/Roles/Jobs/JobSystem.cs +++ b/Content.Server/Roles/Jobs/JobSystem.cs @@ -1,6 +1,5 @@ using System.Globalization; using Content.Server.Chat.Managers; -using Content.Server.Mind; using Content.Shared.Mind; using Content.Shared.Roles; using Content.Shared.Roles.Jobs; @@ -14,7 +13,6 @@ namespace Content.Server.Roles.Jobs; public sealed class JobSystem : SharedJobSystem { [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly MindSystem _mind = default!; [Dependency] private readonly ISharedPlayerManager _player = default!; [Dependency] private readonly RoleSystem _roles = default!; diff --git a/Content.Server/Stunnable/Systems/StunbatonSystem.cs b/Content.Server/Stunnable/Systems/StunbatonSystem.cs index 02d2382f5d..efe8cc442e 100644 --- a/Content.Server/Stunnable/Systems/StunbatonSystem.cs +++ b/Content.Server/Stunnable/Systems/StunbatonSystem.cs @@ -4,7 +4,6 @@ using Content.Server.Power.Events; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Damage.Events; using Content.Shared.Examine; -using Content.Shared.Item; using Content.Shared.Item.ItemToggle; using Content.Shared.Item.ItemToggle.Components; using Content.Shared.Popups; @@ -14,7 +13,6 @@ namespace Content.Server.Stunnable.Systems { public sealed class StunbatonSystem : SharedStunbatonSystem { - [Dependency] private readonly SharedItemSystem _item = default!; [Dependency] private readonly RiggableSystem _riggableSystem = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly BatterySystem _battery = default!; diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs index 7be4570160..479c56cd5e 100644 --- a/Content.Server/Zombies/ZombieSystem.Transform.cs +++ b/Content.Server/Zombies/ZombieSystem.Transform.cs @@ -35,7 +35,6 @@ using Content.Shared.Prying.Components; using Content.Shared.Traits.Assorted; using Robust.Shared.Audio.Systems; using Content.Shared.Ghost.Roles.Components; -using Content.Shared.Roles; using Content.Shared.Tag; using Robust.Shared.Player; using Robust.Shared.Prototypes; @@ -63,7 +62,6 @@ public sealed partial class ZombieSystem [Dependency] private readonly NPCSystem _npc = default!; [Dependency] private readonly TagSystem _tag = default!; [Dependency] private readonly NameModifierSystem _nameMod = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; [Dependency] private readonly ISharedPlayerManager _player = default!; private static readonly ProtoId InvalidForGlobalSpawnSpellTag = "InvalidForGlobalSpawnSpell";