diff --git a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs index a4c4476be8..97c1d7bda1 100644 --- a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs +++ b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Runtime.ExceptionServices; -using System.Threading; using Content.Server.AI.Components; using Content.Server.AI.EntitySystems; using Content.Server.AI.LoadBalancer; @@ -11,12 +7,9 @@ using Content.Server.AI.WorldState; using Content.Server.AI.WorldState.States.Utility; using Content.Server.CPUJob.JobQueues; using Content.Shared.Movement.Components; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Log; -using Robust.Shared.Serialization; -using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set; +using System.Runtime.ExceptionServices; +using System.Threading; namespace Content.Server.AI.Utility.AiLogic { @@ -24,7 +17,7 @@ namespace Content.Server.AI.Utility.AiLogic [RegisterComponent] [ComponentProtoName("UtilityAI")] [ComponentReference(typeof(AiControllerComponent)), ComponentReference(typeof(IMoverComponent))] - public sealed class UtilityAi : AiControllerComponent, ISerializationHooks + public sealed class UtilityAi : AiControllerComponent { // TODO: Look at having ParallelOperators (probably no more than that as then you'd have a full-blown BT) // Also RepeatOperators (e.g. if we're following an entity keep repeating MoveToEntity) diff --git a/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs b/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs index e4f35c5f8a..6a4ec2839f 100644 --- a/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs +++ b/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs @@ -4,6 +4,7 @@ using Content.Server.AI.Utils; using Content.Server.Clothing.Components; using Content.Server.Storage.Components; using JetBrains.Annotations; +using Robust.Server.Containers; using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.IoC; @@ -24,10 +25,10 @@ namespace Content.Server.AI.WorldState.States.Clothing { return result; } - + var containerSystem = IoCManager.Resolve(); foreach (var entity in Visibility.GetNearestEntities(entMan.GetComponent(Owner).Coordinates, typeof(ClothingComponent), controller.VisionRadius)) { - if (entity.TryGetContainer(out var container)) + if (containerSystem.TryGetContainingContainer(entity, out var container)) { if (!entMan.HasComponent(container.Owner)) { diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs index b21090f6f9..fe58f9ff41 100644 --- a/Content.Server/Abilities/Mime/MimePowersSystem.cs +++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs @@ -18,7 +18,7 @@ namespace Content.Server.Abilities.Mime [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; [Dependency] private readonly AlertsSystem _alertsSystem = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; + public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Access/AccessWireAction.cs b/Content.Server/Access/AccessWireAction.cs index 713b4af550..56aef4840c 100644 --- a/Content.Server/Access/AccessWireAction.cs +++ b/Content.Server/Access/AccessWireAction.cs @@ -6,7 +6,7 @@ using Content.Shared.Wires; namespace Content.Server.Access; [DataDefinition] -public class AccessWireAction : BaseWireAction +public sealed class AccessWireAction : BaseWireAction { [DataField("color")] private Color _statusColor = Color.Green; diff --git a/Content.Server/Administration/Commands/Station/ListStationJobsCommand.cs b/Content.Server/Administration/Commands/Station/ListStationJobsCommand.cs index 04f2b67043..18d15d9e7c 100644 --- a/Content.Server/Administration/Commands/Station/ListStationJobsCommand.cs +++ b/Content.Server/Administration/Commands/Station/ListStationJobsCommand.cs @@ -1,4 +1,3 @@ -using Content.Server.Station.Components; using Content.Server.Station.Systems; using Content.Shared.Administration; using Robust.Shared.Console; @@ -8,8 +7,6 @@ namespace Content.Server.Administration.Commands.Station; [AdminCommand(AdminFlags.Admin)] public sealed class ListStationJobsCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entityManager = default!; - public string Command => "lsstationjobs"; public string Description => "Lists all jobs on the given station."; diff --git a/Content.Server/Atmos/EntitySystems/GasAnalyzableSystem.cs b/Content.Server/Atmos/EntitySystems/GasAnalyzableSystem.cs index 6c18ea70fc..2e643a0c63 100644 --- a/Content.Server/Atmos/EntitySystems/GasAnalyzableSystem.cs +++ b/Content.Server/Atmos/EntitySystems/GasAnalyzableSystem.cs @@ -16,7 +16,6 @@ namespace Content.Server.Atmos.EntitySystems [UsedImplicitly] public sealed class GasAnalyzableSystem : EntitySystem { - [Dependency] private readonly ToolSystem _toolSystem = default!; [Dependency] private readonly ExamineSystemShared _examineSystem = default!; public override void Initialize() diff --git a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs index cf649976c9..d56d25d7c7 100644 --- a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs +++ b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs @@ -1,23 +1,11 @@ -using System; -using System.Threading; -using System.Collections.Generic; -using Content.Server.Atmos.Monitor.Systems; using Content.Shared.Atmos.Monitor.Components; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Maths; using Robust.Shared.Network; -using Robust.Shared.ViewVariables; namespace Content.Server.Atmos.Monitor.Components { [RegisterComponent] public sealed class AirAlarmComponent : Component { - [Dependency] private readonly IEntityManager _entMan = default!; - - private AirAlarmSystem? _airAlarmSystem; - [ViewVariables] public AirAlarmMode CurrentMode { get; set; } = AirAlarmMode.Filtering; // Remember to null this afterwards. diff --git a/Content.Server/Body/Components/BodyScannerComponent.cs b/Content.Server/Body/Components/BodyScannerComponent.cs index 1b5e4b80ee..c04eb9a52a 100644 --- a/Content.Server/Body/Components/BodyScannerComponent.cs +++ b/Content.Server/Body/Components/BodyScannerComponent.cs @@ -1,4 +1,4 @@ -using Content.Server.UserInterface; +using Content.Server.UserInterface; using Content.Shared.Body.Components; using Robust.Server.GameObjects; @@ -8,8 +8,6 @@ namespace Content.Server.Body.Components [ComponentReference(typeof(SharedBodyScannerComponent))] public sealed class BodyScannerComponent : SharedBodyScannerComponent { - [Dependency] private readonly IEntityManager _entMan = default!; - [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(BodyScannerUiKey.Key); protected override void Initialize() { diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs index 7abb800bf5..f84fa98a36 100644 --- a/Content.Server/Botany/Systems/PlantHolderSystem.cs +++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs @@ -20,7 +20,6 @@ namespace Content.Server.Botany.Systems public sealed class PlantHolderSystem : EntitySystem { [Dependency] private readonly BotanySystem _botanySystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly TagSystem _tagSystem = default!; diff --git a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs index 65cb6e542f..0230949bad 100644 --- a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs @@ -8,7 +8,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy namespace Content.Server.Chemistry.ReactionEffects { [DataDefinition] - public class ExplosionReactionEffect : ReagentEffect + public sealed class ExplosionReactionEffect : ReagentEffect { /// /// The type of explosion. Determines damage types and tile break chance scaling. diff --git a/Content.Server/Cuffs/Components/CuffableComponent.cs b/Content.Server/Cuffs/Components/CuffableComponent.cs index 4db8cc7133..9b34ea58c6 100644 --- a/Content.Server/Cuffs/Components/CuffableComponent.cs +++ b/Content.Server/Cuffs/Components/CuffableComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.Cuffs.Components; using Content.Shared.Hands.EntitySystems; using Content.Shared.Interaction; using Content.Shared.Popups; +using Robust.Server.Containers; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Containers; @@ -23,6 +24,7 @@ namespace Content.Server.Cuffs.Components { [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntitySystemManager _sysMan = default!; + [Dependency] private readonly IComponentFactory _componentFactory = default!; /// /// How many of this entity's hands are currently cuffed. @@ -45,8 +47,7 @@ namespace Content.Server.Cuffs.Components protected override void Initialize() { base.Initialize(); - - Container = ContainerHelpers.EnsureContainer(Owner, Name); + Container = _sysMan.GetEntitySystem().EnsureContainer(Owner, _componentFactory.GetComponentName(GetType())); Owner.EnsureComponentWarn(); } diff --git a/Content.Server/Doors/WireActions/DoorBoltLightWireAction.cs b/Content.Server/Doors/WireActions/DoorBoltLightWireAction.cs index 5b98842c95..0cddf4d3ca 100644 --- a/Content.Server/Doors/WireActions/DoorBoltLightWireAction.cs +++ b/Content.Server/Doors/WireActions/DoorBoltLightWireAction.cs @@ -7,7 +7,7 @@ using Content.Shared.Wires; namespace Content.Server.Doors; [DataDefinition] -public class DoorBoltLightWireAction : BaseWireAction +public sealed class DoorBoltLightWireAction : BaseWireAction { [DataField("color")] private Color _statusColor = Color.Lime; diff --git a/Content.Server/Doors/WireActions/DoorBoltWireAction.cs b/Content.Server/Doors/WireActions/DoorBoltWireAction.cs index e2d1c7beed..ed746875d6 100644 --- a/Content.Server/Doors/WireActions/DoorBoltWireAction.cs +++ b/Content.Server/Doors/WireActions/DoorBoltWireAction.cs @@ -6,7 +6,7 @@ using Content.Shared.Wires; namespace Content.Server.Doors; [DataDefinition] -public class DoorBoltWireAction : BaseWireAction +public sealed class DoorBoltWireAction : BaseWireAction { [DataField("color")] private Color _statusColor = Color.Red; diff --git a/Content.Server/Doors/WireActions/DoorSafetyWireAction.cs b/Content.Server/Doors/WireActions/DoorSafetyWireAction.cs index 96d6aea6e3..706a4f3ec1 100644 --- a/Content.Server/Doors/WireActions/DoorSafetyWireAction.cs +++ b/Content.Server/Doors/WireActions/DoorSafetyWireAction.cs @@ -6,7 +6,7 @@ using Content.Shared.Wires; namespace Content.Server.Doors; [DataDefinition] -public class DoorSafetyWireAction : BaseWireAction +public sealed class DoorSafetyWireAction : BaseWireAction { [DataField("color")] private Color _statusColor = Color.Red; diff --git a/Content.Server/Doors/WireActions/DoorTimingWireAction.cs b/Content.Server/Doors/WireActions/DoorTimingWireAction.cs index 68beab4e83..04ad89d720 100644 --- a/Content.Server/Doors/WireActions/DoorTimingWireAction.cs +++ b/Content.Server/Doors/WireActions/DoorTimingWireAction.cs @@ -6,7 +6,7 @@ using Content.Shared.Wires; namespace Content.Server.Doors; [DataDefinition] -public class DoorTimingWireAction : BaseWireAction +public sealed class DoorTimingWireAction : BaseWireAction { [DataField("color")] private Color _statusColor = Color.Orange; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index 706c924aca..4fb26321c4 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -31,7 +31,6 @@ public sealed partial class ExplosionSystem : EntitySystem [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly ContainerSystem _containerSystem = default!; [Dependency] private readonly NodeGroupSystem _nodeGroupSystem = default!; [Dependency] private readonly CameraRecoilSystem _recoilSystem = default!; [Dependency] private readonly EntityLookupSystem _entityLookup = default!; diff --git a/Content.Server/GameTicking/GameTicker.LobbyBackground.cs b/Content.Server/GameTicking/GameTicker.LobbyBackground.cs index 26e15cb0a2..068a5ff700 100644 --- a/Content.Server/GameTicking/GameTicker.LobbyBackground.cs +++ b/Content.Server/GameTicking/GameTicker.LobbyBackground.cs @@ -1,19 +1,12 @@ -using System.IO; -using System.Linq; using Content.Server.GameTicking.Prototypes; -using Content.Shared.Audio; -using Robust.Shared.ContentPack; using Robust.Shared.Random; using Robust.Shared.Utility; -using Robust.Shared.ViewVariables; - +using System.Linq; namespace Content.Server.GameTicking; public sealed partial class GameTicker { - [Dependency] private readonly IResourceManager _resourceManager = default!; - [ViewVariables] public string? LobbyBackground { get; private set; } @@ -32,7 +25,6 @@ public sealed partial class GameTicker RandomizeLobbyBackground(); } - private void RandomizeLobbyBackground() { LobbyBackground = _lobbyBackgrounds!.Any() ? _robustRandom.Pick(_lobbyBackgrounds!).ToString() : null; } diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 161c3121de..bd54f00e28 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -99,7 +99,6 @@ namespace Content.Server.GameTicking [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IConfigurationManager _configurationManager = default!; [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IServerNetManager _netManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!; [Dependency] private readonly IServerPreferencesManager _prefsManager = default!; @@ -116,8 +115,6 @@ namespace Content.Server.GameTicking [Dependency] private readonly StationSpawningSystem _stationSpawning = default!; [Dependency] private readonly StationJobsSystem _stationJobs = default!; [Dependency] private readonly AdminLogSystem _adminLogSystem = default!; - [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearanceSystem = default!; - [Dependency] private readonly PDASystem _pdaSystem = default!; [Dependency] private readonly DamageableSystem _damageable = default!; [Dependency] private readonly GhostSystem _ghosts = default!; [Dependency] private readonly RoleBanManager _roleBanManager = default!; diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs index c9aa1935ac..5abf693b60 100644 --- a/Content.Server/Hands/Systems/HandsSystem.cs +++ b/Content.Server/Hands/Systems/HandsSystem.cs @@ -41,7 +41,6 @@ namespace Content.Server.Hands.Systems [Dependency] private readonly StackSystem _stackSystem = default!; [Dependency] private readonly HandVirtualItemSystem _virtualItemSystem = default!; [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly AdminLogSystem _logSystem = default!; [Dependency] private readonly StrippableSystem _strippableSystem = default!; [Dependency] private readonly SharedHandVirtualItemSystem _virtualSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs index c0d6ae716c..df75f7a0ba 100644 --- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs @@ -1,19 +1,13 @@ -using System.Collections.Generic; using System.Linq; using Content.Server.Chemistry.EntitySystems; -using Content.Server.Hands.Components; using Content.Server.Kitchen.Components; using Content.Server.Kitchen.Events; using Content.Server.Power.Components; using Content.Server.Stack; using Content.Server.UserInterface; -using Content.Shared.Chemistry.Components; using Content.Shared.Containers.ItemSlots; -using Content.Shared.Hands.EntitySystems; using Content.Shared.Interaction; -using Content.Shared.Item; using Content.Shared.Kitchen.Components; -using Content.Shared.Popups; using Content.Shared.Random.Helpers; using JetBrains.Annotations; using Robust.Server.GameObjects; @@ -28,7 +22,6 @@ namespace Content.Server.Kitchen.EntitySystems internal sealed class ReagentGrinderSystem : EntitySystem { [Dependency] private readonly SolutionContainerSystem _solutionsSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; private Queue _uiUpdateQueue = new(); diff --git a/Content.Server/Payload/EntitySystems/PayloadSystem.cs b/Content.Server/Payload/EntitySystems/PayloadSystem.cs index ea45580868..f74fa3eaad 100644 --- a/Content.Server/Payload/EntitySystems/PayloadSystem.cs +++ b/Content.Server/Payload/EntitySystems/PayloadSystem.cs @@ -16,7 +16,6 @@ public sealed class PayloadSystem : EntitySystem { [Dependency] private readonly TagSystem _tagSystem = default!; [Dependency] private readonly SolutionContainerSystem _solutionSystem = default!; - [Dependency] private readonly SharedChemicalReactionSystem _chemistrySystem = default!; [Dependency] private readonly AdminLogSystem _logSystem = default!; [Dependency] private readonly IComponentFactory _componentFactory = default!; [Dependency] private readonly ISerializationManager _serializationManager = default!; diff --git a/Content.Server/Remotes/DoorRemoteComponent.cs b/Content.Server/Remotes/DoorRemoteComponent.cs index 414ee9521a..c39c7fa86a 100644 --- a/Content.Server/Remotes/DoorRemoteComponent.cs +++ b/Content.Server/Remotes/DoorRemoteComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Remotes [Friend(typeof(DoorRemoteSystem))] public sealed class DoorRemoteComponent : Component { - public override string Name => "DoorRemote"; - public OperatingMode Mode = OperatingMode.OpenClose; public enum OperatingMode : byte diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index 5e4fd14686..498dafb754 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Access.Systems; +using Content.Server.Access.Systems; using Content.Server.CharacterAppearance.Systems; using Content.Server.Hands.Components; using Content.Server.Hands.Systems; @@ -26,9 +26,7 @@ namespace Content.Server.Station.Systems; [PublicAPI] public sealed class StationSpawningSystem : EntitySystem { - [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly HandsSystem _handsSystem = default!; [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearanceSystem = default!; [Dependency] private readonly IdCardSystem _cardSystem = default!; diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs index a19753c2e6..834278ab73 100644 --- a/Content.Server/Station/Systems/StationSystem.cs +++ b/Content.Server/Station/Systems/StationSystem.cs @@ -21,7 +21,6 @@ public sealed class StationSystem : EntitySystem { [Dependency] private readonly IChatManager _chatManager = default!; [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IGameMapManager _gameMapManager = default!; [Dependency] private readonly ILogManager _logManager = default!; [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IRobustRandom _random = default!; diff --git a/Content.Server/StationEvents/Events/RadiationStorm.cs b/Content.Server/StationEvents/Events/RadiationStorm.cs index 4126d9918e..97f1de3dad 100644 --- a/Content.Server/StationEvents/Events/RadiationStorm.cs +++ b/Content.Server/StationEvents/Events/RadiationStorm.cs @@ -16,7 +16,6 @@ namespace Content.Server.StationEvents.Events // Based on Goonstation style radiation storm with some TG elements (announcer, etc.) [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!; private StationSystem _stationSystem = default!; diff --git a/Content.Server/Storage/EntitySystems/DumpableSystem.cs b/Content.Server/Storage/EntitySystems/DumpableSystem.cs index 8890b18d18..a6d3e26bb3 100644 --- a/Content.Server/Storage/EntitySystems/DumpableSystem.cs +++ b/Content.Server/Storage/EntitySystems/DumpableSystem.cs @@ -17,7 +17,6 @@ namespace Content.Server.Storage.EntitySystems [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; [Dependency] private readonly DisposalUnitSystem _disposalUnitSystem = default!; - [Dependency] private readonly HandsSystem _handsSystem = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Storage/EntitySystems/StorageSystem.cs b/Content.Server/Storage/EntitySystems/StorageSystem.cs index 41f42aa6b1..23b6bc7462 100644 --- a/Content.Server/Storage/EntitySystems/StorageSystem.cs +++ b/Content.Server/Storage/EntitySystems/StorageSystem.cs @@ -38,7 +38,6 @@ namespace Content.Server.Storage.EntitySystems [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly ContainerSystem _containerSystem = default!; - [Dependency] private readonly DisposalUnitSystem _disposalSystem = default!; [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!; [Dependency] private readonly InteractionSystem _interactionSystem = default!; diff --git a/Content.Server/Weapon/Melee/ZombieTransfer/ZombieTransferSystem.cs b/Content.Server/Weapon/Melee/ZombieTransfer/ZombieTransferSystem.cs index ad80f8892b..10cc03e50b 100644 --- a/Content.Server/Weapon/Melee/ZombieTransfer/ZombieTransferSystem.cs +++ b/Content.Server/Weapon/Melee/ZombieTransfer/ZombieTransferSystem.cs @@ -17,7 +17,6 @@ namespace Content.Server.Weapons.Melee.ZombieTransfer public sealed class ZombieTransferSystem : EntitySystem { [Dependency] private readonly DiseaseSystem _disease = default!; - [Dependency] private readonly BodySystem _body = default!; [Dependency] private readonly BloodstreamSystem _bloodstream = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!; public override void Initialize() diff --git a/Content.Server/Wires/WiresSystem.cs b/Content.Server/Wires/WiresSystem.cs index 183732d664..536fad4e38 100644 --- a/Content.Server/Wires/WiresSystem.cs +++ b/Content.Server/Wires/WiresSystem.cs @@ -24,12 +24,10 @@ namespace Content.Server.Wires; public sealed class WiresSystem : EntitySystem { [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly AudioSystem _audioSystem = default!; [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; [Dependency] private readonly ToolSystem _toolSystem = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly HandsSystem _handsSystem = default!; [Dependency] private readonly DoAfterSystem _doAfter = default!; private IRobustRandom _random = new RobustRandom(); diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs index d5d2304a5b..aa80af0697 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Atmos; +using Content.Shared.Atmos; namespace Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components; @@ -8,8 +8,6 @@ namespace Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components; [RegisterComponent] public sealed class GasArtifactComponent : Component { - public override string Name => "GasArtifact"; - /// /// Gas that will be spawned when artifact activated. /// If null it will be picked on startup from . diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/RadiateArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/RadiateArtifactComponent.cs index dd0f79a858..d5f3d74c47 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/RadiateArtifactComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/RadiateArtifactComponent.cs @@ -1,4 +1,4 @@ -using Content.Server.Radiation; +using Content.Server.Radiation; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; @@ -10,8 +10,6 @@ namespace Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components; [RegisterComponent] public sealed class RadiateArtifactComponent : Component { - public override string Name => "RadiateArtifact"; - /// /// Radiation pulse prototype to spawn. /// Should has . diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/TemperatureArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/TemperatureArtifactComponent.cs index c758e7d3c1..abc7fcf76b 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/TemperatureArtifactComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/TemperatureArtifactComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Atmos; +using Content.Shared.Atmos; namespace Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components; @@ -8,8 +8,6 @@ namespace Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components; [RegisterComponent] public sealed class TemperatureArtifactComponent : Component { - public override string Name => "TemperatureArtifact"; - [DataField("targetTemp")] public float TargetTemperature = Atmospherics.T0C;