From 147a275b17f0474f21d888ef97f262ad99d7aa04 Mon Sep 17 00:00:00 2001 From: Zekins3366 Date: Mon, 1 Jun 2026 23:58:02 +0300 Subject: [PATCH] AAAAAAAAAAAAAAAAAAAAAA --- .../_Wega/Achievements/AchievementsSystem.cs | 12 ++-- .../Achievements/AchievementsWindow.xaml.cs | 6 +- Content.Client/_Wega/Android/AndroidSystem.cs | 6 +- .../Ui/AndroidConstructBoundUserInterface.cs | 6 +- Content.Client/_Wega/Barks/BarkSystem.cs | 10 +-- .../_Wega/BloodCult/BloodCultSystem.cs | 8 +-- .../BloodCult/Ui/BloodStructureMenu.xaml.cs | 2 +- .../_Wega/BloodCult/Ui/RunesMenu.xaml.cs | 2 +- .../BloodCult/Ui/SummoningRuneMenu.xaml.cs | 2 +- .../_Wega/CardTarot/CardTarotSystem.cs | 4 +- .../_Wega/Crayon/CrayonPreviewOverlay.cs | 10 +-- .../DetailExaminable/DetailExaminableEui.cs | 2 +- .../_Wega/Dirt/DirtVisualsSystem.cs | 6 +- Content.Client/_Wega/Dirt/ShowerSystem.cs | 4 +- .../_Wega/Dirt/WashingMachineSystem.cs | 6 +- .../_Wega/GPS/UI/GpsNavMapControl.cs | 4 +- .../Genetics/Systems/Disease/DizzyOverlay.cs | 6 +- .../Genetics/Systems/Disease/DizzySystem.cs | 4 +- .../Genetics/Ui/DnaModifierWindow.xaml.cs | 8 +-- .../Genetics/Ui/MindCommunicationPanel.cs | 6 +- .../Ui/MindCommunicationUIController.cs | 4 +- .../_Wega/Humanoid/HumanoidHeightSystem.cs | 2 +- .../ItemSelectorBoundUserInterface.cs | 2 +- .../ItemSelector/ItemSelectorWindow.xaml.cs | 2 +- .../ItemSelector/ObjectSelectorWindow.xaml.cs | 2 +- .../Lavaland/LavalandConsoleWindow.xaml.cs | 2 +- ...avalandPenalServitudeConsoleWindow.xaml.cs | 2 +- .../_Wega/Lavaland/UtilityVendorMenu.xaml.cs | 4 +- .../InjectorFabticatorVisualsSystem.cs | 4 +- .../Ui/InjectorFabticatorWindow.xaml.cs | 4 +- .../ModularSuit/Ui/ModularSuitWindow.xaml.cs | 2 +- .../_Wega/NullRod/NullDamageOverlay.cs | 8 +-- .../_Wega/NullRod/NullDamageSystem.cs | 4 +- .../_Wega/Offer/OfferItemIndicatorsOverlay.cs | 4 +- Content.Client/_Wega/Offer/OfferItemSystem.cs | 4 +- .../_Wega/Overlays/ColourblindnessOverlay.cs | 6 +- .../_Wega/Overlays/ColourblindnessSystem.cs | 4 +- .../_Wega/Overlays/ListenUpOverlay.cs | 4 +- .../_Wega/Overlays/ListenUpSystem.cs | 4 +- Content.Client/_Wega/Overlays/RaveOverlay.cs | 4 +- .../_Wega/Overlays/RaveOverlaySystem.cs | 2 +- Content.Client/_Wega/Posing/PosingSystem.cs | 6 +- .../_Wega/Shader/NaturalNightVisionOverlay.cs | 6 +- .../_Wega/Shader/NaturalNightVisionSystem.cs | 8 +-- .../_Wega/Shader/NightVisionOverlay.cs | 8 +-- .../_Wega/Shader/NightVisionSystem.cs | 4 +- .../_Wega/Shader/NoirVisionOverlay.cs | 6 +- .../_Wega/Shader/NoirVisionSystem.cs | 4 +- .../Surgery/Ui/SurgeryBoundUserInterface.cs | 2 +- .../Ui/TapeRecorderBoundUserInterface.cs | 2 +- .../Vampire/Ui/DissectSelectionMenu.xaml.cs | 4 +- .../_Wega/Vampire/Ui/TrophiesMenu.xaml.cs | 2 +- Content.Client/_Wega/Vampire/VampireSystem.cs | 10 +-- Content.Client/_Wega/Vehicle/VehicleSystem.cs | 2 +- .../_Wega/VeilCult/UI/EnchantWindow.xaml.cs | 2 +- .../_Wega/VeilCult/VeilCultSystem.cs | 4 +- .../_Wega/VentCraw/VentCrawVisionSystem.cs | 6 +- Content.Client/_Wega/Visuals/FadeSystem.cs | 4 +- .../_Wega/Visuals/VisualStateSystem.cs | 2 +- .../Voucher/VoucherBoundUserInterface.cs | 4 +- .../_Wega/Voucher/VoucherKitWindow.xaml.cs | 4 +- .../_Wega/Xenobiology/CellVisualsSystem.cs | 2 +- .../_Wega/Xenobiology/SlimeVisualSystem.cs | 4 +- .../UI/CellSequencerWindow.xaml.cs | 2 +- .../UI/CellularFusionWindow.xaml.cs | 2 +- .../UI/SlimeAnalyzerWindow.xaml.cs | 2 +- .../_Wega/Achievements/AchievementsSystem.cs | 2 +- .../Commands/AchievementsCommands.cs | 28 ++++---- .../Commands/TimePackCommand.cs | 6 +- .../Aliens/Facehugger/FacehuggerSystem.cs | 18 ++--- .../_Wega/Android/AndroidFrameSystem.cs | 16 ++--- Content.Server/_Wega/Android/AndroidSystem.cs | 32 ++++----- .../Effects/CoreAnomChangeTempSystem.cs | 6 +- Content.Server/_Wega/Barks/BarkSystem.cs | 8 +-- .../BloodCult/BloodCultSystem.Abilities.cs | 54 +++++++-------- .../BloodCult/BloodCultSystem.Equipment.cs | 8 +-- .../_Wega/BloodCult/BloodCultSystem.Runes.cs | 14 ++-- .../_Wega/BloodCult/BloodCultSystem.cs | 36 +++++----- .../_Wega/Botany/PlantAnalyzerSystem.cs | 24 +++---- .../_Wega/CardTarot/CardTarotSystem.cs | 60 ++++++++--------- .../_Wega/Carrying/CarryingSystem.cs | 24 +++---- .../Cartridges/NanoChatCartridgeSystem.cs | 16 ++--- .../_Wega/Chat/Commands/MindSayCommand.cs | 2 +- .../_Wega/Clothing/ForceLoadoutSystem.cs | 4 +- .../_Wega/Commands/GhostRespawnCommand.cs | 6 +- .../_Wega/Damage/DamageResistSystem.cs | 6 +- .../Damage/Systems/DamageInContainerSystem.cs | 8 +-- .../Damage/Systems/DamageOnActionSystems.cs | 8 +-- .../DetailExaminableSystem.cs | 8 +-- Content.Server/_Wega/Dice/DiceOfFateSystem.cs | 32 ++++----- Content.Server/_Wega/Dirt/ShowerSystem.cs | 14 ++-- .../_Wega/Dirt/WashingMachineSystem.cs | 14 ++-- .../_Wega/Disease/DiseaseDiagnosisSystem.cs | 18 ++--- Content.Server/_Wega/Disease/DiseaseSystem.cs | 18 ++--- Content.Server/_Wega/ERP/SexToyUsageSystem.cs | 8 +-- Content.Server/_Wega/ERP/VibratorSystem.cs | 8 +-- .../_Wega/GPS/HandheldGpsUiSystem.cs | 8 +-- .../_Wega/GameTicking/AutoVoteSystem.cs | 4 +- .../Rules/BloodBrotherRuleSystem.cs | 24 +++---- .../GameTicking/Rules/BloodCultRuleSystem.cs | 38 +++++------ .../GameTicking/Rules/VampireRuleSystem.cs | 4 +- .../GameTicking/Rules/VeilCultRuleSystem.cs | 40 +++++------ .../Basic/EmpatheticThoughtGenSystem.cs | 8 +-- .../Genetics/Systems/Basic/HulkGenSystem.cs | 16 ++--- .../Systems/Basic/MatterEaterGenSystem.cs | 20 +++--- .../Systems/Basic/TelekinesisGenSystem.cs | 2 +- .../Systems/Disease/EpilepsyGenSystem.cs | 12 ++-- .../IncendiaryMitochondriaGenSystem.cs | 4 +- .../Disease/TourettesSyndromeSystem.cs | 8 +-- .../Genetics/Systems/DnaInjectorSystem.cs | 4 +- .../Systems/DnaModifierConsoleSystem.cs | 30 ++++----- .../Systems/DnaModifierSystem.Clone.cs | 2 +- .../Genetics/Systems/DnaModifierSystem.Map.cs | 2 +- .../Genetics/Systems/DnaModifierSystem.cs | 36 +++++----- .../Genetics/Systems/EnsureMarkingSystem.cs | 2 +- .../Intermediate/CloakOfDarknessGenSystem.cs | 4 +- .../MindCommunicationGenSystem.cs | 10 +-- .../Intermediate/PolymorphismGenSystem.cs | 6 +- .../Intermediate/RegenerationGenSystem.cs | 2 +- .../Systems/Intermediate/SpeedUpGenSystem.cs | 4 +- .../_Wega/Ghost/GhostRespawnSystem.cs | 4 +- .../Hallucinations/HallucinationsSystem.cs | 16 ++--- .../Implants/BatteryDrainerImplantSystem.cs | 12 ++-- .../_Wega/Implants/BodyPartImplantSystem.cs | 4 +- .../_Wega/Implants/HandItemImplantSystem.cs | 8 +-- .../_Wega/Implants/InternalStorageSystem.cs | 2 +- .../_Wega/Implants/LoyaltyImplantSystem.cs | 12 ++-- .../_Wega/Instruments/InstrumentSystem.cs | 4 +- .../_Wega/Interaction/DeleteOnDropSystem.cs | 2 +- .../_Wega/ItemSelector/ItemSelectorSystem.cs | 8 +-- .../ItemSelector/ObjectSelectorSystem.cs | 6 +- .../Systems/Artefacts/DragonBloodSystem.cs | 12 ++-- .../Systems/Artefacts/FireSelfActionSystem.cs | 2 +- .../Artefacts/HierophantWeaponSystem.cs | 10 +-- .../Systems/Artefacts/LavaStaffSystem.cs | 14 ++-- .../Systems/Artefacts/LinkedCubeSystem.cs | 6 +- .../Systems/Artefacts/RodOfAsclepiusSystem.cs | 18 ++--- .../Systems/Artefacts/ShipInBottleSystem.cs | 10 +-- .../Systems/Artefacts/SoulStorageSystem.cs | 2 +- .../Systems/Artefacts/VoiceOfGodSystem.cs | 38 +++++------ .../_Wega/Lavaland/Systems/FloraSystem.cs | 14 ++-- .../Lavaland/Systems/HandCapsuleSystem.cs | 8 +-- ...landPenalServitudeShuttleSystem.Console.cs | 4 +- .../LavalandPenalServitudeShuttleSystem.cs | 10 +-- .../Systems/LavalandShuttleSystem.Console.cs | 4 +- .../Lavaland/Systems/LavalandShuttleSystem.cs | 10 +-- .../_Wega/Lavaland/Systems/LavalandSystem.cs | 48 +++++++------- .../Systems/Mobs/AshDrake/AshDrakeSystem.cs | 28 ++++---- .../BloodDrunkMiner/BloodDrunkMinerSystem.cs | 4 +- .../Systems/Mobs/Bubblegum/BubblegumSystem.cs | 28 ++++---- .../Systems/Mobs/Colossus/ColossusSystem.cs | 12 ++-- .../Mobs/Hierophant/HierophantSystem.cs | 18 ++--- .../Systems/Mobs/Legion/LegionSystem.cs | 28 ++++---- .../Lavaland/Systems/Mobs/MegafaunaSystem.cs | 10 +-- .../Systems/NecropolisTendrilSystem.cs | 10 +-- .../_Wega/MartialArts/MartialArtsSystem.cs | 10 +-- .../_Wega/MartialArts/Styles/BoxingStyle.cs | 6 +- .../_Wega/Medical/InjectorFabticatorSystem.cs | 12 ++-- .../_Wega/Mining/MiningConsoleSystem.cs | 8 +-- .../_Wega/Mining/MiningServerSystem.cs | 6 +- .../ModularSuit/ModularSuitSystem.Power.cs | 2 +- .../_Wega/ModularSuit/ModularSuitSystem.Ui.cs | 2 +- .../_Wega/ModularSuit/ModularSuitSystem.cs | 14 ++-- .../AtrocinatorModuleHandler.cs | 8 +-- .../EventsHandlers/DispenserModuleHandler.cs | 4 +- .../EnergyShieldModuleHandler.cs | 2 +- .../EventsHandlers/HolsterModuleHandler.cs | 12 ++-- .../EventsHandlers/LightModuleHandler.cs | 6 +- .../EventsHandlers/TanningModuleHandler.cs | 2 +- .../EventsHandlers/TeleporterModuleHandler.cs | 6 +- .../Affected/AffectedModuleCarrySystem.cs | 4 +- .../AffectedModuleSpringlockSystem.cs | 12 ++-- .../Items/ModularSuitGrabberModuleSystem.cs | 14 ++-- .../Items/ModularSuitLightModuleSystem.cs | 10 +-- .../Items/ModularSuitMicrowaveModuleSystem.cs | 12 ++-- .../ModularSuitSpringlockModuleSystem.cs | 2 +- .../Items/ModularSuitStorageModuleSystem.cs | 4 +- .../Systems/ModularSuitActionModuleSystem.cs | 8 +-- .../Systems/ModularSuitItemModuleSystem.cs | 6 +- ...larSuitModuleContainerRequirementSystem.cs | 4 +- .../Systems/ModularSuitModuleEffectSystem.cs | 4 +- .../ModularSuitPermanentInstalledSystem.cs | 2 +- .../Movement/Systems/FlyAbilitySystem.cs | 8 +-- .../CheckSlimeHungerPrecondition.cs | 2 +- .../Operators/MaintainRangeOperator.cs | 2 +- .../Operators/SlimeEatOperator.cs | 4 +- .../Operators/SlimeFindFoodOperator.cs | 2 +- .../Operators/SlimeFindTargetOperator.cs | 2 +- .../Operators/SlimeMeleeOperator.cs | 2 +- .../Operators/SlimeWanderOperator.cs | 2 +- .../UpdateFollowCoordinatesOperator.cs | 2 +- .../UpdateTargetCoordinatesOperator.cs | 2 +- .../NPC/Systems/NPCHandSwitcherSystem.cs | 8 +-- .../NPC/Systems/NPCOptimizationSystem.cs | 12 ++-- .../Systems/NPCUseActionsOnTargetSystem.cs | 10 +-- .../NightLightning/NightLightningSystem.cs | 8 +-- .../_Wega/NullRod/NullDamageSystem.cs | 6 +- .../BloodBrotherSharedConditionSystem.cs | 2 +- ...BloodBrotherSharedEscapeConditionSystem.cs | 6 +- ...BloodBrotherSharedHijackConditionSystem.cs | 10 +-- ...odBrotherSharedKeepAliveConditionSystem.cs | 6 +- .../BloodBrotherSharedKillConditionSystem.cs | 10 +-- .../BloodBrotherSharedStealConditionSystem.cs | 16 ++--- .../Systems/BloodCultRitualObjectiveSystem.cs | 2 +- .../Systems/BloodCultTargetObjectiveSystem.cs | 2 +- .../Systems/VeilCultBeaconObjectiveSystem.cs | 6 +- .../Systems/VeilCultRitualObjectiveSystem.cs | 2 +- Content.Server/_Wega/Offer/OfferItemSystem.cs | 8 +-- Content.Server/_Wega/Pain/PainSystem.cs | 14 ++-- .../_Wega/Paper/ChameleonStampSystem.cs | 4 +- .../_Wega/Paper/TicketMachineSystem.cs | 12 ++-- .../_Wega/Pinpointer/HandheldBeaconSystem.cs | 12 ++-- .../_Wega/Projectiles/ProjectileAoESystem.cs | 4 +- .../Projectiles/ProjectileInfectSystem.cs | 4 +- .../Projectiles/ProjectileLifestealSystem.cs | 4 +- .../Projectiles/ProjectilePressureSystem.cs | 2 +- .../ProjectileTimerResetsSystem.cs | 4 +- .../Resomi/Abilities/AgillitySkillSystem.cs | 8 +-- .../Resomi/Abilities/ListenUpSkillSystem.cs | 2 +- .../_Wega/Resomi/Abilities/ListenUpSystem.cs | 2 +- .../_Wega/Shadow/PhotophobiaSystem.cs | 22 +++---- .../Sharpening/Systems/SharpeningSystem.cs | 2 +- Content.Server/_Wega/Skrell/SkrellSystem.cs | 4 +- .../_Wega/SlotMachine/SlotMachineSystem.cs | 20 +++--- .../EntitySystems/AphasiaAccentSystem.cs | 2 +- .../Speech/EntitySystems/ClownAccentSystem.cs | 2 +- .../Speech/EntitySystems/LoudAccentSystem.cs | 2 +- .../EntitySystems/ResomiAccentSystem.cs | 2 +- .../UnintelligibleAccentSystem.cs | 2 +- .../Events/DiseaseOutbreakRule.cs | 4 +- .../Events/RadiationOutburstRuleSystem.cs | 6 +- .../Strangulation/StrangulationSystem.cs | 22 +++---- .../_Wega/Surgery/BodyScannerConsoleSystem.cs | 8 +-- .../_Wega/Surgery/SurgerySystem.Graphs.cs | 10 +-- .../Surgery/SurgerySystem.InternalDamage.cs | 8 +-- .../_Wega/Surgery/SurgerySystem.Operation.cs | 8 +-- .../_Wega/Surgery/SurgerySystem.Sterility.cs | 2 +- Content.Server/_Wega/Surgery/SurgerySystem.cs | 30 ++++----- .../_Wega/TapeRecorder/TapeRecorderSystem.cs | 8 +-- .../Assorted/UncontrollableCoughSystem.cs | 4 +- .../Assorted/UncontrollableSnoughSystem.cs | 4 +- .../VampireSystem.Abilities.Bestia.cs | 6 +- .../VampireSystem.Abilities.Dantalion.cs | 8 +-- .../VampireSystem.Abilities.Hemomancer.cs | 2 +- .../VampireSystem.Abilities.Umbrae.cs | 4 +- .../Abilities/VampireSystem.Abilities.cs | 20 +++--- .../_Wega/Vampire/BittenByVampireSystem.cs | 2 +- .../_Wega/Vampire/HolyPointSystem.cs | 10 +-- .../_Wega/Vampire/VampireSystem.Diablerie.cs | 4 +- Content.Server/_Wega/Vampire/VampireSystem.cs | 66 +++++++++---------- .../VeilCult/TeleportationEnchantSystem.cs | 2 +- .../VeilCult/VeilCultSystem.Abilities.cs | 24 +++---- .../VeilCult/VeilCultSystem.Enchantments.cs | 14 ++-- .../_Wega/VeilCult/VeilCultSystem.cs | 28 ++++---- .../_Wega/VentCraw/VentCrawTubeSystem.cs | 18 ++--- .../_Wega/VentCraw/VentCrawableSystem.cs | 12 ++-- .../Weapons/Marker/DamageMarkerSystem.cs | 8 +-- .../Weapons/Systems/LeechMeleeWeaponSystem.cs | 6 +- .../_Wega/Xenobiology/CellSystem.cs | 10 +-- .../Machines/SlimeExtractorSystem.cs | 22 +++---- .../Xenobiology/Mobs/SlimeGrowthSystem.cs | 2 +- .../Xenobiology/Mobs/SlimeHungerSystem.cs | 14 ++-- .../Xenobiology/Mobs/SlimeRebellionSystem.cs | 8 +-- .../Xenobiology/Mobs/SlimeSocialSystem.cs | 12 ++-- .../_Wega/Xenobiology/SlimeAnalyzerSystem.cs | 16 ++--- .../_Wega/Android/SharedAndroidFrameSystem.cs | 4 +- .../_Wega/Android/SharedAndroidSystem.cs | 2 +- .../_Wega/BloodCult/SharedBloodCultSystem.cs | 6 +- .../_Wega/Botany/SharedPlantAnalyzerSystem.cs | 2 +- .../Systems/ChangeableCargoAccountSystem.cs | 6 +- .../_Wega/Carrying/CarryingSlowdownSystem.cs | 2 +- .../_Wega/Clothing/TearableClothingSystem.cs | 6 +- .../ToggleableSpriteClothingSystem.cs | 4 +- .../Upgrades/ClothingUpgradeSystem.cs | 10 +-- .../Damage/Systems/IncreasedDamageSystem.cs | 4 +- .../_Wega/Dirt/PuddleContactSystem.cs | 4 +- Content.Shared/_Wega/Dirt/SharedDirtSystem.cs | 10 +-- .../_Wega/Disease/SharedDiseaseSystem.cs | 4 +- .../_Wega/EnergyShield/EnergyShieldSystem.cs | 2 +- .../Effects/ApplyRotSlowdownEffect.cs | 2 +- .../Effects/ChemCauseRandomDisease.cs | 2 +- .../Effects/ChemDamageResistReagentEffect.cs | 4 +- .../Effects/ChemHealInternalDamage.cs | 2 +- .../Effects/ChemMiasmaPoolSource.cs | 2 +- .../ChemStabilizeMutationChanceEffect.cs | 2 +- .../Effects/DamageEntityEffect.cs | 2 +- .../EntityEffects/Effects/HolyPurification.cs | 4 +- .../EntityEffects/Effects/WashDirtReaction.cs | 2 +- .../Systems/Connection/DnaClientSystem.cs | 2 +- .../Systems/Connection/DnaServerSystem.cs | 2 +- .../Systems/Disease/DizzyGenSystem.cs | 4 +- .../_Wega/Genetics/Systems/MarkingIndexer.cs | 4 +- .../Systems/SharedDnaModifierSystem.cs | 4 +- .../Systems/StructuralEnzymesIndexer.cs | 4 +- .../_Wega/Implants/MagbootsImplantSystem.cs | 6 +- .../Implants/SharedInternalStorageSystem.cs | 10 +-- .../Interaction/InteractionActionSystem.cs | 12 ++-- .../Inventory/EmptySlotsRequirementSystem.cs | 4 +- .../Systems/OreProcessorPointsSystem.cs | 2 +- .../Lavaland/Systems/SharedJaunterSystem.cs | 8 +-- .../Lavaland/Systems/TrophyHunterSystem.cs | 12 ++-- .../Lavaland/Systems/UtilityVendorSystem.cs | 8 +-- .../MartialArts/SharedMartialArtsSystem.cs | 6 +- Content.Shared/_Wega/Mobs/MobAngerSystem.cs | 6 +- .../SharedModularSuitHiddenClothingSystem.cs | 4 +- .../ModularSuit/SharedModularSuitSystem.cs | 12 ++-- .../Movement/Systems/FlyAbilitySystem.cs | 6 +- .../Objectives/Systems/BloodCondition.cs | 4 +- .../_Wega/Offer/SharedOfferItemSystem.cs | 8 +-- .../SharedToggleableEquipmentHudSystem.cs | 14 ++-- .../_Wega/Posing/SharedPosingSystem.cs | 8 +-- .../_Wega/RCD/Systems/RCDUpgradeKitSystem.cs | 2 +- .../Hearing/SharedListenUpSkillSystem.cs | 4 +- .../Abilities/SharedAgillitySkillSystem.cs | 6 +- .../Shader/SharedNaturalNightVisionSystem.cs | 4 +- .../Systems/SharedSharpeningSystem.cs | 2 +- .../SoundInsulation/SoundInsulationSystem.cs | 8 +-- .../SharedStrangulationSystem.cs | 2 +- .../Stunnable/SharedStunSystem.Slowdown.cs | 2 +- .../TapeRecorder/SharedTapeRecorderSystem.cs | 12 ++-- .../_Wega/Vampire/SharedVampireSystem.cs | 4 +- .../_Wega/Vehicle/SharedVehicleSystem.cs | 28 ++++---- .../SharedTeleportationEnchantSystem.cs | 6 +- .../_Wega/VeilCult/SharedVeilBeaconSystem.cs | 2 +- .../_Wega/VeilCult/SharedVeilCultSystem.cs | 16 ++--- Content.Shared/_Wega/Voucher/VoucherSystem.cs | 8 +-- .../Hitscan/System/HitscanIEMPSystem.cs | 4 +- .../Upgrades/CrusherUpgradeEffectsSystem.cs | 22 +++---- .../Misc/Upgrades/CrusherUpgradeSystem.cs | 12 ++-- .../Systems/Machines/CellInjectorSystem.cs | 12 ++-- .../Systems/Machines/CellSequencerSystem.cs | 14 ++-- .../Systems/Machines/CellularFusionSystem.cs | 10 +-- .../Machines/Connection/CellClientSystem.cs | 2 +- .../Xenobiology/Systems/SharedCellSystem.cs | 2 +- .../Systems/SharedCellVisualsSystem.cs | 2 +- .../Systems/SharedSlimeGrowthSystem.cs | 2 +- .../Systems/SharedSlimeVisualSystem.cs | 6 +- RobustToolbox | 2 +- 338 files changed, 1416 insertions(+), 1416 deletions(-) diff --git a/Content.Client/_Wega/Achievements/AchievementsSystem.cs b/Content.Client/_Wega/Achievements/AchievementsSystem.cs index df23528945..19542fb0eb 100644 --- a/Content.Client/_Wega/Achievements/AchievementsSystem.cs +++ b/Content.Client/_Wega/Achievements/AchievementsSystem.cs @@ -16,12 +16,12 @@ namespace Content.Client.Achievements; public sealed class AchievementsSystem : SharedAchievementsSystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IUserInterfaceManager _ui = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IUserInterfaceManager _ui = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private SharedAudioSystem _audio = default!; public IReadOnlyList UnlockedAchievements => _unlockedAchievements; private List _unlockedAchievements = new(); diff --git a/Content.Client/_Wega/Achievements/AchievementsWindow.xaml.cs b/Content.Client/_Wega/Achievements/AchievementsWindow.xaml.cs index de4f68a6a9..1f7dd9e962 100644 --- a/Content.Client/_Wega/Achievements/AchievementsWindow.xaml.cs +++ b/Content.Client/_Wega/Achievements/AchievementsWindow.xaml.cs @@ -13,9 +13,9 @@ namespace Content.Client._Wega.Achievements; [GenerateTypedNameReferences] public sealed partial class AchievementsWindow : FancyWindow { - [Dependency] private readonly IDependencyCollection _dependencies = default!; - [Dependency] private readonly IEntitySystemManager _sysMan = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IDependencyCollection _dependencies = default!; + [Dependency] private IEntitySystemManager _sysMan = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly AchievementsSystem _achievements; private readonly SpriteSystem _spriteSystem; diff --git a/Content.Client/_Wega/Android/AndroidSystem.cs b/Content.Client/_Wega/Android/AndroidSystem.cs index bc34377099..c4e62a130e 100644 --- a/Content.Client/_Wega/Android/AndroidSystem.cs +++ b/Content.Client/_Wega/Android/AndroidSystem.cs @@ -7,9 +7,9 @@ namespace Content.Client.Android; public sealed class AndroidSystem : SharedAndroidSystem { - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly BatterySystem _battery = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private BatterySystem _battery = default!; + [Dependency] private AlertsSystem _alerts = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/Android/Ui/AndroidConstructBoundUserInterface.cs b/Content.Client/_Wega/Android/Ui/AndroidConstructBoundUserInterface.cs index 6a81ffa61b..8724101626 100644 --- a/Content.Client/_Wega/Android/Ui/AndroidConstructBoundUserInterface.cs +++ b/Content.Client/_Wega/Android/Ui/AndroidConstructBoundUserInterface.cs @@ -14,9 +14,9 @@ public sealed class AndroidConstructBoundUserInterface : BoundUserInterface [ViewVariables] private AndroidConstructMenu? _menu; - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly MarkingManager _markingManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] private MarkingManager _markingManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public HumanoidCharacterProfile Profile = new(); diff --git a/Content.Client/_Wega/Barks/BarkSystem.cs b/Content.Client/_Wega/Barks/BarkSystem.cs index 3243d54442..17fc63c53f 100644 --- a/Content.Client/_Wega/Barks/BarkSystem.cs +++ b/Content.Client/_Wega/Barks/BarkSystem.cs @@ -19,11 +19,11 @@ namespace Content.Client.Speech.Synthesis.System; /// public sealed class BarkSystem : EntitySystem { - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly SoundInsulationSystem _soundInsulation = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private SoundInsulationSystem _soundInsulation = default!; private const float MinimalVolume = -10f; private const float WhisperFade = 4f; diff --git a/Content.Client/_Wega/BloodCult/BloodCultSystem.cs b/Content.Client/_Wega/BloodCult/BloodCultSystem.cs index b2c94f9f37..8d9612221e 100644 --- a/Content.Client/_Wega/BloodCult/BloodCultSystem.cs +++ b/Content.Client/_Wega/BloodCult/BloodCultSystem.cs @@ -11,10 +11,10 @@ namespace Content.Client.Blood.Cult { public sealed class BloodCultSystem : SharedBloodCultSystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/BloodCult/Ui/BloodStructureMenu.xaml.cs b/Content.Client/_Wega/BloodCult/Ui/BloodStructureMenu.xaml.cs index 1b152b068c..05611411ba 100644 --- a/Content.Client/_Wega/BloodCult/Ui/BloodStructureMenu.xaml.cs +++ b/Content.Client/_Wega/BloodCult/Ui/BloodStructureMenu.xaml.cs @@ -11,7 +11,7 @@ namespace Content.Client._Wega.BloodCult.Ui; [GenerateTypedNameReferences] public sealed partial class BloodStructureMenu : RadialMenu { - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IPrototypeManager _proto = default!; public event Action? OnSelectItem; diff --git a/Content.Client/_Wega/BloodCult/Ui/RunesMenu.xaml.cs b/Content.Client/_Wega/BloodCult/Ui/RunesMenu.xaml.cs index 4b2dbc4567..68d7cef72e 100644 --- a/Content.Client/_Wega/BloodCult/Ui/RunesMenu.xaml.cs +++ b/Content.Client/_Wega/BloodCult/Ui/RunesMenu.xaml.cs @@ -10,7 +10,7 @@ namespace Content.Client._Wega.BloodCult.Ui; [GenerateTypedNameReferences] public sealed partial class RunesMenu : RadialMenu { - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IPrototypeManager _proto = default!; public event Action? OnRuneSelected; diff --git a/Content.Client/_Wega/BloodCult/Ui/SummoningRuneMenu.xaml.cs b/Content.Client/_Wega/BloodCult/Ui/SummoningRuneMenu.xaml.cs index b036a7b36c..9864b39466 100644 --- a/Content.Client/_Wega/BloodCult/Ui/SummoningRuneMenu.xaml.cs +++ b/Content.Client/_Wega/BloodCult/Ui/SummoningRuneMenu.xaml.cs @@ -10,7 +10,7 @@ namespace Content.Client._Wega.BloodCult.Ui; [GenerateTypedNameReferences] public sealed partial class SummoningRuneMenu : FancyWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; public event Action? OnCultistSelected; diff --git a/Content.Client/_Wega/CardTarot/CardTarotSystem.cs b/Content.Client/_Wega/CardTarot/CardTarotSystem.cs index 98966034aa..390c561ea2 100644 --- a/Content.Client/_Wega/CardTarot/CardTarotSystem.cs +++ b/Content.Client/_Wega/CardTarot/CardTarotSystem.cs @@ -6,8 +6,8 @@ namespace Content.Client.Card.Tarot; public sealed class CardTarotSystem : EntitySystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/Crayon/CrayonPreviewOverlay.cs b/Content.Client/_Wega/Crayon/CrayonPreviewOverlay.cs index 52f4712201..86996b2b9d 100644 --- a/Content.Client/_Wega/Crayon/CrayonPreviewOverlay.cs +++ b/Content.Client/_Wega/Crayon/CrayonPreviewOverlay.cs @@ -13,11 +13,11 @@ namespace Content.Client.Crayon; public sealed class CrayonPreviewOverlay : Overlay { - [Dependency] private readonly IInputManager _input = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IEyeManager _eye = default!; - [Dependency] private readonly IEntityManager _entMan = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IInputManager _input = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IEyeManager _eye = default!; + [Dependency] private IEntityManager _entMan = default!; + [Dependency] private IPrototypeManager _proto = default!; private readonly SpriteSystem _sprite; diff --git a/Content.Client/_Wega/DetailExaminable/DetailExaminableEui.cs b/Content.Client/_Wega/DetailExaminable/DetailExaminableEui.cs index eb17d6a58e..084382d0a7 100644 --- a/Content.Client/_Wega/DetailExaminable/DetailExaminableEui.cs +++ b/Content.Client/_Wega/DetailExaminable/DetailExaminableEui.cs @@ -7,7 +7,7 @@ namespace Content.Client._Wega.DetailExaminable; public sealed class DetailExaminableEui : BaseEui { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private readonly DetailExaminableWindow _window; diff --git a/Content.Client/_Wega/Dirt/DirtVisualsSystem.cs b/Content.Client/_Wega/Dirt/DirtVisualsSystem.cs index 7ae786095c..04ca1fc211 100644 --- a/Content.Client/_Wega/Dirt/DirtVisualsSystem.cs +++ b/Content.Client/_Wega/Dirt/DirtVisualsSystem.cs @@ -10,9 +10,9 @@ namespace Content.Client.DirtVisuals; public sealed class DirtVisualsSystem : EntitySystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly ClientClothingSystem _clothing = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private ClientClothingSystem _clothing = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/Dirt/ShowerSystem.cs b/Content.Client/_Wega/Dirt/ShowerSystem.cs index f3bc3b08de..7523f7789f 100644 --- a/Content.Client/_Wega/Dirt/ShowerSystem.cs +++ b/Content.Client/_Wega/Dirt/ShowerSystem.cs @@ -6,8 +6,8 @@ namespace Content.Client.Shower { public sealed class ShowerSystem : EntitySystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/Dirt/WashingMachineSystem.cs b/Content.Client/_Wega/Dirt/WashingMachineSystem.cs index 225a8970c0..a8e6e19b64 100644 --- a/Content.Client/_Wega/Dirt/WashingMachineSystem.cs +++ b/Content.Client/_Wega/Dirt/WashingMachineSystem.cs @@ -6,8 +6,8 @@ namespace Content.Client.WashingMachine { public sealed class WashingMachineSystem : EntitySystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { @@ -26,4 +26,4 @@ namespace Content.Client.WashingMachine _sprite.LayerSetVisible(uid, WashingMachineVisuals.Washing, washing); } } -} \ No newline at end of file +} diff --git a/Content.Client/_Wega/GPS/UI/GpsNavMapControl.cs b/Content.Client/_Wega/GPS/UI/GpsNavMapControl.cs index 252f6a38c1..1674ca8ba6 100644 --- a/Content.Client/_Wega/GPS/UI/GpsNavMapControl.cs +++ b/Content.Client/_Wega/GPS/UI/GpsNavMapControl.cs @@ -14,8 +14,8 @@ namespace Content.Client._Wega.GPS.UI; public sealed class GpsNavMapControl : Control { - [Dependency] private readonly IResourceCache _resourceCache = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private IEntityManager _entityManager = default!; private EntityUid? _mapUid; private List _gpsDevices = new(); diff --git a/Content.Client/_Wega/Genetics/Systems/Disease/DizzyOverlay.cs b/Content.Client/_Wega/Genetics/Systems/Disease/DizzyOverlay.cs index adde11b1db..892181b62d 100644 --- a/Content.Client/_Wega/Genetics/Systems/Disease/DizzyOverlay.cs +++ b/Content.Client/_Wega/Genetics/Systems/Disease/DizzyOverlay.cs @@ -9,9 +9,9 @@ namespace Content.Client.Genetics.System; public sealed class DizzyOverlay : Overlay { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private static readonly ProtoId Dizzy = "Dizzy"; public override OverlaySpace Space => OverlaySpace.WorldSpace; diff --git a/Content.Client/_Wega/Genetics/Systems/Disease/DizzySystem.cs b/Content.Client/_Wega/Genetics/Systems/Disease/DizzySystem.cs index 1eee040a33..d95bf20fe6 100644 --- a/Content.Client/_Wega/Genetics/Systems/Disease/DizzySystem.cs +++ b/Content.Client/_Wega/Genetics/Systems/Disease/DizzySystem.cs @@ -7,8 +7,8 @@ namespace Content.Client.Genetics.System; public sealed class DizzySystem : EntitySystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private DizzyOverlay _overlay = default!; diff --git a/Content.Client/_Wega/Genetics/Ui/DnaModifierWindow.xaml.cs b/Content.Client/_Wega/Genetics/Ui/DnaModifierWindow.xaml.cs index 5da4806f38..7c39c49c55 100644 --- a/Content.Client/_Wega/Genetics/Ui/DnaModifierWindow.xaml.cs +++ b/Content.Client/_Wega/Genetics/Ui/DnaModifierWindow.xaml.cs @@ -20,10 +20,10 @@ namespace Content.Client._Wega.Genetics.Ui; [GenerateTypedNameReferences] public sealed partial class DnaModifierWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IEntityNetworkManager _entNetworkManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IEntityNetworkManager _entNetworkManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private static TimeSpan? _releverationsButtonCooldown; private static TimeSpan? _releveration1ButtonCooldown; diff --git a/Content.Client/_Wega/Genetics/Ui/MindCommunicationPanel.cs b/Content.Client/_Wega/Genetics/Ui/MindCommunicationPanel.cs index d2a3317c9a..b1e256e763 100644 --- a/Content.Client/_Wega/Genetics/Ui/MindCommunicationPanel.cs +++ b/Content.Client/_Wega/Genetics/Ui/MindCommunicationPanel.cs @@ -12,9 +12,9 @@ namespace Content.Client._Wega.Genetics.Ui; [GenerateTypedNameReferences] public sealed partial class MindCommunicationPanel : DefaultWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IEntityNetworkManager _entityNetworkManager = default!; - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IEntityNetworkManager _entityNetworkManager = default!; + [Dependency] private ISharedPlayerManager _playerManager = default!; public MindCommunicationPanel() { diff --git a/Content.Client/_Wega/Genetics/Ui/MindCommunicationUIController.cs b/Content.Client/_Wega/Genetics/Ui/MindCommunicationUIController.cs index b5c129203e..067edbfeb2 100644 --- a/Content.Client/_Wega/Genetics/Ui/MindCommunicationUIController.cs +++ b/Content.Client/_Wega/Genetics/Ui/MindCommunicationUIController.cs @@ -8,8 +8,8 @@ namespace Content.Client._Wega.Genetics.Ui; public sealed class MindCommunicationUIController : UIController { - [Dependency] private readonly IUserInterfaceManager _uiManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IUserInterfaceManager _uiManager = default!; + [Dependency] private IEntityManager _entityManager = default!; private MindCommunicationPanel? _panel; private bool _panelDisposed = false; diff --git a/Content.Client/_Wega/Humanoid/HumanoidHeightSystem.cs b/Content.Client/_Wega/Humanoid/HumanoidHeightSystem.cs index e86abdab22..3dcf82da6a 100644 --- a/Content.Client/_Wega/Humanoid/HumanoidHeightSystem.cs +++ b/Content.Client/_Wega/Humanoid/HumanoidHeightSystem.cs @@ -6,7 +6,7 @@ namespace Content.Client.Humanoid; public sealed class HumanoidHeightSystem : EntitySystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/ItemSelector/ItemSelectorBoundUserInterface.cs b/Content.Client/_Wega/ItemSelector/ItemSelectorBoundUserInterface.cs index 3c31870b73..2f492a1c4b 100644 --- a/Content.Client/_Wega/ItemSelector/ItemSelectorBoundUserInterface.cs +++ b/Content.Client/_Wega/ItemSelector/ItemSelectorBoundUserInterface.cs @@ -8,7 +8,7 @@ namespace Content.Client._Wega.Item.Selector.UI; [UsedImplicitly] public sealed class ItemSelectorBoundUserInterface : BoundUserInterface { - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private ISharedPlayerManager _playerManager = default!; [ViewVariables] private ItemSelectorWindow? _window; diff --git a/Content.Client/_Wega/ItemSelector/ItemSelectorWindow.xaml.cs b/Content.Client/_Wega/ItemSelector/ItemSelectorWindow.xaml.cs index 5c992813df..da5e85107a 100644 --- a/Content.Client/_Wega/ItemSelector/ItemSelectorWindow.xaml.cs +++ b/Content.Client/_Wega/ItemSelector/ItemSelectorWindow.xaml.cs @@ -11,7 +11,7 @@ namespace Content.Client._Wega.Item.Selector.UI; [GenerateTypedNameReferences] public sealed partial class ItemSelectorWindow : RadialMenu { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public event Action? OnItemSelected; diff --git a/Content.Client/_Wega/ItemSelector/ObjectSelectorWindow.xaml.cs b/Content.Client/_Wega/ItemSelector/ObjectSelectorWindow.xaml.cs index 7c756469dc..b8608009ac 100644 --- a/Content.Client/_Wega/ItemSelector/ObjectSelectorWindow.xaml.cs +++ b/Content.Client/_Wega/ItemSelector/ObjectSelectorWindow.xaml.cs @@ -11,7 +11,7 @@ namespace Content.Client._Wega.Item.Selector.UI; [GenerateTypedNameReferences] public sealed partial class ObjectSelectorWindow : RadialMenu { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public event Action? OnObjectSelected; diff --git a/Content.Client/_Wega/Lavaland/LavalandConsoleWindow.xaml.cs b/Content.Client/_Wega/Lavaland/LavalandConsoleWindow.xaml.cs index 7c5eacd857..55f95e49f6 100644 --- a/Content.Client/_Wega/Lavaland/LavalandConsoleWindow.xaml.cs +++ b/Content.Client/_Wega/Lavaland/LavalandConsoleWindow.xaml.cs @@ -9,7 +9,7 @@ namespace Content.Client._Wega.Lavaland; [GenerateTypedNameReferences] public sealed partial class LavalandConsoleWindow : FancyWindow { - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; public Action? OnCallButtonPressed; private TimeSpan? _cooldownEndTime; diff --git a/Content.Client/_Wega/Lavaland/LavalandPenalServitudeConsoleWindow.xaml.cs b/Content.Client/_Wega/Lavaland/LavalandPenalServitudeConsoleWindow.xaml.cs index d8ea43d554..21e2013b0b 100644 --- a/Content.Client/_Wega/Lavaland/LavalandPenalServitudeConsoleWindow.xaml.cs +++ b/Content.Client/_Wega/Lavaland/LavalandPenalServitudeConsoleWindow.xaml.cs @@ -9,7 +9,7 @@ namespace Content.Client._Wega.Lavaland; [GenerateTypedNameReferences] public sealed partial class LavalandPenalServitudeConsoleWindow : FancyWindow { - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; public Action? OnCallButtonPressed; private TimeSpan? _cooldownEndTime; diff --git a/Content.Client/_Wega/Lavaland/UtilityVendorMenu.xaml.cs b/Content.Client/_Wega/Lavaland/UtilityVendorMenu.xaml.cs index c666353715..3e19744284 100644 --- a/Content.Client/_Wega/Lavaland/UtilityVendorMenu.xaml.cs +++ b/Content.Client/_Wega/Lavaland/UtilityVendorMenu.xaml.cs @@ -15,8 +15,8 @@ namespace Content.Client._Wega.Lavaland; [GenerateTypedNameReferences] public sealed partial class UtilityVendorMenu : FancyWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IDependencyCollection _dependencies = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IDependencyCollection _dependencies = default!; public event Action? OnPurchase; diff --git a/Content.Client/_Wega/Medical/InjectorFabticatorVisualsSystem.cs b/Content.Client/_Wega/Medical/InjectorFabticatorVisualsSystem.cs index 7bbcdb980e..e898ffdb39 100644 --- a/Content.Client/_Wega/Medical/InjectorFabticatorVisualsSystem.cs +++ b/Content.Client/_Wega/Medical/InjectorFabticatorVisualsSystem.cs @@ -3,8 +3,8 @@ using Robust.Client.GameObjects; public sealed class InjectorFabticatorSystem : EntitySystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/Medical/Ui/InjectorFabticatorWindow.xaml.cs b/Content.Client/_Wega/Medical/Ui/InjectorFabticatorWindow.xaml.cs index d7d96f91f0..4c25a15cd8 100644 --- a/Content.Client/_Wega/Medical/Ui/InjectorFabticatorWindow.xaml.cs +++ b/Content.Client/_Wega/Medical/Ui/InjectorFabticatorWindow.xaml.cs @@ -14,8 +14,8 @@ namespace Content.Client._Wega.Medical.Ui; [GenerateTypedNameReferences] public sealed partial class InjectorFabticatorWindow : FancyWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; public event Action? EjectButtonPressed; public event Action? ProduceButtonPressed; diff --git a/Content.Client/_Wega/ModularSuit/Ui/ModularSuitWindow.xaml.cs b/Content.Client/_Wega/ModularSuit/Ui/ModularSuitWindow.xaml.cs index d5b780e0ec..599c5eb906 100644 --- a/Content.Client/_Wega/ModularSuit/Ui/ModularSuitWindow.xaml.cs +++ b/Content.Client/_Wega/ModularSuit/Ui/ModularSuitWindow.xaml.cs @@ -12,7 +12,7 @@ namespace Content.Client._Wega.ModularSuit.Ui; [GenerateTypedNameReferences] public sealed partial class ModularSuitWindow : BaseWindow { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; private Dictionary _moduleControls = new(); private Dictionary _partControls = new(); diff --git a/Content.Client/_Wega/NullRod/NullDamageOverlay.cs b/Content.Client/_Wega/NullRod/NullDamageOverlay.cs index f8f188188e..79dc5ce840 100644 --- a/Content.Client/_Wega/NullRod/NullDamageOverlay.cs +++ b/Content.Client/_Wega/NullRod/NullDamageOverlay.cs @@ -9,10 +9,10 @@ namespace Content.Client.NullRod; public sealed class NullDamageOverlay : Overlay { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; private static readonly ProtoId NullDamageShader = "NullDamage"; public override OverlaySpace Space => OverlaySpace.ScreenSpace; diff --git a/Content.Client/_Wega/NullRod/NullDamageSystem.cs b/Content.Client/_Wega/NullRod/NullDamageSystem.cs index 656c1bba94..923f11a7bb 100644 --- a/Content.Client/_Wega/NullRod/NullDamageSystem.cs +++ b/Content.Client/_Wega/NullRod/NullDamageSystem.cs @@ -7,8 +7,8 @@ namespace Content.Client.NullRod; public sealed class NullDamageSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private NullDamageOverlay _overlay = default!; diff --git a/Content.Client/_Wega/Offer/OfferItemIndicatorsOverlay.cs b/Content.Client/_Wega/Offer/OfferItemIndicatorsOverlay.cs index 318912d4fb..be41f0b642 100644 --- a/Content.Client/_Wega/Offer/OfferItemIndicatorsOverlay.cs +++ b/Content.Client/_Wega/Offer/OfferItemIndicatorsOverlay.cs @@ -9,8 +9,8 @@ namespace Content.Client.Offer; public sealed class OfferItemIndicatorsOverlay : Overlay { - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IPlayerManager _player = default!; private readonly Texture _indicatorTexture; diff --git a/Content.Client/_Wega/Offer/OfferItemSystem.cs b/Content.Client/_Wega/Offer/OfferItemSystem.cs index cf63bafd8f..b54bc262bd 100644 --- a/Content.Client/_Wega/Offer/OfferItemSystem.cs +++ b/Content.Client/_Wega/Offer/OfferItemSystem.cs @@ -7,8 +7,8 @@ namespace Content.Client.Offer; public sealed class OfferItemSystem : SharedOfferItemSystem { - [Dependency] private readonly IOverlayManager _overlay = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlay = default!; + [Dependency] private IPlayerManager _player = default!; private OfferItemIndicatorsOverlay? _overlayInstance; diff --git a/Content.Client/_Wega/Overlays/ColourblindnessOverlay.cs b/Content.Client/_Wega/Overlays/ColourblindnessOverlay.cs index 40c8cd131a..4bbb20c0da 100644 --- a/Content.Client/_Wega/Overlays/ColourblindnessOverlay.cs +++ b/Content.Client/_Wega/Overlays/ColourblindnessOverlay.cs @@ -8,9 +8,9 @@ namespace Content.Client.Shaders.Systems; public sealed class ColourblindnessOverlay : Overlay { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private static readonly ProtoId Colourblindness = "Colourblindness"; public override OverlaySpace Space => OverlaySpace.ScreenSpace; diff --git a/Content.Client/_Wega/Overlays/ColourblindnessSystem.cs b/Content.Client/_Wega/Overlays/ColourblindnessSystem.cs index bc4d2e0864..222d2a79ef 100644 --- a/Content.Client/_Wega/Overlays/ColourblindnessSystem.cs +++ b/Content.Client/_Wega/Overlays/ColourblindnessSystem.cs @@ -8,8 +8,8 @@ namespace Content.Client.Shaders.System; public sealed class ColourblindnessSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private ColourblindnessOverlay _overlay = default!; diff --git a/Content.Client/_Wega/Overlays/ListenUpOverlay.cs b/Content.Client/_Wega/Overlays/ListenUpOverlay.cs index 5cd49c9b95..2253a88e52 100644 --- a/Content.Client/_Wega/Overlays/ListenUpOverlay.cs +++ b/Content.Client/_Wega/Overlays/ListenUpOverlay.cs @@ -14,8 +14,8 @@ namespace Content.Client._Wega.Overlays; public sealed class ListenUpOverlay : Overlay { - [Dependency] private readonly IEntityManager _entity = default!; - [Dependency] private readonly IPlayerManager _players = default!; + [Dependency] private IEntityManager _entity = default!; + [Dependency] private IPlayerManager _players = default!; private readonly EntityLookupSystem _entityLookup; private readonly TransformSystem _transformSystem; diff --git a/Content.Client/_Wega/Overlays/ListenUpSystem.cs b/Content.Client/_Wega/Overlays/ListenUpSystem.cs index cce6454bab..23a2cd9067 100644 --- a/Content.Client/_Wega/Overlays/ListenUpSystem.cs +++ b/Content.Client/_Wega/Overlays/ListenUpSystem.cs @@ -8,8 +8,8 @@ namespace Content.Client._Wega.Overlays; public sealed class ListenUpSystem : SharedListenUpSkillSystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private ListenUpOverlay _listenUpOverlay = default!; diff --git a/Content.Client/_Wega/Overlays/RaveOverlay.cs b/Content.Client/_Wega/Overlays/RaveOverlay.cs index b706c1b0fa..9b586f7ec8 100644 --- a/Content.Client/_Wega/Overlays/RaveOverlay.cs +++ b/Content.Client/_Wega/Overlays/RaveOverlay.cs @@ -8,8 +8,8 @@ namespace Content.Client.Overlays; public sealed partial class RaveOverlay : Overlay { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; private static readonly ProtoId Shader = "Rave"; diff --git a/Content.Client/_Wega/Overlays/RaveOverlaySystem.cs b/Content.Client/_Wega/Overlays/RaveOverlaySystem.cs index 182767ab3e..1a0fc99ebc 100644 --- a/Content.Client/_Wega/Overlays/RaveOverlaySystem.cs +++ b/Content.Client/_Wega/Overlays/RaveOverlaySystem.cs @@ -6,7 +6,7 @@ namespace Content.Client.Overlays; public sealed partial class RaveOverlaySystem : EquipmentHudSystem { - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private RaveOverlay _overlay = default!; diff --git a/Content.Client/_Wega/Posing/PosingSystem.cs b/Content.Client/_Wega/Posing/PosingSystem.cs index e1375dd75f..72daa4f3fb 100644 --- a/Content.Client/_Wega/Posing/PosingSystem.cs +++ b/Content.Client/_Wega/Posing/PosingSystem.cs @@ -9,9 +9,9 @@ namespace Content.Client.Posing; public sealed partial class PosingSystem : SharedPosingSystem { - [Dependency] private readonly IInputManager _input = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IInputManager _input = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private SpriteSystem _sprite = default!; private readonly Dictionary NaturalNightVision = "NaturalNightVision"; public override OverlaySpace Space => OverlaySpace.WorldSpace; diff --git a/Content.Client/_Wega/Shader/NaturalNightVisionSystem.cs b/Content.Client/_Wega/Shader/NaturalNightVisionSystem.cs index dd86e22932..9b2245a9e8 100644 --- a/Content.Client/_Wega/Shader/NaturalNightVisionSystem.cs +++ b/Content.Client/_Wega/Shader/NaturalNightVisionSystem.cs @@ -9,10 +9,10 @@ namespace Content.Client.Shaders.Systems; public sealed class NaturalNightVisionSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IOverlayManager _overlayManager = default!; - [Dependency] private readonly ILightManager _lightManager = default!; - [Dependency] private readonly SharedActionsSystem _action = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IOverlayManager _overlayManager = default!; + [Dependency] private ILightManager _lightManager = default!; + [Dependency] private SharedActionsSystem _action = default!; private NaturalNightVisionOverlay _overlay = default!; diff --git a/Content.Client/_Wega/Shader/NightVisionOverlay.cs b/Content.Client/_Wega/Shader/NightVisionOverlay.cs index c963481a60..261bcdc88e 100644 --- a/Content.Client/_Wega/Shader/NightVisionOverlay.cs +++ b/Content.Client/_Wega/Shader/NightVisionOverlay.cs @@ -10,10 +10,10 @@ namespace Content.Client.Shaders.Systems; public sealed class NightVisionOverlay : Overlay { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; private static readonly ProtoId NightVision = "NightVision"; public override OverlaySpace Space => OverlaySpace.WorldSpace; diff --git a/Content.Client/_Wega/Shader/NightVisionSystem.cs b/Content.Client/_Wega/Shader/NightVisionSystem.cs index 81148254ff..0cb56f18f7 100644 --- a/Content.Client/_Wega/Shader/NightVisionSystem.cs +++ b/Content.Client/_Wega/Shader/NightVisionSystem.cs @@ -8,8 +8,8 @@ namespace Content.Client.Shaders.Systems; public sealed class NightVisionSystem : ToggleableEquipmentHudSystem { - [Dependency] private readonly IOverlayManager _overlayMan = default!; - [Dependency] private readonly ILightManager _lightManager = default!; + [Dependency] private IOverlayManager _overlayMan = default!; + [Dependency] private ILightManager _lightManager = default!; private NightVisionOverlay _overlay = default!; diff --git a/Content.Client/_Wega/Shader/NoirVisionOverlay.cs b/Content.Client/_Wega/Shader/NoirVisionOverlay.cs index 5f2d3ea9b7..dcdead36c3 100644 --- a/Content.Client/_Wega/Shader/NoirVisionOverlay.cs +++ b/Content.Client/_Wega/Shader/NoirVisionOverlay.cs @@ -8,9 +8,9 @@ namespace Content.Client.Shaders.Systems; public sealed class NoirVisionOverlay : Overlay { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private static readonly ProtoId Noir = "Noir"; public override OverlaySpace Space => OverlaySpace.WorldSpace; diff --git a/Content.Client/_Wega/Shader/NoirVisionSystem.cs b/Content.Client/_Wega/Shader/NoirVisionSystem.cs index 7e3948df21..667866a64c 100644 --- a/Content.Client/_Wega/Shader/NoirVisionSystem.cs +++ b/Content.Client/_Wega/Shader/NoirVisionSystem.cs @@ -9,8 +9,8 @@ namespace Content.Client.Shaders.System; public sealed class NoirVisionSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private NoirVisionOverlay _overlay = default!; diff --git a/Content.Client/_Wega/Surgery/Ui/SurgeryBoundUserInterface.cs b/Content.Client/_Wega/Surgery/Ui/SurgeryBoundUserInterface.cs index 85e7434fef..e51ec4d455 100644 --- a/Content.Client/_Wega/Surgery/Ui/SurgeryBoundUserInterface.cs +++ b/Content.Client/_Wega/Surgery/Ui/SurgeryBoundUserInterface.cs @@ -9,7 +9,7 @@ namespace Content.Client._Wega.Surgery.Ui; [UsedImplicitly] public sealed class SurgeryBoundUserInterface : BoundUserInterface { - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private ISharedPlayerManager _playerManager = default!; [ViewVariables] private SurgeryWindow? _window; diff --git a/Content.Client/_Wega/TapeRecorder/Ui/TapeRecorderBoundUserInterface.cs b/Content.Client/_Wega/TapeRecorder/Ui/TapeRecorderBoundUserInterface.cs index 1003737025..1b3ca0f4e0 100644 --- a/Content.Client/_Wega/TapeRecorder/Ui/TapeRecorderBoundUserInterface.cs +++ b/Content.Client/_Wega/TapeRecorder/Ui/TapeRecorderBoundUserInterface.cs @@ -6,7 +6,7 @@ namespace Content.Client.TapeRecorder.Ui; public sealed class TapeRecorderBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey) { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; [ViewVariables] private TapeRecorderWindow? _window; diff --git a/Content.Client/_Wega/Vampire/Ui/DissectSelectionMenu.xaml.cs b/Content.Client/_Wega/Vampire/Ui/DissectSelectionMenu.xaml.cs index cf249f3917..f50a5d4ab5 100644 --- a/Content.Client/_Wega/Vampire/Ui/DissectSelectionMenu.xaml.cs +++ b/Content.Client/_Wega/Vampire/Ui/DissectSelectionMenu.xaml.cs @@ -11,8 +11,8 @@ namespace Content.Client._Wega.Vampire.Ui; [GenerateTypedNameReferences] public sealed partial class DissectSelectionMenu : RadialMenu { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototype = default!; public event Action? OnOrganSelected; diff --git a/Content.Client/_Wega/Vampire/Ui/TrophiesMenu.xaml.cs b/Content.Client/_Wega/Vampire/Ui/TrophiesMenu.xaml.cs index 4c5c1cda41..cda058bf1b 100644 --- a/Content.Client/_Wega/Vampire/Ui/TrophiesMenu.xaml.cs +++ b/Content.Client/_Wega/Vampire/Ui/TrophiesMenu.xaml.cs @@ -16,7 +16,7 @@ namespace Content.Client._Wega.Vampire.Ui; [GenerateTypedNameReferences] public sealed partial class TrophiesMenu : FancyWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; private readonly SpriteSystem _spriteSystem; private static readonly Dictionary DefaultOrganProto = new() diff --git a/Content.Client/_Wega/Vampire/VampireSystem.cs b/Content.Client/_Wega/Vampire/VampireSystem.cs index d8f549496e..1662259568 100644 --- a/Content.Client/_Wega/Vampire/VampireSystem.cs +++ b/Content.Client/_Wega/Vampire/VampireSystem.cs @@ -14,11 +14,11 @@ namespace Content.Client.Vampire; public sealed class VampireSystem : SharedVampireSystem { - [Dependency] private readonly GhostSystem? _ghost = default; - [Dependency] private readonly IClientAdminManager _admin = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private GhostSystem? _ghost = default; + [Dependency] private IClientAdminManager _admin = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/Vehicle/VehicleSystem.cs b/Content.Client/_Wega/Vehicle/VehicleSystem.cs index d8f13699e3..265ebe7b19 100644 --- a/Content.Client/_Wega/Vehicle/VehicleSystem.cs +++ b/Content.Client/_Wega/Vehicle/VehicleSystem.cs @@ -6,7 +6,7 @@ namespace Content.Client.Vehicle; public sealed class VehicleSystem : SharedVehicleSystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/VeilCult/UI/EnchantWindow.xaml.cs b/Content.Client/_Wega/VeilCult/UI/EnchantWindow.xaml.cs index df62f04102..0c280b3fdb 100644 --- a/Content.Client/_Wega/VeilCult/UI/EnchantWindow.xaml.cs +++ b/Content.Client/_Wega/VeilCult/UI/EnchantWindow.xaml.cs @@ -11,7 +11,7 @@ namespace Content.Client._Wega.VeilCult.UI; [GenerateTypedNameReferences] public sealed partial class EnchantWindow : RadialMenu { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public event Action? OnEnchantSelected; private List _enchants = new(); diff --git a/Content.Client/_Wega/VeilCult/VeilCultSystem.cs b/Content.Client/_Wega/VeilCult/VeilCultSystem.cs index 22973e2a77..ecde6f4eb3 100644 --- a/Content.Client/_Wega/VeilCult/VeilCultSystem.cs +++ b/Content.Client/_Wega/VeilCult/VeilCultSystem.cs @@ -9,8 +9,8 @@ namespace Content.Client.Veil.Cult { public sealed class VeilCultSystem : SharedVeilCultSystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/VentCraw/VentCrawVisionSystem.cs b/Content.Client/_Wega/VentCraw/VentCrawVisionSystem.cs index 3f96be928c..a1aae8f2fa 100644 --- a/Content.Client/_Wega/VentCraw/VentCrawVisionSystem.cs +++ b/Content.Client/_Wega/VentCraw/VentCrawVisionSystem.cs @@ -7,9 +7,9 @@ namespace Content.Client.VentCraw; public sealed class VentCrawVisionSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly SubFloorHideSystem _subFloorHideSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private SubFloorHideSystem _subFloorHideSystem = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/Visuals/FadeSystem.cs b/Content.Client/_Wega/Visuals/FadeSystem.cs index 30c70fc02e..16b5e4184d 100644 --- a/Content.Client/_Wega/Visuals/FadeSystem.cs +++ b/Content.Client/_Wega/Visuals/FadeSystem.cs @@ -6,8 +6,8 @@ namespace Content.Client.Visuals; public sealed class FadeSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/Visuals/VisualStateSystem.cs b/Content.Client/_Wega/Visuals/VisualStateSystem.cs index df0a6183f0..d192d7454b 100644 --- a/Content.Client/_Wega/Visuals/VisualStateSystem.cs +++ b/Content.Client/_Wega/Visuals/VisualStateSystem.cs @@ -14,7 +14,7 @@ namespace Content.Client.Visuals; /// public sealed class VisualStateSystem : VisualizerSystem { - [Dependency] private readonly SharedItemSystem _item = default!; + [Dependency] private SharedItemSystem _item = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/Voucher/VoucherBoundUserInterface.cs b/Content.Client/_Wega/Voucher/VoucherBoundUserInterface.cs index 695ce5de6b..570079ac46 100644 --- a/Content.Client/_Wega/Voucher/VoucherBoundUserInterface.cs +++ b/Content.Client/_Wega/Voucher/VoucherBoundUserInterface.cs @@ -10,8 +10,8 @@ namespace Content.Client._Wega.Voucher; [UsedImplicitly] public sealed class VoucherBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IEntityManager _entMan = default!; - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private IEntityManager _entMan = default!; + [Dependency] private ISharedPlayerManager _playerManager = default!; [ViewVariables] private VoucherKitWindow? _window; diff --git a/Content.Client/_Wega/Voucher/VoucherKitWindow.xaml.cs b/Content.Client/_Wega/Voucher/VoucherKitWindow.xaml.cs index d35434822d..efbc455273 100644 --- a/Content.Client/_Wega/Voucher/VoucherKitWindow.xaml.cs +++ b/Content.Client/_Wega/Voucher/VoucherKitWindow.xaml.cs @@ -13,8 +13,8 @@ namespace Content.Client._Wega.Voucher; [GenerateTypedNameReferences] public sealed partial class VoucherKitWindow : RadialMenu { - [Dependency] private readonly IEntityManager _entMan = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IEntityManager _entMan = default!; + [Dependency] private IPrototypeManager _prototype = default!; private readonly SpriteSystem _sprite; public event Action>? OnKitSelected; diff --git a/Content.Client/_Wega/Xenobiology/CellVisualsSystem.cs b/Content.Client/_Wega/Xenobiology/CellVisualsSystem.cs index 32f36b1556..885b1e0531 100644 --- a/Content.Client/_Wega/Xenobiology/CellVisualsSystem.cs +++ b/Content.Client/_Wega/Xenobiology/CellVisualsSystem.cs @@ -7,7 +7,7 @@ namespace Content.Client._Wega.Xenobiology; public sealed class CellVisualsSystem : SharedCellVisualsSystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/Xenobiology/SlimeVisualSystem.cs b/Content.Client/_Wega/Xenobiology/SlimeVisualSystem.cs index 1b53f63a96..437f31107a 100644 --- a/Content.Client/_Wega/Xenobiology/SlimeVisualSystem.cs +++ b/Content.Client/_Wega/Xenobiology/SlimeVisualSystem.cs @@ -8,8 +8,8 @@ namespace Content.Client._Wega.Xenobiology; public sealed class SlimeVisualSystem : SharedSlimeVisualSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/_Wega/Xenobiology/UI/CellSequencerWindow.xaml.cs b/Content.Client/_Wega/Xenobiology/UI/CellSequencerWindow.xaml.cs index ec96232bc4..7bf832416a 100644 --- a/Content.Client/_Wega/Xenobiology/UI/CellSequencerWindow.xaml.cs +++ b/Content.Client/_Wega/Xenobiology/UI/CellSequencerWindow.xaml.cs @@ -11,7 +11,7 @@ namespace Content.Client._Wega.Xenobiology.UI; [GenerateTypedNameReferences] public sealed partial class CellSequencerWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entity = default!; + [Dependency] private IEntityManager _entity = default!; private readonly CellSystem _cell; diff --git a/Content.Client/_Wega/Xenobiology/UI/CellularFusionWindow.xaml.cs b/Content.Client/_Wega/Xenobiology/UI/CellularFusionWindow.xaml.cs index d248ec03fc..f89d0aef63 100644 --- a/Content.Client/_Wega/Xenobiology/UI/CellularFusionWindow.xaml.cs +++ b/Content.Client/_Wega/Xenobiology/UI/CellularFusionWindow.xaml.cs @@ -12,7 +12,7 @@ namespace Content.Client._Wega.Xenobiology.UI; [GenerateTypedNameReferences] public sealed partial class CellularFusionWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entity = default!; + [Dependency] private IEntityManager _entity = default!; private readonly CellSystem _cell; diff --git a/Content.Client/_Wega/Xenobiology/UI/SlimeAnalyzerWindow.xaml.cs b/Content.Client/_Wega/Xenobiology/UI/SlimeAnalyzerWindow.xaml.cs index 3a0394c12f..9e0dfd9d5a 100644 --- a/Content.Client/_Wega/Xenobiology/UI/SlimeAnalyzerWindow.xaml.cs +++ b/Content.Client/_Wega/Xenobiology/UI/SlimeAnalyzerWindow.xaml.cs @@ -11,7 +11,7 @@ namespace Content.Client._Wega.Xenobiology.UI; [GenerateTypedNameReferences] public sealed partial class SlimeAnalyzerWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; public SlimeAnalyzerWindow() { diff --git a/Content.Server/_Wega/Achievements/AchievementsSystem.cs b/Content.Server/_Wega/Achievements/AchievementsSystem.cs index 74b195d122..3447470e47 100644 --- a/Content.Server/_Wega/Achievements/AchievementsSystem.cs +++ b/Content.Server/_Wega/Achievements/AchievementsSystem.cs @@ -6,7 +6,7 @@ namespace Content.Server.Achievements; public sealed partial class AchievementsSystem : SharedAchievementsSystem { - [Dependency] private readonly IServerDbManager _db = default!; + [Dependency] private IServerDbManager _db = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Administration/Commands/AchievementsCommands.cs b/Content.Server/_Wega/Administration/Commands/AchievementsCommands.cs index e93d83a16d..9b61c627b4 100644 --- a/Content.Server/_Wega/Administration/Commands/AchievementsCommands.cs +++ b/Content.Server/_Wega/Administration/Commands/AchievementsCommands.cs @@ -14,9 +14,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Permissions)] public sealed class AchievementsGrantCommand : IConsoleCommand { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IServerDbManager _db = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IServerDbManager _db = default!; public string Command => "achievements_grant"; public string Description => Loc.GetString("cmd-achievements_grant-desc"); @@ -102,9 +102,9 @@ public sealed class AchievementsGrantCommand : IConsoleCommand [AdminCommand(AdminFlags.Permissions)] public sealed class AchievementsRevokeCommand : IConsoleCommand { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IServerDbManager _db = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IServerDbManager _db = default!; public string Command => "achievements_revoke"; public string Description => Loc.GetString("cmd-achievements_revoke-desc"); @@ -195,9 +195,9 @@ public sealed class AchievementsRevokeCommand : IConsoleCommand [AdminCommand(AdminFlags.Permissions)] public sealed class AchievementsGrantAllCommand : IConsoleCommand { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IServerDbManager _db = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IServerDbManager _db = default!; public string Command => "achievements_grantall"; public string Description => Loc.GetString("cmd-achievements_grantall-desc"); @@ -250,8 +250,8 @@ public sealed class AchievementsGrantAllCommand : IConsoleCommand [AdminCommand(AdminFlags.Permissions)] public sealed class AchievementsClearCommand : IConsoleCommand { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IServerDbManager _db = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IServerDbManager _db = default!; public string Command => "achievements_clear"; public string Description => Loc.GetString("cmd-achievements_clear-desc"); @@ -295,9 +295,9 @@ public sealed class AchievementsClearCommand : IConsoleCommand [AdminCommand(AdminFlags.Admin)] public sealed class AchievementsListCommand : IConsoleCommand { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IServerDbManager _db = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IServerDbManager _db = default!; public string Command => "achievements_list"; public string Description => Loc.GetString("cmd-achievements_list-desc"); diff --git a/Content.Server/_Wega/Administration/Commands/TimePackCommand.cs b/Content.Server/_Wega/Administration/Commands/TimePackCommand.cs index 5945b37060..c734041d06 100644 --- a/Content.Server/_Wega/Administration/Commands/TimePackCommand.cs +++ b/Content.Server/_Wega/Administration/Commands/TimePackCommand.cs @@ -10,9 +10,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Permissions)] public sealed class TimePackCommand : IConsoleCommand { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly IPlayerLocator _locator = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private IPlayerLocator _locator = default!; public string Command => "timepack"; public string Description => "Executes a set of commands based on the selected pack(s)"; diff --git a/Content.Server/_Wega/Aliens/Facehugger/FacehuggerSystem.cs b/Content.Server/_Wega/Aliens/Facehugger/FacehuggerSystem.cs index 0506952d8f..d2e7a10414 100644 --- a/Content.Server/_Wega/Aliens/Facehugger/FacehuggerSystem.cs +++ b/Content.Server/_Wega/Aliens/Facehugger/FacehuggerSystem.cs @@ -15,14 +15,14 @@ namespace Content.Server._Wega.Aliens.Facehugger; public sealed class FacehuggerSystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ThrownItemSystem _thrown = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private StatusEffectsSystem _statusEffects = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ThrownItemSystem _thrown = default!; private static readonly TimeSpan SleepDuration = TimeSpan.FromSeconds(4); @@ -117,7 +117,7 @@ public sealed class FacehuggerSystem : EntitySystem return true; } - + private bool IsHuggerAlive(EntityUid uid) { if (!TryComp(uid, out var mobState)) diff --git a/Content.Server/_Wega/Android/AndroidFrameSystem.cs b/Content.Server/_Wega/Android/AndroidFrameSystem.cs index 70c7758551..22ce8c7726 100644 --- a/Content.Server/_Wega/Android/AndroidFrameSystem.cs +++ b/Content.Server/_Wega/Android/AndroidFrameSystem.cs @@ -16,14 +16,14 @@ namespace Content.Server._Wega.Android; public sealed partial class AndroidFrameSystem : SharedAndroidFrameSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly HumanoidProfileSystem _humanoid = default!; - [Dependency] private readonly VisualBodySystem _visualBody = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly NamingSystem _naming = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly AudioSystem _audio = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private HumanoidProfileSystem _humanoid = default!; + [Dependency] private VisualBodySystem _visualBody = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private NamingSystem _naming = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private AudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Android/AndroidSystem.cs b/Content.Server/_Wega/Android/AndroidSystem.cs index 0a4fe13326..0d705a3bf8 100644 --- a/Content.Server/_Wega/Android/AndroidSystem.cs +++ b/Content.Server/_Wega/Android/AndroidSystem.cs @@ -25,22 +25,22 @@ namespace Content.Server.Android; public sealed partial class AndroidSystem : SharedAndroidSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly ActionsSystem _actions = default!; - [Dependency] private readonly LockSystem _lock = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly PointLightSystem _pointLight = default!; - [Dependency] private readonly StunSystem _stun = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private ActionsSystem _actions = default!; + [Dependency] private LockSystem _lock = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private PointLightSystem _pointLight = default!; + [Dependency] private StunSystem _stun = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Anomaly/Effects/CoreAnomChangeTempSystem.cs b/Content.Server/_Wega/Anomaly/Effects/CoreAnomChangeTempSystem.cs index 47bb53ba93..129ec59622 100644 --- a/Content.Server/_Wega/Anomaly/Effects/CoreAnomChangeTempSystem.cs +++ b/Content.Server/_Wega/Anomaly/Effects/CoreAnomChangeTempSystem.cs @@ -6,8 +6,8 @@ namespace Content.Server.CoreTempChange.Effects; public sealed class CoreTempChangeSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly TransformSystem _xform = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private TransformSystem _xform = default!; public override void Update(float frameTime) { @@ -27,4 +27,4 @@ public sealed class CoreTempChangeSystem : EntitySystem } } } -} \ No newline at end of file +} diff --git a/Content.Server/_Wega/Barks/BarkSystem.cs b/Content.Server/_Wega/Barks/BarkSystem.cs index e7aeb67f2d..d3735669af 100644 --- a/Content.Server/_Wega/Barks/BarkSystem.cs +++ b/Content.Server/_Wega/Barks/BarkSystem.cs @@ -14,10 +14,10 @@ namespace Content.Server.Speech.Synthesis.System; /// public sealed class BarkSystem : EntitySystem { - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IEntityManager _entityManager = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/BloodCult/BloodCultSystem.Abilities.cs b/Content.Server/_Wega/BloodCult/BloodCultSystem.Abilities.cs index 3d84760d12..ac33a725c5 100644 --- a/Content.Server/_Wega/BloodCult/BloodCultSystem.Abilities.cs +++ b/Content.Server/_Wega/BloodCult/BloodCultSystem.Abilities.cs @@ -53,27 +53,27 @@ namespace Content.Server.Blood.Cult; public sealed partial class BloodCultSystem { - [Dependency] private readonly BloodstreamSystem _blood = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly EmpSystem _emp = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly EuiManager _euiMan = default!; - [Dependency] private readonly FixtureSystem _fixtures = default!; - [Dependency] private readonly FlashSystem _flash = default!; - [Dependency] private readonly HallucinationsSystem _hallucinations = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly LoadoutSystem _loadout = default!; - [Dependency] private readonly QuickDialogSystem _quickDialog = default!; - [Dependency] private readonly SharedCuffableSystem _cuff = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedStackSystem _stack = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffect = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; - [Dependency] private readonly VisibilitySystem _visibility = default!; + [Dependency] private BloodstreamSystem _blood = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private EmpSystem _emp = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private EuiManager _euiMan = default!; + [Dependency] private FixtureSystem _fixtures = default!; + [Dependency] private FlashSystem _flash = default!; + [Dependency] private HallucinationsSystem _hallucinations = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private LoadoutSystem _loadout = default!; + [Dependency] private QuickDialogSystem _quickDialog = default!; + [Dependency] private SharedCuffableSystem _cuff = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedStackSystem _stack = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private StatusEffectsSystem _statusEffect = default!; + [Dependency] private UseDelaySystem _useDelay = default!; + [Dependency] private VisibilitySystem _visibility = default!; private static readonly SoundPathSpecifier CultSpell = new SoundPathSpecifier("/Audio/_Wega/Effects/cult_spell.ogg"); @@ -580,7 +580,7 @@ public sealed partial class BloodCultSystem _popup.PopupEntity(Loc.GetString("blood-cult-bolt-barrage-failed"), cultist, cultist, PopupType.SmallCaution); return; } - + if (TrySpawnSpellInHand(cultist, "BloodCultSpellBloodBarrage")) { component.BloodCount -= 200; @@ -1029,7 +1029,7 @@ public sealed partial class BloodCultSystem _action.RemoveAction(spell); } } - + private bool TrySpawnSpellInHand(EntityUid uid, EntProtoId proto) { if (!TryComp(uid, out var hands)) @@ -1037,17 +1037,17 @@ public sealed partial class BloodCultSystem var spell = Spawn(proto, Transform(uid).Coordinates); var activeHand = _hands.GetActiveHand((uid, hands)); - + if (_hands.TryPickupAnyHand(uid, spell)) return true; - + else if (activeHand != null && _hands.TryForcePickup((uid, hands), spell, activeHand)) return true; - + else QueueDel(spell); return false; - + } #endregion } diff --git a/Content.Server/_Wega/BloodCult/BloodCultSystem.Equipment.cs b/Content.Server/_Wega/BloodCult/BloodCultSystem.Equipment.cs index 8ef346f132..8f16460100 100644 --- a/Content.Server/_Wega/BloodCult/BloodCultSystem.Equipment.cs +++ b/Content.Server/_Wega/BloodCult/BloodCultSystem.Equipment.cs @@ -12,7 +12,7 @@ namespace Content.Server.Blood.Cult; public sealed partial class BloodCultSystem { - [Dependency] private readonly ThrowingSystem _throwing = default!; + [Dependency] private ThrowingSystem _throwing = default!; private void InitializeEquipment() { @@ -26,7 +26,7 @@ public sealed partial class BloodCultSystem if (HasComp(args.EquipTarget) && ent.Comp.Cult == CultType.Blood) return; - + if (HasComp(args.EquipTarget) && ent.Comp.Cult == CultType.Veil) return; @@ -44,7 +44,7 @@ public sealed partial class BloodCultSystem if (HasComp(args.User) && ent.Comp.Cult == CultType.Blood) return; - + if (HasComp(args.User) && ent.Comp.Cult == CultType.Veil) return; @@ -72,7 +72,7 @@ public sealed partial class BloodCultSystem var target = hitList[i]; if (HasComp(target) && comp.Cult == CultType.Blood) hitList.RemoveAt(i); - + if (HasComp(target) && comp.Cult == CultType.Veil) hitList.RemoveAt(i); } diff --git a/Content.Server/_Wega/BloodCult/BloodCultSystem.Runes.cs b/Content.Server/_Wega/BloodCult/BloodCultSystem.Runes.cs index 8d5b69fa46..4714c0b47b 100644 --- a/Content.Server/_Wega/BloodCult/BloodCultSystem.Runes.cs +++ b/Content.Server/_Wega/BloodCult/BloodCultSystem.Runes.cs @@ -45,13 +45,13 @@ namespace Content.Server.Blood.Cult; public sealed partial class BloodCultSystem { - [Dependency] private readonly FlammableSystem _flammable = default!; - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly IConsoleHost _consoleHost = default!; - [Dependency] private readonly IMapManager _mapMan = default!; - [Dependency] private readonly NavMapSystem _navMap = default!; - [Dependency] private readonly RejuvenateSystem _rejuvenate = default!; - [Dependency] private readonly SharedGhostSystem _ghost = default!; + [Dependency] private FlammableSystem _flammable = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private IConsoleHost _consoleHost = default!; + [Dependency] private IMapManager _mapMan = default!; + [Dependency] private NavMapSystem _navMap = default!; + [Dependency] private RejuvenateSystem _rejuvenate = default!; + [Dependency] private SharedGhostSystem _ghost = default!; private static readonly EntProtoId BloodCultObserver = "MobObserverIfrit"; diff --git a/Content.Server/_Wega/BloodCult/BloodCultSystem.cs b/Content.Server/_Wega/BloodCult/BloodCultSystem.cs index 43be0d7394..5a1de0746d 100644 --- a/Content.Server/_Wega/BloodCult/BloodCultSystem.cs +++ b/Content.Server/_Wega/BloodCult/BloodCultSystem.cs @@ -46,24 +46,24 @@ namespace Content.Server.Blood.Cult; public sealed partial class BloodCultSystem : SharedBloodCultSystem { - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly BloodCultRuleSystem _bloodCult = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MetaDataSystem _meta = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly RoundEndSystem _roundEndSystem = default!; - [Dependency] private readonly ServerGlobalSoundSystem _sound = default!; - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private BloodCultRuleSystem _bloodCult = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MetaDataSystem _meta = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private RoundEndSystem _roundEndSystem = default!; + [Dependency] private ServerGlobalSoundSystem _sound = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solution = default!; + [Dependency] private UserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Botany/PlantAnalyzerSystem.cs b/Content.Server/_Wega/Botany/PlantAnalyzerSystem.cs index b103edc46b..704e926de6 100644 --- a/Content.Server/_Wega/Botany/PlantAnalyzerSystem.cs +++ b/Content.Server/_Wega/Botany/PlantAnalyzerSystem.cs @@ -22,18 +22,18 @@ namespace Content.Server.Botany.Systems; public sealed class PlantAnalyzerSystem : SharedPlantAnalyzerSystem { - [Dependency] private readonly BotanySystem _botany = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly PaperSystem _paperSystem = default!; - [Dependency] private readonly LabelSystem _labelSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly PowerCellSystem _cell = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; + [Dependency] private BotanySystem _botany = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private PaperSystem _paperSystem = default!; + [Dependency] private LabelSystem _labelSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private PowerCellSystem _cell = default!; + [Dependency] private ItemToggleSystem _toggle = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/CardTarot/CardTarotSystem.cs b/Content.Server/_Wega/CardTarot/CardTarotSystem.cs index cc3cc2c44e..c3c06f28c5 100644 --- a/Content.Server/_Wega/CardTarot/CardTarotSystem.cs +++ b/Content.Server/_Wega/CardTarot/CardTarotSystem.cs @@ -70,36 +70,36 @@ namespace Content.Server.Card.Tarot; public sealed class CardTarotSystem : EntitySystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly BloodstreamSystem _blood = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly DiceOfFateSystem _dice = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; - [Dependency] private readonly HallucinationsSystem _hallucinations = default!; - [Dependency] private readonly IngestionSystem _ingestion = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly LockSystem _lock = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly MetaDataSystem _meta = default!; - [Dependency] private readonly PolymorphSystem _polymorph = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly RejuvenateSystem _rejuvenate = default!; - [Dependency] private readonly SlotMachineSystem _slotMachine = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; - [Dependency] private readonly StackSystem _stack = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly SurgerySystem _surgery = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly TriggerSystem _trigger = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private BloodstreamSystem _blood = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private DiceOfFateSystem _dice = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private SharedGravitySystem _gravity = default!; + [Dependency] private HallucinationsSystem _hallucinations = default!; + [Dependency] private IngestionSystem _ingestion = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private LockSystem _lock = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private MetaDataSystem _meta = default!; + [Dependency] private PolymorphSystem _polymorph = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private RejuvenateSystem _rejuvenate = default!; + [Dependency] private SlotMachineSystem _slotMachine = default!; + [Dependency] private SharedSolutionContainerSystem _solution = default!; + [Dependency] private StackSystem _stack = default!; + [Dependency] private StatusEffectsSystem _statusEffects = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private SurgerySystem _surgery = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private TriggerSystem _trigger = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedAudioSystem _audio = default!; // 200,000 static variables are ready, and another million is on the way private static readonly EntProtoId Ash = "Ash"; diff --git a/Content.Server/_Wega/Carrying/CarryingSystem.cs b/Content.Server/_Wega/Carrying/CarryingSystem.cs index 1b109821b5..b4c0b6ae67 100644 --- a/Content.Server/_Wega/Carrying/CarryingSystem.cs +++ b/Content.Server/_Wega/Carrying/CarryingSystem.cs @@ -34,18 +34,18 @@ namespace Content.Server.Carrying { public sealed class CarryingSystem : EntitySystem { - [Dependency] private readonly VirtualItemSystem _virtualItemSystem = default!; - [Dependency] private readonly CarryingSlowdownSystem _slowdown = default!; - [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly StandingStateSystem _standingState = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly PullingSystem _pullingSystem = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly EscapeInventorySystem _escapeInventorySystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private VirtualItemSystem _virtualItemSystem = default!; + [Dependency] private CarryingSlowdownSystem _slowdown = default!; + [Dependency] private DoAfterSystem _doAfterSystem = default!; + [Dependency] private StandingStateSystem _standingState = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private PullingSystem _pullingSystem = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private EscapeInventorySystem _escapeInventorySystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeed = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private SharedHandsSystem _hands = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs index e66c86488b..bc2b636752 100644 --- a/Content.Server/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs +++ b/Content.Server/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs @@ -18,13 +18,13 @@ namespace Content.Server.CartridgeLoader.Cartridges; public sealed class NanoChatCartridgeSystem : SharedNanoChatCartridgeSystem { - [Dependency] private readonly IAdminLogManager _admin = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoader = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IAdminLogManager _admin = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private CartridgeLoaderSystem _cartridgeLoader = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; private readonly Dictionary _activeChats = new(); private readonly Dictionary _groups = new(); @@ -369,7 +369,7 @@ public sealed class NanoChatCartridgeSystem : SharedNanoChatCartridgeSystem Loc.GetString("nanochat-pda-notification-header"), Loc.GetString("nanochat-pda-notification-fromwho", ("user", sender.Comp.OwnerName))); } - + UpdateUiState((recipientEntity, recipientComp)); UpdateUiState(sender); } diff --git a/Content.Server/_Wega/Chat/Commands/MindSayCommand.cs b/Content.Server/_Wega/Chat/Commands/MindSayCommand.cs index a708a8859c..4599df041c 100644 --- a/Content.Server/_Wega/Chat/Commands/MindSayCommand.cs +++ b/Content.Server/_Wega/Chat/Commands/MindSayCommand.cs @@ -9,7 +9,7 @@ namespace Content.Server.Chat.Commands [AnyCommand] internal sealed class MindSayCommand : LocalizedEntityCommands { - [Dependency] private readonly ChatSystem _chatSystem = default!; + [Dependency] private ChatSystem _chatSystem = default!; public override string Command => "mindsay"; diff --git a/Content.Server/_Wega/Clothing/ForceLoadoutSystem.cs b/Content.Server/_Wega/Clothing/ForceLoadoutSystem.cs index a5b7721a3a..1f56870b1f 100644 --- a/Content.Server/_Wega/Clothing/ForceLoadoutSystem.cs +++ b/Content.Server/_Wega/Clothing/ForceLoadoutSystem.cs @@ -8,8 +8,8 @@ namespace Content.Shared.Clothing; public sealed class ForceLoadoutSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly OutfitSystem _outfitSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private OutfitSystem _outfitSystem = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Commands/GhostRespawnCommand.cs b/Content.Server/_Wega/Commands/GhostRespawnCommand.cs index 8b8941bda2..1a4bcaf5a1 100644 --- a/Content.Server/_Wega/Commands/GhostRespawnCommand.cs +++ b/Content.Server/_Wega/Commands/GhostRespawnCommand.cs @@ -12,9 +12,9 @@ namespace Content.Server.Wega.Commands; [AnyCommand()] public sealed class GhostRespawnCommand : IConsoleCommand { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; public string Command => "ghostrespawn"; public string Description => "Allows the player to return to the lobby if they've been dead long enough, allowing re-entering the round AS ANOTHER CHARACTER."; diff --git a/Content.Server/_Wega/Damage/DamageResistSystem.cs b/Content.Server/_Wega/Damage/DamageResistSystem.cs index c2ecb717ea..2ca76bad50 100644 --- a/Content.Server/_Wega/Damage/DamageResistSystem.cs +++ b/Content.Server/_Wega/Damage/DamageResistSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Damage; public sealed class DamageResistSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IPrototypeManager _prototype = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Damage/Systems/DamageInContainerSystem.cs b/Content.Server/_Wega/Damage/Systems/DamageInContainerSystem.cs index 4c2b8c2f3c..d9a92d29eb 100644 --- a/Content.Server/_Wega/Damage/Systems/DamageInContainerSystem.cs +++ b/Content.Server/_Wega/Damage/Systems/DamageInContainerSystem.cs @@ -13,10 +13,10 @@ namespace Content.Server.Damage.Systems; public sealed class DamageInContainerSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private DamageableSystem _damageable = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Damage/Systems/DamageOnActionSystems.cs b/Content.Server/_Wega/Damage/Systems/DamageOnActionSystems.cs index 95b55ea457..8d51d98a8a 100644 --- a/Content.Server/_Wega/Damage/Systems/DamageOnActionSystems.cs +++ b/Content.Server/_Wega/Damage/Systems/DamageOnActionSystems.cs @@ -9,10 +9,10 @@ namespace Content.Server.Damage.Systems; public sealed class DamageOnActionSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly HungerSystem _hunger = default!; - [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private HungerSystem _hunger = default!; + [Dependency] private PopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/DetailExaminable/DetailExaminableSystem.cs b/Content.Server/_Wega/DetailExaminable/DetailExaminableSystem.cs index 7ee48b2af6..6a0318b1bb 100644 --- a/Content.Server/_Wega/DetailExaminable/DetailExaminableSystem.cs +++ b/Content.Server/_Wega/DetailExaminable/DetailExaminableSystem.cs @@ -12,10 +12,10 @@ namespace Content.Server.DetailExaminable; public sealed partial class DetailExaminableSystem : EntitySystem { - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; - [Dependency] private readonly EuiManager _euiMan = default!; - [Dependency] private readonly MindSystem _mind = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private ExamineSystemShared _examine = default!; + [Dependency] private EuiManager _euiMan = default!; + [Dependency] private MindSystem _mind = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Dice/DiceOfFateSystem.cs b/Content.Server/_Wega/Dice/DiceOfFateSystem.cs index e6b40a0e00..3e38e80f4e 100644 --- a/Content.Server/_Wega/Dice/DiceOfFateSystem.cs +++ b/Content.Server/_Wega/Dice/DiceOfFateSystem.cs @@ -37,22 +37,22 @@ namespace Content.Server.Dice; public sealed class DiceOfFateSystem : EntitySystem { - [Dependency] private readonly SharedAccessSystem _access = default!; - [Dependency] private readonly IAdminLogManager _admin = default!; - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly SharedDiseaseSystem _disease = default!; - [Dependency] private readonly ExplosionSystem _explosion = default!; - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speed = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly PolymorphSystem _polymorph = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly RejuvenateSystem _rejuvenate = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; + [Dependency] private SharedAccessSystem _access = default!; + [Dependency] private IAdminLogManager _admin = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private SharedDiseaseSystem _disease = default!; + [Dependency] private ExplosionSystem _explosion = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private MovementSpeedModifierSystem _speed = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private PolymorphSystem _polymorph = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private RejuvenateSystem _rejuvenate = default!; + [Dependency] private SharedStunSystem _stun = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Dirt/ShowerSystem.cs b/Content.Server/_Wega/Dirt/ShowerSystem.cs index 9190cb7dd1..e22107c082 100644 --- a/Content.Server/_Wega/Dirt/ShowerSystem.cs +++ b/Content.Server/_Wega/Dirt/ShowerSystem.cs @@ -12,13 +12,13 @@ namespace Content.Server.Shower { public sealed class ShowerSystem : EntitySystem { - [Dependency] private readonly SharedAmbientSoundSystem _ambient = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly ReactiveSystem _reactive = default!; + [Dependency] private SharedAmbientSoundSystem _ambient = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private PuddleSystem _puddle = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private ReactiveSystem _reactive = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Dirt/WashingMachineSystem.cs b/Content.Server/_Wega/Dirt/WashingMachineSystem.cs index 8261142f7f..3c9c49232c 100644 --- a/Content.Server/_Wega/Dirt/WashingMachineSystem.cs +++ b/Content.Server/_Wega/Dirt/WashingMachineSystem.cs @@ -16,13 +16,13 @@ namespace Content.Server.WashingMachine { public sealed class WashingMachineSystem : EntitySystem { - [Dependency] private readonly SharedAmbientSoundSystem _ambient = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedDirtSystem _dirt = default!; - [Dependency] private readonly SharedJitteringSystem _jittering = default!; - [Dependency] private readonly LockSystem _lock = default!; + [Dependency] private SharedAmbientSoundSystem _ambient = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedDirtSystem _dirt = default!; + [Dependency] private SharedJitteringSystem _jittering = default!; + [Dependency] private LockSystem _lock = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Disease/DiseaseDiagnosisSystem.cs b/Content.Server/_Wega/Disease/DiseaseDiagnosisSystem.cs index 1d893f629f..24b905940e 100644 --- a/Content.Server/_Wega/Disease/DiseaseDiagnosisSystem.cs +++ b/Content.Server/_Wega/Disease/DiseaseDiagnosisSystem.cs @@ -28,15 +28,15 @@ namespace Content.Server.Disease /// public sealed class DiseaseDiagnosisSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly PaperSystem _paperSystem = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private PaperSystem _paperSystem = default!; + [Dependency] private StationSystem _stationSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Disease/DiseaseSystem.cs b/Content.Server/_Wega/Disease/DiseaseSystem.cs index 74625f16a2..dfd308f947 100644 --- a/Content.Server/_Wega/Disease/DiseaseSystem.cs +++ b/Content.Server/_Wega/Disease/DiseaseSystem.cs @@ -28,15 +28,15 @@ namespace Content.Server.Disease /// public sealed class DiseaseSystem : SharedDiseaseSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private ChatSystem _chatSystem = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ERP/SexToyUsageSystem.cs b/Content.Server/_Wega/ERP/SexToyUsageSystem.cs index e413bbb269..4e36da74be 100644 --- a/Content.Server/_Wega/ERP/SexToyUsageSystem.cs +++ b/Content.Server/_Wega/ERP/SexToyUsageSystem.cs @@ -12,10 +12,10 @@ namespace Content.Server.SexToy.System { public sealed class SexToyUsageSystem : EntitySystem { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private InventorySystem _inventorySystem = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ERP/VibratorSystem.cs b/Content.Server/_Wega/ERP/VibratorSystem.cs index 55ec521c0a..5abb1002a0 100644 --- a/Content.Server/_Wega/ERP/VibratorSystem.cs +++ b/Content.Server/_Wega/ERP/VibratorSystem.cs @@ -12,10 +12,10 @@ namespace Content.Server.Vibrator.System { public sealed class VibratorUsageSystem : EntitySystem { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private InventorySystem _inventorySystem = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/GPS/HandheldGpsUiSystem.cs b/Content.Server/_Wega/GPS/HandheldGpsUiSystem.cs index 4b5f9f2e13..5bd275e998 100644 --- a/Content.Server/_Wega/GPS/HandheldGpsUiSystem.cs +++ b/Content.Server/_Wega/GPS/HandheldGpsUiSystem.cs @@ -11,10 +11,10 @@ namespace Content.Server.GPS.Systems; public sealed partial class HandheldGpsUiSystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _lookupSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private EntityLookupSystem _lookupSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private IGameTiming _gameTiming = default!; private TimeSpan _lastUpdate = TimeSpan.Zero; private const float UpdateInterval = 1.5f; diff --git a/Content.Server/_Wega/GameTicking/AutoVoteSystem.cs b/Content.Server/_Wega/GameTicking/AutoVoteSystem.cs index f3376b9f4c..ce8c1f086b 100644 --- a/Content.Server/_Wega/GameTicking/AutoVoteSystem.cs +++ b/Content.Server/_Wega/GameTicking/AutoVoteSystem.cs @@ -10,8 +10,8 @@ namespace Content.Server.GameTicking { public sealed class AutoVoteSystem : EntitySystem { - [Dependency] private readonly IVoteManager _voteManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IVoteManager _voteManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/GameTicking/Rules/BloodBrotherRuleSystem.cs b/Content.Server/_Wega/GameTicking/Rules/BloodBrotherRuleSystem.cs index 1b55b7862e..b0d97d4278 100644 --- a/Content.Server/_Wega/GameTicking/Rules/BloodBrotherRuleSystem.cs +++ b/Content.Server/_Wega/GameTicking/Rules/BloodBrotherRuleSystem.cs @@ -20,18 +20,18 @@ namespace Content.Server.GameTicking.Rules; public sealed class BloodBrotherRuleSystem : GameRuleSystem { - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly SharedJobSystem _jobs = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; - [Dependency] private readonly NpcFactionSystem _npcFaction = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedRoleSystem _roleSystem = default!; - [Dependency] private readonly ObjectivesSystem _objectives = default!; - [Dependency] private readonly TargetObjectiveSystem _target = default!; - [Dependency] private readonly BloodBrotherSharedConditionSystem _sharedCondition = default!; - [Dependency] private readonly BloodBrotherSharedStealConditionSystem _stealCondition = default!; - [Dependency] private readonly BloodBrotherSharedKillConditionSystem _killCondition = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private SharedJobSystem _jobs = default!; + [Dependency] private MindSystem _mindSystem = default!; + [Dependency] private NpcFactionSystem _npcFaction = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedRoleSystem _roleSystem = default!; + [Dependency] private ObjectivesSystem _objectives = default!; + [Dependency] private TargetObjectiveSystem _target = default!; + [Dependency] private BloodBrotherSharedConditionSystem _sharedCondition = default!; + [Dependency] private BloodBrotherSharedStealConditionSystem _stealCondition = default!; + [Dependency] private BloodBrotherSharedKillConditionSystem _killCondition = default!; private static readonly Color BloodBrotherColor = Color.FromHex("#8b0000"); diff --git a/Content.Server/_Wega/GameTicking/Rules/BloodCultRuleSystem.cs b/Content.Server/_Wega/GameTicking/Rules/BloodCultRuleSystem.cs index 3614036def..9f15aafa2f 100644 --- a/Content.Server/_Wega/GameTicking/Rules/BloodCultRuleSystem.cs +++ b/Content.Server/_Wega/GameTicking/Rules/BloodCultRuleSystem.cs @@ -41,25 +41,25 @@ namespace Content.Server.GameTicking.Rules { public sealed class BloodCultRuleSystem : GameRuleSystem { - [Dependency] private readonly SharedAchievementsSystem _achievement = default!; - [Dependency] private readonly ActionsSystem _action = default!; - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly IAdminLogManager _adminLogManager = default!; - [Dependency] private readonly MetabolizerSystem _metabolism = default!; - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly NpcFactionSystem _npcFaction = default!; - [Dependency] private readonly RoleSystem _role = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly RoundEndSystem _roundEndSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; - [Dependency] private readonly ObjectivesSystem _objectives = default!; - [Dependency] private readonly TargetObjectiveSystem _target = default!; - [Dependency] private readonly MetaDataSystem _meta = default!; + [Dependency] private SharedAchievementsSystem _achievement = default!; + [Dependency] private ActionsSystem _action = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private IAdminLogManager _adminLogManager = default!; + [Dependency] private MetabolizerSystem _metabolism = default!; + [Dependency] private MindSystem _mind = default!; + [Dependency] private NpcFactionSystem _npcFaction = default!; + [Dependency] private RoleSystem _role = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private RoundEndSystem _roundEndSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; + [Dependency] private ObjectivesSystem _objectives = default!; + [Dependency] private TargetObjectiveSystem _target = default!; + [Dependency] private MetaDataSystem _meta = default!; public readonly ProtoId BloodCultNpcFaction = "BloodCult"; diff --git a/Content.Server/_Wega/GameTicking/Rules/VampireRuleSystem.cs b/Content.Server/_Wega/GameTicking/Rules/VampireRuleSystem.cs index 891dffda6c..97ec936adb 100644 --- a/Content.Server/_Wega/GameTicking/Rules/VampireRuleSystem.cs +++ b/Content.Server/_Wega/GameTicking/Rules/VampireRuleSystem.cs @@ -14,8 +14,8 @@ namespace Content.Server.GameTicking.Rules { public sealed class VampireRuleSystem : GameRuleSystem { - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private SharedMindSystem _mind = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/GameTicking/Rules/VeilCultRuleSystem.cs b/Content.Server/_Wega/GameTicking/Rules/VeilCultRuleSystem.cs index 0db93de7ba..5cf9ee965a 100644 --- a/Content.Server/_Wega/GameTicking/Rules/VeilCultRuleSystem.cs +++ b/Content.Server/_Wega/GameTicking/Rules/VeilCultRuleSystem.cs @@ -37,26 +37,26 @@ namespace Content.Server.GameTicking.Rules { public sealed class VeilCultRuleSystem : GameRuleSystem { - [Dependency] private readonly SharedAchievementsSystem _achievement = default!; - [Dependency] private readonly ActionsSystem _action = default!; - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IAdminLogManager _adminLogManager = default!; - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly NpcFactionSystem _npcFaction = default!; - [Dependency] private readonly RoleSystem _role = default!; - [Dependency] private readonly RoundEndSystem _roundEndSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly ObjectivesSystem _objectives = default!; - [Dependency] private readonly TargetObjectiveSystem _target = default!; - [Dependency] private readonly MetaDataSystem _meta = default!; - [Dependency] private readonly SharedStationSystem _stationSystem = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly ServerGlobalSoundSystem _sound = default!; - [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private SharedAchievementsSystem _achievement = default!; + [Dependency] private ActionsSystem _action = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IAdminLogManager _adminLogManager = default!; + [Dependency] private MindSystem _mind = default!; + [Dependency] private NpcFactionSystem _npcFaction = default!; + [Dependency] private RoleSystem _role = default!; + [Dependency] private RoundEndSystem _roundEndSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private ObjectivesSystem _objectives = default!; + [Dependency] private TargetObjectiveSystem _target = default!; + [Dependency] private MetaDataSystem _meta = default!; + [Dependency] private SharedStationSystem _stationSystem = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private ServerGlobalSoundSystem _sound = default!; + [Dependency] private ChatSystem _chat = default!; public readonly ProtoId VeilCultNpcFaction = "VeilCult"; diff --git a/Content.Server/_Wega/Genetics/Systems/Basic/EmpatheticThoughtGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Basic/EmpatheticThoughtGenSystem.cs index 4bfa2c2147..e6b78ca479 100644 --- a/Content.Server/_Wega/Genetics/Systems/Basic/EmpatheticThoughtGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Basic/EmpatheticThoughtGenSystem.cs @@ -16,10 +16,10 @@ namespace Content.Server.Genetics.System; public sealed class EmpatheticThoughtGenSystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private SharedMindSystem _mindSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IRobustRandom _random = default!; public override void Update(float frameTime) { diff --git a/Content.Server/_Wega/Genetics/Systems/Basic/HulkGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Basic/HulkGenSystem.cs index 3e647d1d4b..ab7f43716c 100644 --- a/Content.Server/_Wega/Genetics/Systems/Basic/HulkGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Basic/HulkGenSystem.cs @@ -18,14 +18,14 @@ namespace Content.Server.Genetics.System; public sealed class HulkGenSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly DnaModifierSystem _dnaModifier = default!; - [Dependency] private readonly PhysicsSystem _physics = default!; - [Dependency] private readonly PolymorphSystem _polymorph = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private DnaModifierSystem _dnaModifier = default!; + [Dependency] private PhysicsSystem _physics = default!; + [Dependency] private PolymorphSystem _polymorph = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedStunSystem _stun = default!; private static readonly ProtoId HulkGen = "GeneticsHulkBasic"; diff --git a/Content.Server/_Wega/Genetics/Systems/Basic/MatterEaterGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Basic/MatterEaterGenSystem.cs index 61b7dc025b..2ba4479d0e 100644 --- a/Content.Server/_Wega/Genetics/Systems/Basic/MatterEaterGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Basic/MatterEaterGenSystem.cs @@ -24,16 +24,16 @@ namespace Content.Server.Genetics.System; public sealed class MatterEaterSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly HungerSystem _hunger = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly StackSystem _stack = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private HungerSystem _hunger = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private StackSystem _stack = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedContainerSystem _container = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Genetics/Systems/Basic/TelekinesisGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Basic/TelekinesisGenSystem.cs index 0fada89976..a01cc22dde 100644 --- a/Content.Server/_Wega/Genetics/Systems/Basic/TelekinesisGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Basic/TelekinesisGenSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.Genetics.System; public sealed class TelekinesisGenSystem : EntitySystem { - [Dependency] private readonly HandsSystem _hands = default!; + [Dependency] private HandsSystem _hands = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Genetics/Systems/Disease/EpilepsyGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Disease/EpilepsyGenSystem.cs index d3cc36575f..5e3bc70de8 100644 --- a/Content.Server/_Wega/Genetics/Systems/Disease/EpilepsyGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Disease/EpilepsyGenSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server.Genetics.System; public sealed class EpilepsySystem : EntitySystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedJitteringSystem _jitteringSystem = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedJitteringSystem _jitteringSystem = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private IRobustRandom _random = default!; private static readonly ProtoId Scream = "Scream"; diff --git a/Content.Server/_Wega/Genetics/Systems/Disease/IncendiaryMitochondriaGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Disease/IncendiaryMitochondriaGenSystem.cs index c8402b465c..88de07cee9 100644 --- a/Content.Server/_Wega/Genetics/Systems/Disease/IncendiaryMitochondriaGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Disease/IncendiaryMitochondriaGenSystem.cs @@ -7,8 +7,8 @@ namespace Content.Server.Genetics.System; public sealed class IncendiaryMitochondriaSystem : EntitySystem { - [Dependency] private readonly FlammableSystem _flammable = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private FlammableSystem _flammable = default!; + [Dependency] private IRobustRandom _random = default!; public override void Update(float frameTime) { diff --git a/Content.Server/_Wega/Genetics/Systems/Disease/TourettesSyndromeSystem.cs b/Content.Server/_Wega/Genetics/Systems/Disease/TourettesSyndromeSystem.cs index ea9e5a692f..d05b616ead 100644 --- a/Content.Server/_Wega/Genetics/Systems/Disease/TourettesSyndromeSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Disease/TourettesSyndromeSystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Genetics.System; public sealed class TourettesSyndromeSystem : EntitySystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly SharedJitteringSystem _jitteringSystem = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private SharedJitteringSystem _jitteringSystem = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private IRobustRandom _random = default!; private static readonly IReadOnlyList SwearWords = new List { diff --git a/Content.Server/_Wega/Genetics/Systems/DnaInjectorSystem.cs b/Content.Server/_Wega/Genetics/Systems/DnaInjectorSystem.cs index 3948234f5d..5c0c2f9003 100644 --- a/Content.Server/_Wega/Genetics/Systems/DnaInjectorSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/DnaInjectorSystem.cs @@ -11,8 +11,8 @@ namespace Content.Server.Genetics.System; public sealed partial class DnaModifierSystem { - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; private static readonly ProtoId Damage = "Poison"; diff --git a/Content.Server/_Wega/Genetics/Systems/DnaModifierConsoleSystem.cs b/Content.Server/_Wega/Genetics/Systems/DnaModifierConsoleSystem.cs index cb6572de7a..af8129a72d 100644 --- a/Content.Server/_Wega/Genetics/Systems/DnaModifierConsoleSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/DnaModifierConsoleSystem.cs @@ -38,21 +38,21 @@ namespace Content.Server.Genetics.System [UsedImplicitly] public sealed class DnaModifierConsoleSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly DeviceLinkSystem _signalSystem = default!; - [Dependency] private readonly DnaClientSystem _dnaClient = default!; - [Dependency] private readonly DnaModifierSystem _dnaModifier = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly PowerReceiverSystem _powerReceiverSystem = default!; - [Dependency] private readonly QuickDialogSystem _quickDialog = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private DeviceLinkSystem _signalSystem = default!; + [Dependency] private DnaClientSystem _dnaClient = default!; + [Dependency] private DnaModifierSystem _dnaModifier = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private PowerReceiverSystem _powerReceiverSystem = default!; + [Dependency] private QuickDialogSystem _quickDialog = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; private static readonly EntProtoId Injector = "DnaInjector"; private static readonly ProtoId RadDamage = "Radiation"; diff --git a/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.Clone.cs b/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.Clone.cs index 7d68b952e7..69a475511b 100644 --- a/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.Clone.cs +++ b/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.Clone.cs @@ -11,7 +11,7 @@ namespace Content.Server.Genetics.System; public sealed partial class DnaModifierSystem { - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; public bool TryCloneHumanoid(Entity entity, Entity target) { diff --git a/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.Map.cs b/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.Map.cs index 76bca1f0c5..330fa8fc6a 100644 --- a/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.Map.cs +++ b/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.Map.cs @@ -5,7 +5,7 @@ namespace Content.Server.Genetics.System; public sealed partial class DnaModifierSystem { - [Dependency] private readonly MapSystem _map = default!; + [Dependency] private MapSystem _map = default!; public EntityUid? PausedMap { get; private set; } diff --git a/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.cs b/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.cs index 4a0953b710..df1842d228 100644 --- a/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/DnaModifierSystem.cs @@ -33,24 +33,24 @@ namespace Content.Server.Genetics.System; public sealed partial class DnaModifierSystem : SharedDnaModifierSystem { - [Dependency] private readonly IAdminLogManager _admin = default!; - [Dependency] private readonly SharedBuckleSystem _buckle = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly EnsureMarkingSystem _ensureMarking = default!; - [Dependency] private readonly StructuralEnzymesIndexerSystem _enzymesIndexer = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly ServerInventorySystem _inventory = default!; - [Dependency] private readonly MarkingPrototypesIndexerSystem _markingIndexer = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; - [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly PrayerSystem _prayerSystem = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IAdminLogManager _admin = default!; + [Dependency] private SharedBuckleSystem _buckle = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private EnsureMarkingSystem _ensureMarking = default!; + [Dependency] private StructuralEnzymesIndexerSystem _enzymesIndexer = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private ServerInventorySystem _inventory = default!; + [Dependency] private MarkingPrototypesIndexerSystem _markingIndexer = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedMindSystem _mindSystem = default!; + [Dependency] private MobThresholdSystem _mobThreshold = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private PrayerSystem _prayerSystem = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedTransformSystem _transform = default!; private static readonly ProtoId Scream = "Scream"; diff --git a/Content.Server/_Wega/Genetics/Systems/EnsureMarkingSystem.cs b/Content.Server/_Wega/Genetics/Systems/EnsureMarkingSystem.cs index 8fb0516758..75e525012e 100644 --- a/Content.Server/_Wega/Genetics/Systems/EnsureMarkingSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/EnsureMarkingSystem.cs @@ -10,7 +10,7 @@ namespace Content.Server.Genetics.System; public sealed class EnsureMarkingSystem : EntitySystem { - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; public static readonly ProtoId DefaultHorns = "LizardHornsDemonic"; diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/CloakOfDarknessGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/CloakOfDarknessGenSystem.cs index 09217f312d..b1421c1437 100644 --- a/Content.Server/_Wega/Genetics/Systems/Intermediate/CloakOfDarknessGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/CloakOfDarknessGenSystem.cs @@ -7,8 +7,8 @@ namespace Content.Server.Genetics.System; public sealed class CloakOfDarknessGenSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly SharedStealthSystem _stealth = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private SharedStealthSystem _stealth = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/MindCommunicationGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/MindCommunicationGenSystem.cs index 5c0a0cf82f..0f67e85183 100644 --- a/Content.Server/_Wega/Genetics/Systems/Intermediate/MindCommunicationGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/MindCommunicationGenSystem.cs @@ -11,11 +11,11 @@ namespace Content.Server.MindCommunication; public sealed class MindCommunicationGenSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly IAdminLogManager _admin = default!; - [Dependency] private readonly QuickDialogSystem _quickDialog = default!; - [Dependency] private readonly PrayerSystem _prayerSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private IAdminLogManager _admin = default!; + [Dependency] private QuickDialogSystem _quickDialog = default!; + [Dependency] private PrayerSystem _prayerSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/PolymorphismGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/PolymorphismGenSystem.cs index 4c7937292a..e5567cf5ca 100644 --- a/Content.Server/_Wega/Genetics/Systems/Intermediate/PolymorphismGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/PolymorphismGenSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Genetics.System; public sealed class PolymorphismGenSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly DnaModifierSystem _dnaModifier = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private DnaModifierSystem _dnaModifier = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/RegenerationGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/RegenerationGenSystem.cs index a0a6de49d2..80404dc5f5 100644 --- a/Content.Server/_Wega/Genetics/Systems/Intermediate/RegenerationGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/RegenerationGenSystem.cs @@ -9,7 +9,7 @@ namespace Content.Server.Genetics.System; public sealed class RegenerationGenSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damage = default!; + [Dependency] private DamageableSystem _damage = default!; private static readonly ProtoId BluntDamage = "Blunt"; private static readonly ProtoId HeatDamage = "Heat"; diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/SpeedUpGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/SpeedUpGenSystem.cs index 9474b50d50..b4d72aa928 100644 --- a/Content.Server/_Wega/Genetics/Systems/Intermediate/SpeedUpGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/SpeedUpGenSystem.cs @@ -9,8 +9,8 @@ namespace Content.Server.Genetics.System; public sealed class SpeedUpGenSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speed = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private MovementSpeedModifierSystem _speed = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Ghost/GhostRespawnSystem.cs b/Content.Server/_Wega/Ghost/GhostRespawnSystem.cs index 1544476e4c..265cfdf115 100644 --- a/Content.Server/_Wega/Ghost/GhostRespawnSystem.cs +++ b/Content.Server/_Wega/Ghost/GhostRespawnSystem.cs @@ -12,8 +12,8 @@ namespace Content.Server.Wega.Ghost.Respawn; public sealed class GhostRespawnSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IGameTiming _timing = default!; private readonly Dictionary _respawnResetTimes = []; diff --git a/Content.Server/_Wega/Hallucinations/HallucinationsSystem.cs b/Content.Server/_Wega/Hallucinations/HallucinationsSystem.cs index ee83595099..41236b385e 100644 --- a/Content.Server/_Wega/Hallucinations/HallucinationsSystem.cs +++ b/Content.Server/_Wega/Hallucinations/HallucinationsSystem.cs @@ -12,14 +12,14 @@ namespace Content.Server.Hallucinations; // TODO: Full refactor this shit public sealed partial class HallucinationsSystem : EntitySystem { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedEyeSystem _eye = default!; - [Dependency] private readonly StatusEffectsSystem _status = default!; - [Dependency] private readonly VisibilitySystem _visibilitySystem = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedEyeSystem _eye = default!; + [Dependency] private StatusEffectsSystem _status = default!; + [Dependency] private VisibilitySystem _visibilitySystem = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Implants/BatteryDrainerImplantSystem.cs b/Content.Server/_Wega/Implants/BatteryDrainerImplantSystem.cs index ea6d92a859..19c59ec184 100644 --- a/Content.Server/_Wega/Implants/BatteryDrainerImplantSystem.cs +++ b/Content.Server/_Wega/Implants/BatteryDrainerImplantSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server._Wega.Implants; public sealed class BatteryDrainerImplantSystem : EntitySystem { - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly BatterySystem _battery = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly ActionsSystem _actions = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private BatterySystem _battery = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private ActionsSystem _actions = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private PopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Implants/BodyPartImplantSystem.cs b/Content.Server/_Wega/Implants/BodyPartImplantSystem.cs index 55d9026430..45bec7dbaa 100644 --- a/Content.Server/_Wega/Implants/BodyPartImplantSystem.cs +++ b/Content.Server/_Wega/Implants/BodyPartImplantSystem.cs @@ -13,8 +13,8 @@ namespace Content.Server.Implants { public sealed class BodyPartImplantSystem : EntitySystem { - [Dependency] private readonly ToolSystem _tool = default!; - [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private ToolSystem _tool = default!; + [Dependency] private PopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Implants/HandItemImplantSystem.cs b/Content.Server/_Wega/Implants/HandItemImplantSystem.cs index 82fb5ecbbe..224dd7f455 100644 --- a/Content.Server/_Wega/Implants/HandItemImplantSystem.cs +++ b/Content.Server/_Wega/Implants/HandItemImplantSystem.cs @@ -12,11 +12,11 @@ namespace Content.Server.Implants; public sealed class HandItemImplantSystem : EntitySystem { - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly ActionsSystem _actions = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private ActionsSystem _actions = default!; - [Dependency] private readonly ContainerSystem _container = default!; + [Dependency] private ContainerSystem _container = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Implants/InternalStorageSystem.cs b/Content.Server/_Wega/Implants/InternalStorageSystem.cs index f5c556167f..b08c5034ea 100644 --- a/Content.Server/_Wega/Implants/InternalStorageSystem.cs +++ b/Content.Server/_Wega/Implants/InternalStorageSystem.cs @@ -8,7 +8,7 @@ namespace Content.Server.Implants; public sealed class InternalStorageSystem : SharedInternalStorageSystem { - [Dependency] private readonly LegionSystem _legion = default!; + [Dependency] private LegionSystem _legion = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Implants/LoyaltyImplantSystem.cs b/Content.Server/_Wega/Implants/LoyaltyImplantSystem.cs index 23ed58fe3a..fa6e009e2b 100644 --- a/Content.Server/_Wega/Implants/LoyaltyImplantSystem.cs +++ b/Content.Server/_Wega/Implants/LoyaltyImplantSystem.cs @@ -19,12 +19,12 @@ public sealed class MindControlSystem : EntitySystem { private const string FollowOrdersObjectiveId = "MindControlledFollowOrders"; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly ObjectivesSystem _objectives = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly StatusEffectsSystem _status = default!; - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly SharedStaminaSystem _stamina = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private ObjectivesSystem _objectives = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private StatusEffectsSystem _status = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private SharedStaminaSystem _stamina = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Instruments/InstrumentSystem.cs b/Content.Server/_Wega/Instruments/InstrumentSystem.cs index 522be00f2b..f67cd15587 100644 --- a/Content.Server/_Wega/Instruments/InstrumentSystem.cs +++ b/Content.Server/_Wega/Instruments/InstrumentSystem.cs @@ -7,8 +7,8 @@ namespace Content.Server.Instruments; public sealed partial class InstrumentSystem { - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private ItemToggleSystem _toggle = default!; private void OnMapInit(EntityUid uid, InstrumentComponent component, ref MapInitEvent args) { diff --git a/Content.Server/_Wega/Interaction/DeleteOnDropSystem.cs b/Content.Server/_Wega/Interaction/DeleteOnDropSystem.cs index 03a5f692ff..f71935fe07 100644 --- a/Content.Server/_Wega/Interaction/DeleteOnDropSystem.cs +++ b/Content.Server/_Wega/Interaction/DeleteOnDropSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.Interaction; public sealed class DeleteOnDropSystem : EntitySystem { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ItemSelector/ItemSelectorSystem.cs b/Content.Server/_Wega/ItemSelector/ItemSelectorSystem.cs index 8f7df7b4c5..cc9bcabb1d 100644 --- a/Content.Server/_Wega/ItemSelector/ItemSelectorSystem.cs +++ b/Content.Server/_Wega/ItemSelector/ItemSelectorSystem.cs @@ -11,10 +11,10 @@ namespace Content.Server.Item.Selector; public sealed partial class ItemSelectorSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _admin = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly IComponentFactory _componentFactory = default!; + [Dependency] private IAdminLogManager _admin = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private IComponentFactory _componentFactory = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ItemSelector/ObjectSelectorSystem.cs b/Content.Server/_Wega/ItemSelector/ObjectSelectorSystem.cs index ea87a3cd50..3ccfcc6ca0 100644 --- a/Content.Server/_Wega/ItemSelector/ObjectSelectorSystem.cs +++ b/Content.Server/_Wega/ItemSelector/ObjectSelectorSystem.cs @@ -11,9 +11,9 @@ namespace Content.Server.Item.Selector; public sealed partial class ObjectSelectorSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _admin = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly IComponentFactory _componentFactory = default!; + [Dependency] private IAdminLogManager _admin = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private IComponentFactory _componentFactory = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/DragonBloodSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/DragonBloodSystem.cs index 2172a138c6..876938cec9 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/DragonBloodSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/DragonBloodSystem.cs @@ -13,12 +13,12 @@ namespace Content.Server.Lavaland.Artefacts.Systems; public sealed class DragonBloodSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly PolymorphSystem _polymorph = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private PolymorphSystem _polymorph = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/FireSelfActionSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/FireSelfActionSystem.cs index 4f21f3fc84..018407c977 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/FireSelfActionSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/FireSelfActionSystem.cs @@ -6,7 +6,7 @@ namespace Content.Server.Lavaland.Artefacts.Systems; public sealed class FireSelfActionSystem : EntitySystem { - [Dependency] private readonly FlammableSystem _flammable = default!; + [Dependency] private FlammableSystem _flammable = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/HierophantWeaponSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/HierophantWeaponSystem.cs index 554c7aee1b..fbb6e21c50 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/HierophantWeaponSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/HierophantWeaponSystem.cs @@ -14,11 +14,11 @@ namespace Content.Server.Lavaland.Artefacts.Systems; public sealed partial class HierophantClubSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly UseDelaySystem _delay = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private UseDelaySystem _delay = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/LavaStaffSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/LavaStaffSystem.cs index 92cb08d365..5dfa22e503 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/LavaStaffSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/LavaStaffSystem.cs @@ -11,13 +11,13 @@ namespace Content.Server.Lavaland.Artefacts.Systems; public sealed class LavaStaffSystem : EntitySystem { - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private ITileDefinitionManager _tileDefManager = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private UseDelaySystem _useDelay = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/LinkedCubeSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/LinkedCubeSystem.cs index 3e21dad8f0..c0f3af584f 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/LinkedCubeSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/LinkedCubeSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Lavaland.Artefacts.Systems; public sealed class LinkedCubeSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/RodOfAsclepiusSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/RodOfAsclepiusSystem.cs index 74a7657294..adf93265d4 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/RodOfAsclepiusSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/RodOfAsclepiusSystem.cs @@ -22,15 +22,15 @@ namespace Content.Server.Lavaland.Artefacts.Systems; public sealed class RodOfAsclepiusSystem : EntitySystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly DoAfterSystem _doAfter = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedItemSystem _item = default!; - [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private DoAfterSystem _doAfter = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedItemSystem _item = default!; + [Dependency] private ChatSystem _chat = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/ShipInBottleSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/ShipInBottleSystem.cs index fe15ddeb70..da9c293449 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/ShipInBottleSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/ShipInBottleSystem.cs @@ -11,11 +11,11 @@ namespace Content.Server.Lavaland.Artefacts.Systems; public sealed class ShipInBottleSystem : EntitySystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; private static readonly ProtoId Swim = "CanSwim"; diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/SoulStorageSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/SoulStorageSystem.cs index 57b4d5004e..0132ba9e57 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/SoulStorageSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/SoulStorageSystem.cs @@ -9,7 +9,7 @@ namespace Content.Server.Lavaland.Artefacts.Systems; public sealed class SoulStorageSystem : EntitySystem { - [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private SharedHandsSystem _hands = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/Artefacts/VoiceOfGodSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Artefacts/VoiceOfGodSystem.cs index 4aa76b335e..9e9fa2c486 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Artefacts/VoiceOfGodSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Artefacts/VoiceOfGodSystem.cs @@ -37,25 +37,25 @@ namespace Content.Server.Lavaland.Artefacts.Systems; public sealed class VoiceOfGodSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _admin = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; - [Dependency] private readonly BloodstreamSystem _bloodstream = default!; - [Dependency] private readonly FlammableSystem _flammable = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly SharedStaminaSystem _stamina = default!; - [Dependency] private readonly SharedBuckleSystem _buckle = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly SleepingSystem _sleeping = default!; - [Dependency] private readonly VomitSystem _vomit = default!; + [Dependency] private IAdminLogManager _admin = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private StatusEffectsSystem _statusEffects = default!; + [Dependency] private BloodstreamSystem _bloodstream = default!; + [Dependency] private FlammableSystem _flammable = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private SharedStaminaSystem _stamina = default!; + [Dependency] private SharedBuckleSystem _buckle = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private SleepingSystem _sleeping = default!; + [Dependency] private VomitSystem _vomit = default!; // TODO: Make loc if you not lazy as me. private static readonly Dictionary Commands = new() diff --git a/Content.Server/_Wega/Lavaland/Systems/FloraSystem.cs b/Content.Server/_Wega/Lavaland/Systems/FloraSystem.cs index 3e688ebe5f..dd67c654cb 100644 --- a/Content.Server/_Wega/Lavaland/Systems/FloraSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/FloraSystem.cs @@ -11,13 +11,13 @@ namespace Content.Server.Lavaland; public sealed class FloraSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; - [Dependency] private readonly SharedPointLightSystem _light = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedToolSystem _tool = default!; + [Dependency] private SharedPointLightSystem _light = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/HandCapsuleSystem.cs b/Content.Server/_Wega/Lavaland/Systems/HandCapsuleSystem.cs index 63a8a89347..b4482b32e1 100644 --- a/Content.Server/_Wega/Lavaland/Systems/HandCapsuleSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/HandCapsuleSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.Lavaland.Systems; public sealed partial class HandCapsuleSystem : EntitySystem { - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private MapLoaderSystem _loader = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private UseDelaySystem _useDelay = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/LavalandPenalServitudeShuttleSystem.Console.cs b/Content.Server/_Wega/Lavaland/Systems/LavalandPenalServitudeShuttleSystem.Console.cs index daf239be22..d66536d691 100644 --- a/Content.Server/_Wega/Lavaland/Systems/LavalandPenalServitudeShuttleSystem.Console.cs +++ b/Content.Server/_Wega/Lavaland/Systems/LavalandPenalServitudeShuttleSystem.Console.cs @@ -9,8 +9,8 @@ namespace Content.Server.Lavaland.Systems; public sealed partial class LavalandPenalServitudeShuttleSystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private UserInterfaceSystem _ui = default!; private void OnConsoleInit(EntityUid uid, PenalServitudeShuttleConsoleComponent component, MapInitEvent args) { diff --git a/Content.Server/_Wega/Lavaland/Systems/LavalandPenalServitudeShuttleSystem.cs b/Content.Server/_Wega/Lavaland/Systems/LavalandPenalServitudeShuttleSystem.cs index 5e704b6401..853531a8a8 100644 --- a/Content.Server/_Wega/Lavaland/Systems/LavalandPenalServitudeShuttleSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/LavalandPenalServitudeShuttleSystem.cs @@ -16,11 +16,11 @@ namespace Content.Server.Lavaland.Systems; public sealed partial class LavalandPenalServitudeShuttleSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ShuttleSystem _shuttleSystem = default!; - [Dependency] private readonly DockingSystem _dockingSystem = default!; - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly MapSystem _map = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ShuttleSystem _shuttleSystem = default!; + [Dependency] private DockingSystem _dockingSystem = default!; + [Dependency] private MapLoaderSystem _loader = default!; + [Dependency] private MapSystem _map = default!; private static readonly string DockStation = "DockPenalServitudeStation"; private static readonly string DockPenalServitude = "DockPenalServitude"; diff --git a/Content.Server/_Wega/Lavaland/Systems/LavalandShuttleSystem.Console.cs b/Content.Server/_Wega/Lavaland/Systems/LavalandShuttleSystem.Console.cs index e96669bc3f..7196420689 100644 --- a/Content.Server/_Wega/Lavaland/Systems/LavalandShuttleSystem.Console.cs +++ b/Content.Server/_Wega/Lavaland/Systems/LavalandShuttleSystem.Console.cs @@ -10,8 +10,8 @@ namespace Content.Server.Lavaland.Systems; public sealed partial class LavalandShuttleSystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private UserInterfaceSystem _ui = default!; private void OnConsoleInit(EntityUid uid, LavalandShuttleConsoleComponent component, MapInitEvent args) { diff --git a/Content.Server/_Wega/Lavaland/Systems/LavalandShuttleSystem.cs b/Content.Server/_Wega/Lavaland/Systems/LavalandShuttleSystem.cs index 741543dcb5..d58587e66d 100644 --- a/Content.Server/_Wega/Lavaland/Systems/LavalandShuttleSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/LavalandShuttleSystem.cs @@ -17,11 +17,11 @@ namespace Content.Server.Lavaland.Systems; public sealed partial class LavalandShuttleSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ShuttleSystem _shuttleSystem = default!; - [Dependency] private readonly DockingSystem _dockingSystem = default!; - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly MapSystem _map = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ShuttleSystem _shuttleSystem = default!; + [Dependency] private DockingSystem _dockingSystem = default!; + [Dependency] private MapLoaderSystem _loader = default!; + [Dependency] private MapSystem _map = default!; private static readonly string DockStation = "DockLavalandStation"; private static readonly string DockOutpost = "DockLavalandOutpost"; diff --git a/Content.Server/_Wega/Lavaland/Systems/LavalandSystem.cs b/Content.Server/_Wega/Lavaland/Systems/LavalandSystem.cs index f92d27bb78..0ecbe42a54 100644 --- a/Content.Server/_Wega/Lavaland/Systems/LavalandSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/LavalandSystem.cs @@ -50,30 +50,30 @@ namespace Content.Server.Lavaland.Systems; // TODO: До лучших времен доделать настройки планеты через прото под [TOP SECRET]. public sealed partial class LavalandSystem : SharedLavalandSystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly AtmosphereSystem _atmos = default!; - [Dependency] private readonly BiomeSystem _biome = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly DecalSystem _decals = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly GridFixtureSystem _fixture = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly MapSystem _map = default!; - [Dependency] private readonly MetaDataSystem _meta = default!; - [Dependency] private readonly PhysicsSystem _physics = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly RadioSystem _radio = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedCameraRecoilSystem _recoil = default!; - [Dependency] private readonly SharedShuttleSystem _iff = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedWeatherSystem _weather = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private AtmosphereSystem _atmos = default!; + [Dependency] private BiomeSystem _biome = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private DecalSystem _decals = default!; + [Dependency] private SharedGravitySystem _gravity = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private GridFixtureSystem _fixture = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private MapLoaderSystem _loader = default!; + [Dependency] private MapSystem _map = default!; + [Dependency] private MetaDataSystem _meta = default!; + [Dependency] private PhysicsSystem _physics = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private RadioSystem _radio = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedCameraRecoilSystem _recoil = default!; + [Dependency] private SharedShuttleSystem _iff = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedWeatherSystem _weather = default!; + [Dependency] private TurfSystem _turf = default!; private static readonly ProtoId StructuralDamage = "Structural"; private static readonly ProtoId CausticDamage = "Caustic"; diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/AshDrake/AshDrakeSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/AshDrake/AshDrakeSystem.cs index 29733cf26f..5ba641d65c 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/AshDrake/AshDrakeSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/AshDrake/AshDrakeSystem.cs @@ -29,20 +29,20 @@ namespace Content.Server.Lavaland.Mobs; public sealed partial class AshDrakeSystem : EntitySystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly SharedCameraRecoilSystem _recoil = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedGunSystem _gun = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly MobThresholdSystem _threshold = default!; - [Dependency] private readonly NPCSystem _npc = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private SharedCameraRecoilSystem _recoil = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedGunSystem _gun = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private MobThresholdSystem _threshold = default!; + [Dependency] private NPCSystem _npc = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TurfSystem _turf = default!; private Dictionary _activeArenas = new(); diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/BloodDrunkMiner/BloodDrunkMinerSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/BloodDrunkMiner/BloodDrunkMinerSystem.cs index 0a06adff1c..56a2a4fc4a 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/BloodDrunkMiner/BloodDrunkMinerSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/BloodDrunkMiner/BloodDrunkMinerSystem.cs @@ -7,8 +7,8 @@ namespace Content.Server.Lavaland.Mobs; public sealed partial class BloodDrunkMinerSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/Bubblegum/BubblegumSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/Bubblegum/BubblegumSystem.cs index 6cc276c998..55a75b969a 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/Bubblegum/BubblegumSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/Bubblegum/BubblegumSystem.cs @@ -33,20 +33,20 @@ namespace Content.Server.Lavaland.Mobs; public sealed partial class BubblegumSystem : EntitySystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly MobThresholdSystem _threshold = default!; - [Dependency] private readonly NPCUseActionsOnTargetSystem _npcActions = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly NPCSystem _npc = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private MobThresholdSystem _threshold = default!; + [Dependency] private NPCUseActionsOnTargetSystem _npcActions = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private NPCSystem _npc = default!; private const float LowHealthThreshold = 0.5f; private const float PassiveHandRadius = 5f; diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/Colossus/ColossusSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/Colossus/ColossusSystem.cs index e4fedfec9c..7748d45f0c 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/Colossus/ColossusSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/Colossus/ColossusSystem.cs @@ -17,12 +17,12 @@ namespace Content.Server.Lavaland; public sealed class ColossusSystem : EntitySystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly SharedGunSystem _gun = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MobThresholdSystem _threshold = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private SharedGunSystem _gun = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MobThresholdSystem _threshold = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/Hierophant/HierophantSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/Hierophant/HierophantSystem.cs index 2d08c01497..7ff24e5b69 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/Hierophant/HierophantSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/Hierophant/HierophantSystem.cs @@ -23,15 +23,15 @@ namespace Content.Server.Lavaland.Mobs; /// public sealed partial class HierophantSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly NPCUseActionsOnTargetSystem _npcActions = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly MobThresholdSystem _threshold = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private NPCUseActionsOnTargetSystem _npcActions = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private MobThresholdSystem _threshold = default!; private const float LowHealthThreshold = 0.5f; private static readonly EntProtoId SpawnPrototype = "EffectHierophantSquare"; diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/Legion/LegionSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/Legion/LegionSystem.cs index 2d2b5f442a..cd501b9fed 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/Legion/LegionSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/Legion/LegionSystem.cs @@ -32,20 +32,20 @@ namespace Content.Server.Lavaland.Mobs; public sealed partial class LegionSystem : EntitySystem { - [Dependency] private readonly SharedAchievementsSystem _achievement = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly PolymorphSystem _polymorph = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SurgerySystem _surgery = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private SharedAchievementsSystem _achievement = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private PolymorphSystem _polymorph = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SurgerySystem _surgery = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TurfSystem _turf = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/MegafaunaSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/MegafaunaSystem.cs index 7ca34b85ec..ecf8bc815d 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/MegafaunaSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/MegafaunaSystem.cs @@ -14,11 +14,11 @@ namespace Content.Server.Lavaland.Mobs; public sealed partial class MegafaunaSystem : EntitySystem { - [Dependency] private readonly SharedAchievementsSystem _achievement = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambient = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly NPCSystem _npc = default!; + [Dependency] private SharedAchievementsSystem _achievement = default!; + [Dependency] private SharedAmbientSoundSystem _ambient = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private NPCSystem _npc = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Lavaland/Systems/NecropolisTendrilSystem.cs b/Content.Server/_Wega/Lavaland/Systems/NecropolisTendrilSystem.cs index 975572187e..f653de5dc4 100644 --- a/Content.Server/_Wega/Lavaland/Systems/NecropolisTendrilSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/NecropolisTendrilSystem.cs @@ -16,11 +16,11 @@ namespace Content.Server.Lavaland.Systems; public sealed class NecropolisTendrilSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private MobStateSystem _mobState = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/MartialArts/MartialArtsSystem.cs b/Content.Server/_Wega/MartialArts/MartialArtsSystem.cs index 9fea519a9b..7165945da5 100644 --- a/Content.Server/_Wega/MartialArts/MartialArtsSystem.cs +++ b/Content.Server/_Wega/MartialArts/MartialArtsSystem.cs @@ -12,11 +12,11 @@ namespace Content.Server.Martial.Arts; public sealed partial class MartialArtsSystem : SharedMartialArtsSystem { - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffect = default!; - [Dependency] private readonly SharedStaminaSystem _stamina = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private StatusEffectsSystem _statusEffect = default!; + [Dependency] private SharedStaminaSystem _stamina = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private IRobustRandom _random = default!; private readonly Dictionary> _blowHandlers; diff --git a/Content.Server/_Wega/MartialArts/Styles/BoxingStyle.cs b/Content.Server/_Wega/MartialArts/Styles/BoxingStyle.cs index 69da0eb6e3..0d201d6f7b 100644 --- a/Content.Server/_Wega/MartialArts/Styles/BoxingStyle.cs +++ b/Content.Server/_Wega/MartialArts/Styles/BoxingStyle.cs @@ -11,9 +11,9 @@ namespace Content.Server.Martial.Arts; /// Boxe public sealed partial class MartialArtsSystem { - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly IMapManager _mapMan = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private IMapManager _mapMan = default!; + [Dependency] private SharedMapSystem _map = default!; private void InitializeBoxing() { diff --git a/Content.Server/_Wega/Medical/InjectorFabticatorSystem.cs b/Content.Server/_Wega/Medical/InjectorFabticatorSystem.cs index 2e5528875e..8211621eaa 100644 --- a/Content.Server/_Wega/Medical/InjectorFabticatorSystem.cs +++ b/Content.Server/_Wega/Medical/InjectorFabticatorSystem.cs @@ -15,12 +15,12 @@ namespace Content.Server.Injector.Fabticator; public sealed class InjectorFabticatorSystem : EntitySystem { - [Dependency] private readonly SharedAmbientSoundSystem _ambient = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionSystem = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private SharedAmbientSoundSystem _ambient = default!; + [Dependency] private SharedSolutionContainerSystem _solutionSystem = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private MetaDataSystem _metaData = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Mining/MiningConsoleSystem.cs b/Content.Server/_Wega/Mining/MiningConsoleSystem.cs index a188850d0a..f924c3c5d7 100644 --- a/Content.Server/_Wega/Mining/MiningConsoleSystem.cs +++ b/Content.Server/_Wega/Mining/MiningConsoleSystem.cs @@ -13,10 +13,10 @@ namespace Content.Server.Mining; public sealed class MiningConsoleSystem : EntitySystem { - [Dependency] private readonly SharedAmbientSoundSystem _ambient = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly StackSystem _stack = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private SharedAmbientSoundSystem _ambient = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private StackSystem _stack = default!; + [Dependency] private UserInterfaceSystem _ui = default!; private static readonly ProtoId Credit = "Credit"; private static readonly EntProtoId Disk = "ResearchDisk"; diff --git a/Content.Server/_Wega/Mining/MiningServerSystem.cs b/Content.Server/_Wega/Mining/MiningServerSystem.cs index b4feed1ba4..54c5c86575 100644 --- a/Content.Server/_Wega/Mining/MiningServerSystem.cs +++ b/Content.Server/_Wega/Mining/MiningServerSystem.cs @@ -11,9 +11,9 @@ namespace Content.Server.Mining; public sealed class MiningServerSystem : EntitySystem { - [Dependency] private readonly SharedAmbientSoundSystem _ambient = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private SharedAmbientSoundSystem _ambient = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/ModularSuitSystem.Power.cs b/Content.Server/_Wega/ModularSuit/ModularSuitSystem.Power.cs index d6e7f20986..b1c972e07c 100644 --- a/Content.Server/_Wega/ModularSuit/ModularSuitSystem.Power.cs +++ b/Content.Server/_Wega/ModularSuit/ModularSuitSystem.Power.cs @@ -7,7 +7,7 @@ namespace Content.Server.Modular.Suit; public sealed partial class ModularSuitSystem { - [Dependency] private readonly PowerCellSystem _powerCell = default!; + [Dependency] private PowerCellSystem _powerCell = default!; public const string CellContainer = "cell_slot"; diff --git a/Content.Server/_Wega/ModularSuit/ModularSuitSystem.Ui.cs b/Content.Server/_Wega/ModularSuit/ModularSuitSystem.Ui.cs index b92103344b..a03d3e7fc7 100644 --- a/Content.Server/_Wega/ModularSuit/ModularSuitSystem.Ui.cs +++ b/Content.Server/_Wega/ModularSuit/ModularSuitSystem.Ui.cs @@ -6,7 +6,7 @@ namespace Content.Server.Modular.Suit; public sealed partial class ModularSuitSystem { - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private UserInterfaceSystem _ui = default!; private void InitializeUi() { diff --git a/Content.Server/_Wega/ModularSuit/ModularSuitSystem.cs b/Content.Server/_Wega/ModularSuit/ModularSuitSystem.cs index 409cb73636..e578dbdb74 100644 --- a/Content.Server/_Wega/ModularSuit/ModularSuitSystem.cs +++ b/Content.Server/_Wega/ModularSuit/ModularSuitSystem.cs @@ -21,13 +21,13 @@ namespace Content.Server.Modular.Suit; public sealed partial class ModularSuitSystem : SharedModularSuitSystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPointLightSystem _light = default!; - [Dependency] private readonly LockSystem _lock = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPointLightSystem _light = default!; + [Dependency] private LockSystem _lock = default!; + [Dependency] private SharedToolSystem _tool = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; private const float ModuleExtractTime = 1.5f; private const float CoreExtractTime = 4.0f; diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/AtrocinatorModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/AtrocinatorModuleHandler.cs index df2d6386ba..97d2be5110 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/AtrocinatorModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/AtrocinatorModuleHandler.cs @@ -9,10 +9,10 @@ namespace Content.Server.Modular.Suit; public sealed class AtrocinatorModuleHandler : ModuleActionHandler { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private ThrowingSystem _throwing = default!; private const float Radius = 5f; private const float ThrowStrength = 20f; diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/DispenserModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/DispenserModuleHandler.cs index a33a459be6..7aef56ef15 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/DispenserModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/DispenserModuleHandler.cs @@ -6,8 +6,8 @@ namespace Content.Server.Modular.Suit; public sealed class DispenserModuleHandler : ModuleActionHandler { - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/EnergyShieldModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/EnergyShieldModuleHandler.cs index 1917f98876..9b38a050e2 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/EnergyShieldModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/EnergyShieldModuleHandler.cs @@ -5,7 +5,7 @@ namespace Content.Server.Modular.Suit; public sealed class EnergyShieldModuleHandler : ModuleActionHandler { - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/HolsterModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/HolsterModuleHandler.cs index 604143ba9e..78c38c13ed 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/HolsterModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/HolsterModuleHandler.cs @@ -12,12 +12,12 @@ namespace Content.Server.Modular.Suit; public sealed class HolsterModuleHandler : ModuleActionHandler { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly SharedGunSystem _gun = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly SharedWieldableSystem _wieldable = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedGunSystem _gun = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private SharedWieldableSystem _wieldable = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/LightModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/LightModuleHandler.cs index 657db4ac2e..115926c583 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/LightModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/LightModuleHandler.cs @@ -8,9 +8,9 @@ namespace Content.Server.Modular.Suit; public sealed class LightModuleHandler : ModuleActionHandler { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedPointLightSystem _light = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedPointLightSystem _light = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TanningModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TanningModuleHandler.cs index 882bad1b39..287c7a675c 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TanningModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TanningModuleHandler.cs @@ -6,7 +6,7 @@ namespace Content.Server.Modular.Suit; public sealed class TanningModuleHandler : ModuleActionHandler { - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; private const float MinColorValue = 0.3f; private const float DarkenFactor = 0.85f; diff --git a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TeleporterModuleHandler.cs b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TeleporterModuleHandler.cs index a923bb6d52..3699fd95e6 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TeleporterModuleHandler.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/EventsHandlers/TeleporterModuleHandler.cs @@ -6,9 +6,9 @@ namespace Content.Server.Modular.Suit; public sealed class TeleporterModuleHandler : ModuleActionHandler { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedTransformSystem _transform = default!; public const float TeleportRadius = 5f; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleCarrySystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleCarrySystem.cs index 4cef555202..fd7f30f71d 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleCarrySystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleCarrySystem.cs @@ -7,8 +7,8 @@ namespace Content.Server.Modular.Suit; public sealed class AffectedModuleCarrySystem : EntitySystem { - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speed = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private MovementSpeedModifierSystem _speed = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleSpringlockSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleSpringlockSystem.cs index dfd48dd1ca..25b64178ca 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleSpringlockSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Affected/AffectedModuleSpringlockSystem.cs @@ -13,12 +13,12 @@ namespace Content.Server.Modular.Suit; public sealed class AffectedModuleSpringlockSystem : EntitySystem { - [Dependency] private readonly SharedAchievementsSystem _achievement = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedModularSuitSystem _modular = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedAchievementsSystem _achievement = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedModularSuitSystem _modular = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitGrabberModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitGrabberModuleSystem.cs index dad239f5b5..1c9a4aa303 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitGrabberModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitGrabberModuleSystem.cs @@ -15,13 +15,13 @@ namespace Content.Server.Modular.Suit; public sealed class ModularSuitGrabberModuleSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly ModularSuitSystem _modularSuit = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private ModularSuitSystem _modularSuit = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _transform = default!; public const string Container = "grabber_storage"; diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitLightModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitLightModuleSystem.cs index 1dc91f84d8..77fb86a057 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitLightModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitLightModuleSystem.cs @@ -11,11 +11,11 @@ namespace Content.Server.Modular.Suit; public sealed class ModularSuitLightModuleSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedPointLightSystem _light = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedPointLightSystem _light = default!; + [Dependency] private SharedToolSystem _tool = default!; + [Dependency] private UserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitMicrowaveModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitMicrowaveModuleSystem.cs index 06dc6b5fe2..0a19b5f3e7 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitMicrowaveModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitMicrowaveModuleSystem.cs @@ -13,12 +13,12 @@ namespace Content.Server.Modular.Suit; public sealed class ModularSuitMicrowaveSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly ModularSuitSystem _modularSuit = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly TemperatureSystem _temperature = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private ModularSuitSystem _modularSuit = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private TemperatureSystem _temperature = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitSpringlockModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitSpringlockModuleSystem.cs index 3ae1fb582f..e2e6ae472d 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitSpringlockModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitSpringlockModuleSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.Modular.Suit; public sealed class ModularSuitSpringlockModuleSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitStorageModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitStorageModuleSystem.cs index 41df9887ad..db8c65cb79 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitStorageModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/Items/ModularSuitStorageModuleSystem.cs @@ -7,8 +7,8 @@ namespace Content.Server.Modular.Suit; public sealed class ModularSuitStorageModuleSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedStorageSystem _storage = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedStorageSystem _storage = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitActionModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitActionModuleSystem.cs index 01a6d0c707..47c5bca7bc 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitActionModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitActionModuleSystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Modular.Suit; public sealed class ModularSuitActionModuleSystem : EntitySystem { - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private UserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitItemModuleSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitItemModuleSystem.cs index 2ac0d3f5b9..ede45df2bf 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitItemModuleSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitItemModuleSystem.cs @@ -10,9 +10,9 @@ namespace Content.Server.Modular.Suit; public sealed class ModularSuitItemModuleSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private ItemToggleSystem _toggle = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleContainerRequirementSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleContainerRequirementSystem.cs index c65dcfd2f1..9de08c6e75 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleContainerRequirementSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleContainerRequirementSystem.cs @@ -6,8 +6,8 @@ namespace Content.Server.Modular.Suit; public sealed class ModularSuitModuleContainerRequirementSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleEffectSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleEffectSystem.cs index 7486e30e62..e99dc100a9 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleEffectSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitModuleEffectSystem.cs @@ -8,8 +8,8 @@ namespace Content.Server.Modular.Suit; public sealed class ModularSuitSuitEffectSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private InventorySystem _inventory = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitPermanentInstalledSystem.cs b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitPermanentInstalledSystem.cs index 09d59a3a66..b6af73ce93 100644 --- a/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitPermanentInstalledSystem.cs +++ b/Content.Server/_Wega/ModularSuit/Modules/Systems/ModularSuitPermanentInstalledSystem.cs @@ -4,7 +4,7 @@ namespace Content.Server.Modular.Suit; public sealed class ModularSuitPermanentInstalledSystem : EntitySystem { - [Dependency] private readonly SharedModularSuitSystem _modularSuit = default!; + [Dependency] private SharedModularSuitSystem _modularSuit = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Movement/Systems/FlyAbilitySystem.cs b/Content.Server/_Wega/Movement/Systems/FlyAbilitySystem.cs index 0368297b8f..5191514183 100644 --- a/Content.Server/_Wega/Movement/Systems/FlyAbilitySystem.cs +++ b/Content.Server/_Wega/Movement/Systems/FlyAbilitySystem.cs @@ -10,10 +10,10 @@ namespace Content.Server.Movement.Systems; public sealed class FlyAbilitySystem : SharedFlyAbilitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly StaminaSystem _stamina = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private StaminaSystem _stamina = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; private Entity _action; diff --git a/Content.Server/_Wega/NPC/HTN/Preconditions/CheckSlimeHungerPrecondition.cs b/Content.Server/_Wega/NPC/HTN/Preconditions/CheckSlimeHungerPrecondition.cs index f5e09465dc..0380eea936 100644 --- a/Content.Server/_Wega/NPC/HTN/Preconditions/CheckSlimeHungerPrecondition.cs +++ b/Content.Server/_Wega/NPC/HTN/Preconditions/CheckSlimeHungerPrecondition.cs @@ -4,7 +4,7 @@ namespace Content.Server.NPC.HTN.Preconditions; public sealed partial class CheckSlimeHungerPrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; [DataField("targetState")] public SlimeBehaviorState TargetState; diff --git a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/MaintainRangeOperator.cs b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/MaintainRangeOperator.cs index 3cc96aabfd..7424e411bf 100644 --- a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/MaintainRangeOperator.cs +++ b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/MaintainRangeOperator.cs @@ -10,7 +10,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat; public sealed partial class MaintainRangeOperator : HTNOperator, IHtnConditionalShutdown { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; private NPCSteeringSystem _steering = default!; private PathfindingSystem _pathfind = default!; private SharedTransformSystem _transform = default!; diff --git a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeEatOperator.cs b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeEatOperator.cs index 5b9f3c36a0..91b57f79fd 100644 --- a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeEatOperator.cs +++ b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeEatOperator.cs @@ -9,8 +9,8 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; public sealed partial class SlimeEatOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entMan = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IEntityManager _entMan = default!; + [Dependency] private IGameTiming _gameTiming = default!; [DataField("targetKey")] public string TargetKey = "FoodTarget"; diff --git a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindFoodOperator.cs b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindFoodOperator.cs index ccb98f8e6c..8f78f4bf1c 100644 --- a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindFoodOperator.cs +++ b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindFoodOperator.cs @@ -7,7 +7,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; public sealed partial class SlimeFindFoodOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; [DataField("targetKey")] public string TargetKey = "FoodTarget"; diff --git a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindTargetOperator.cs b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindTargetOperator.cs index a5ff9f847e..a0098222fd 100644 --- a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindTargetOperator.cs +++ b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeFindTargetOperator.cs @@ -10,7 +10,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; public sealed partial class SlimeFindTargetOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; [DataField("targetKey")] public string TargetKey = "AttackTarget"; diff --git a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeMeleeOperator.cs b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeMeleeOperator.cs index 850df4c442..0104c71c60 100644 --- a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeMeleeOperator.cs +++ b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeMeleeOperator.cs @@ -10,7 +10,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; public sealed partial class SlimeMeleeOperator : HTNOperator, IHtnConditionalShutdown { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; [DataField("targetKey")] public string TargetKey = "AttackTarget"; diff --git a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeWanderOperator.cs b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeWanderOperator.cs index 0f54f6b2cb..3a40acb8ed 100644 --- a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeWanderOperator.cs +++ b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/SlimeWanderOperator.cs @@ -10,7 +10,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; public sealed partial class SlimeWanderOperator : HTNOperator, IHtnConditionalShutdown { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; private NPCSteeringSystem _steering = default!; private PathfindingSystem _pathfind = default!; diff --git a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/UpdateFollowCoordinatesOperator.cs b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/UpdateFollowCoordinatesOperator.cs index fcd963fff6..a88e3d5354 100644 --- a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/UpdateFollowCoordinatesOperator.cs +++ b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/UpdateFollowCoordinatesOperator.cs @@ -6,7 +6,7 @@ namespace Content.Server.NPC.HTN.Preconditions; [UsedImplicitly] public sealed partial class UpdateFollowCoordinatesOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField("followTargetKey")] public string FollowTargetKey = "FollowTarget"; diff --git a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/UpdateTargetCoordinatesOperator.cs b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/UpdateTargetCoordinatesOperator.cs index b6abb6252b..72f66c77b1 100644 --- a/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/UpdateTargetCoordinatesOperator.cs +++ b/Content.Server/_Wega/NPC/HTN/PrimitiveTasks/Operators/UpdateTargetCoordinatesOperator.cs @@ -10,7 +10,7 @@ public sealed partial class UpdateTargetCoordinatesOperator : HTNOperator [DataField("outputKey")] public string OutputKey = default!; - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public override void Startup(NPCBlackboard blackboard) { diff --git a/Content.Server/_Wega/NPC/Systems/NPCHandSwitcherSystem.cs b/Content.Server/_Wega/NPC/Systems/NPCHandSwitcherSystem.cs index dbaea3e5f4..ac16637d85 100644 --- a/Content.Server/_Wega/NPC/Systems/NPCHandSwitcherSystem.cs +++ b/Content.Server/_Wega/NPC/Systems/NPCHandSwitcherSystem.cs @@ -13,10 +13,10 @@ namespace Content.Server.NPC.Systems; /// public sealed class NPCHandSwitcherSystem : EntitySystem { - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly NPCSystem _npc = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private NPCSystem _npc = default!; public override void Update(float frameTime) { diff --git a/Content.Server/_Wega/NPC/Systems/NPCOptimizationSystem.cs b/Content.Server/_Wega/NPC/Systems/NPCOptimizationSystem.cs index 9454ab33f5..4723627653 100644 --- a/Content.Server/_Wega/NPC/Systems/NPCOptimizationSystem.cs +++ b/Content.Server/_Wega/NPC/Systems/NPCOptimizationSystem.cs @@ -15,12 +15,12 @@ namespace Content.Server.NPC.Systems; public sealed class NPCOptimizationSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly NPCSystem _npc = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private NPCSystem _npc = default!; + [Dependency] private IRobustRandom _random = default!; public bool Enabled = true; private float _activationRadius = 21f; diff --git a/Content.Server/_Wega/NPC/Systems/NPCUseActionsOnTargetSystem.cs b/Content.Server/_Wega/NPC/Systems/NPCUseActionsOnTargetSystem.cs index 9bfadaf706..4978a01408 100644 --- a/Content.Server/_Wega/NPC/Systems/NPCUseActionsOnTargetSystem.cs +++ b/Content.Server/_Wega/NPC/Systems/NPCUseActionsOnTargetSystem.cs @@ -12,11 +12,11 @@ namespace Content.Server.NPC.Systems; public sealed class NPCUseActionsOnTargetSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly NPCSystem _npc = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private NPCSystem _npc = default!; /// public override void Initialize() diff --git a/Content.Server/_Wega/NightLightning/NightLightningSystem.cs b/Content.Server/_Wega/NightLightning/NightLightningSystem.cs index 76485c7aa9..68edeffa6d 100644 --- a/Content.Server/_Wega/NightLightning/NightLightningSystem.cs +++ b/Content.Server/_Wega/NightLightning/NightLightningSystem.cs @@ -11,10 +11,10 @@ namespace Content.Server.Night.Lightning; public sealed class NightLightningSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedPointLightSystem _light = default!; - [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedPointLightSystem _light = default!; + [Dependency] private ChatSystem _chat = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/NullRod/NullDamageSystem.cs b/Content.Server/_Wega/NullRod/NullDamageSystem.cs index a00d7c7770..f79481eb15 100644 --- a/Content.Server/_Wega/NullRod/NullDamageSystem.cs +++ b/Content.Server/_Wega/NullRod/NullDamageSystem.cs @@ -12,9 +12,9 @@ namespace Content.Server.NullRod; public sealed class NullDamageSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _admin = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private IAdminLogManager _admin = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedHandsSystem _hands = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedConditionSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedConditionSystem.cs index 60c865e837..8e073045e4 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedConditionSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedConditionSystem.cs @@ -6,7 +6,7 @@ namespace Content.Server.Objectives.Systems; public sealed class BloodBrotherSharedConditionSystem : EntitySystem { - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private SharedMindSystem _mind = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedEscapeConditionSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedEscapeConditionSystem.cs index 40c6ecf63f..10a7d07d8e 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedEscapeConditionSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedEscapeConditionSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Objectives.Systems; public sealed class BloodBrotherSharedEscapeConditionSystem : EntitySystem { - [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly BloodBrotherSharedConditionSystem _sharedCondition = default!; + [Dependency] private EmergencyShuttleSystem _emergencyShuttle = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private BloodBrotherSharedConditionSystem _sharedCondition = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedHijackConditionSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedHijackConditionSystem.cs index 71fc734217..a3867b7281 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedHijackConditionSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedHijackConditionSystem.cs @@ -14,11 +14,11 @@ namespace Content.Server.Objectives.Systems; public sealed class BloodBrotherSharedHijackConditionSystem : EntitySystem { - [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedRoleSystem _role = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly BloodBrotherSharedConditionSystem _sharedCondition = default!; + [Dependency] private EmergencyShuttleSystem _emergencyShuttle = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedRoleSystem _role = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private BloodBrotherSharedConditionSystem _sharedCondition = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKeepAliveConditionSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKeepAliveConditionSystem.cs index 473c6a4bfa..d49fae01d0 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKeepAliveConditionSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKeepAliveConditionSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.Objectives.Systems; public sealed class BloodBrotherSharedKeepAliveConditionSystem : EntitySystem { - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly TargetObjectiveSystem _target = default!; - [Dependency] private readonly BloodBrotherSharedConditionSystem _sharedCondition = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private TargetObjectiveSystem _target = default!; + [Dependency] private BloodBrotherSharedConditionSystem _sharedCondition = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKillConditionSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKillConditionSystem.cs index 54dd9b79d3..7a89f9bfd4 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKillConditionSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedKillConditionSystem.cs @@ -9,11 +9,11 @@ namespace Content.Server.Objectives.Systems; public sealed class BloodBrotherSharedKillConditionSystem : EntitySystem { - [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly TargetObjectiveSystem _target = default!; - [Dependency] private readonly BloodBrotherSharedConditionSystem _sharedCondition = default!; + [Dependency] private EmergencyShuttleSystem _emergencyShuttle = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private TargetObjectiveSystem _target = default!; + [Dependency] private BloodBrotherSharedConditionSystem _sharedCondition = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedStealConditionSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedStealConditionSystem.cs index ee2e1f594f..846680f790 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedStealConditionSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodBrotherSharedStealConditionSystem.cs @@ -17,14 +17,14 @@ namespace Content.Server.Objectives.Systems; public sealed class BloodBrotherSharedStealConditionSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedObjectivesSystem _objectives = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly BloodBrotherSharedConditionSystem _sharedCondition = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedObjectivesSystem _objectives = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private BloodBrotherSharedConditionSystem _sharedCondition = default!; private EntityQuery _containerQuery; private HashSet> _nearestEnts = new(); diff --git a/Content.Server/_Wega/Objectives/Systems/BloodCultRitualObjectiveSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodCultRitualObjectiveSystem.cs index 6abd3dc6c1..3e46e45a2c 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodCultRitualObjectiveSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodCultRitualObjectiveSystem.cs @@ -8,7 +8,7 @@ namespace Content.Server.Objectives.Systems; public sealed class BloodCultRitualObjectiveSystem : EntitySystem { - [Dependency] private readonly BloodCultRuleSystem _bloodCult = default!; + [Dependency] private BloodCultRuleSystem _bloodCult = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Objectives/Systems/BloodCultTargetObjectiveSystem.cs b/Content.Server/_Wega/Objectives/Systems/BloodCultTargetObjectiveSystem.cs index 4d068442da..c5c66723b2 100644 --- a/Content.Server/_Wega/Objectives/Systems/BloodCultTargetObjectiveSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/BloodCultTargetObjectiveSystem.cs @@ -5,7 +5,7 @@ namespace Content.Server.Objectives.Systems; public sealed class BloodCultTargetObjectiveSystem : EntitySystem { - [Dependency] private readonly TargetObjectiveSystem _target = default!; + [Dependency] private TargetObjectiveSystem _target = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Objectives/Systems/VeilCultBeaconObjectiveSystem.cs b/Content.Server/_Wega/Objectives/Systems/VeilCultBeaconObjectiveSystem.cs index f103756edf..d28c0979bc 100644 --- a/Content.Server/_Wega/Objectives/Systems/VeilCultBeaconObjectiveSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/VeilCultBeaconObjectiveSystem.cs @@ -6,8 +6,8 @@ namespace Content.Server.Objectives.Systems; public sealed class VeilCultBeaconObjectiveSystem : EntitySystem { - [Dependency] private readonly TargetObjectiveSystem _target = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; + [Dependency] private TargetObjectiveSystem _target = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; public override void Initialize() { @@ -32,4 +32,4 @@ public sealed class VeilCultBeaconObjectiveSystem : EntitySystem args.Progress = 0f; } -} \ No newline at end of file +} diff --git a/Content.Server/_Wega/Objectives/Systems/VeilCultRitualObjectiveSystem.cs b/Content.Server/_Wega/Objectives/Systems/VeilCultRitualObjectiveSystem.cs index cd24ca5096..6a721adde4 100644 --- a/Content.Server/_Wega/Objectives/Systems/VeilCultRitualObjectiveSystem.cs +++ b/Content.Server/_Wega/Objectives/Systems/VeilCultRitualObjectiveSystem.cs @@ -8,7 +8,7 @@ namespace Content.Server.Objectives.Systems; public sealed class VeilCultRitualObjectiveSystem : EntitySystem { - [Dependency] private readonly VeilCultRuleSystem _veilCult = default!; + [Dependency] private VeilCultRuleSystem _veilCult = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Offer/OfferItemSystem.cs b/Content.Server/_Wega/Offer/OfferItemSystem.cs index 0a63144c13..e20a1213a9 100644 --- a/Content.Server/_Wega/Offer/OfferItemSystem.cs +++ b/Content.Server/_Wega/Offer/OfferItemSystem.cs @@ -10,10 +10,10 @@ namespace Content.Server.Offer; public sealed class OfferItemSystem : SharedOfferItemSystem { - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Pain/PainSystem.cs b/Content.Server/_Wega/Pain/PainSystem.cs index 1fe34d15d8..4550816e5e 100644 --- a/Content.Server/_Wega/Pain/PainSystem.cs +++ b/Content.Server/_Wega/Pain/PainSystem.cs @@ -15,13 +15,13 @@ namespace Content.Server.Pain; public sealed class PainSystem : EntitySystem { - [Dependency] private readonly ChatSystem _emoting = default!; - [Dependency] private readonly SharedJitteringSystem _jittering = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly VomitSystem _vomit = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly MovementModStatusSystem _movementMod = default!; + [Dependency] private ChatSystem _emoting = default!; + [Dependency] private SharedJitteringSystem _jittering = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private VomitSystem _vomit = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private MovementModStatusSystem _movementMod = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Paper/ChameleonStampSystem.cs b/Content.Server/_Wega/Paper/ChameleonStampSystem.cs index 03de7d3214..9ff452656b 100644 --- a/Content.Server/_Wega/Paper/ChameleonStampSystem.cs +++ b/Content.Server/_Wega/Paper/ChameleonStampSystem.cs @@ -9,8 +9,8 @@ namespace Content.Server.Paper; public sealed class ChameleonStampSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly QuickDialogSystem _quickDialog = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private QuickDialogSystem _quickDialog = default!; private static readonly Regex HexColorRegex = new Regex("^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{8})$", RegexOptions.Compiled); diff --git a/Content.Server/_Wega/Paper/TicketMachineSystem.cs b/Content.Server/_Wega/Paper/TicketMachineSystem.cs index b36d46750d..96afa7dca4 100644 --- a/Content.Server/_Wega/Paper/TicketMachineSystem.cs +++ b/Content.Server/_Wega/Paper/TicketMachineSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server.Paper; public sealed class TicketMachineSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly PaperSystem _paperSystem = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private PaperSystem _paperSystem = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private UseDelaySystem _useDelay = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Pinpointer/HandheldBeaconSystem.cs b/Content.Server/_Wega/Pinpointer/HandheldBeaconSystem.cs index ab84c72eb8..84da56bdd0 100644 --- a/Content.Server/_Wega/Pinpointer/HandheldBeaconSystem.cs +++ b/Content.Server/_Wega/Pinpointer/HandheldBeaconSystem.cs @@ -10,12 +10,12 @@ namespace Content.Server.Pinpointer; public sealed partial class HandheldBeaconSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly NavMapSystem _navMap = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private NavMapSystem _navMap = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private UserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Projectiles/ProjectileAoESystem.cs b/Content.Server/_Wega/Projectiles/ProjectileAoESystem.cs index 5d4255bf3b..2a9d7b2557 100644 --- a/Content.Server/_Wega/Projectiles/ProjectileAoESystem.cs +++ b/Content.Server/_Wega/Projectiles/ProjectileAoESystem.cs @@ -7,8 +7,8 @@ namespace Content.Server.Projectiles; public sealed class ProjectileAoESystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private EntityLookupSystem _lookup = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Projectiles/ProjectileInfectSystem.cs b/Content.Server/_Wega/Projectiles/ProjectileInfectSystem.cs index 85373852c7..f168fcee01 100644 --- a/Content.Server/_Wega/Projectiles/ProjectileInfectSystem.cs +++ b/Content.Server/_Wega/Projectiles/ProjectileInfectSystem.cs @@ -6,8 +6,8 @@ namespace Content.Server.Projectiles; public sealed class ProjectileInfectSystem : EntitySystem { - [Dependency] private readonly DiseaseSystem _disease = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private DiseaseSystem _disease = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Projectiles/ProjectileLifestealSystem.cs b/Content.Server/_Wega/Projectiles/ProjectileLifestealSystem.cs index c0114d4f98..c9757f46a3 100644 --- a/Content.Server/_Wega/Projectiles/ProjectileLifestealSystem.cs +++ b/Content.Server/_Wega/Projectiles/ProjectileLifestealSystem.cs @@ -11,8 +11,8 @@ namespace Content.Server.Projectiles; public sealed class ProjectileLifestealSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private MobStateSystem _mobState = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Projectiles/ProjectilePressureSystem.cs b/Content.Server/_Wega/Projectiles/ProjectilePressureSystem.cs index 79bef1dfc1..621201890a 100644 --- a/Content.Server/_Wega/Projectiles/ProjectilePressureSystem.cs +++ b/Content.Server/_Wega/Projectiles/ProjectilePressureSystem.cs @@ -5,7 +5,7 @@ namespace Content.Server.Projectiles; public sealed class ProjectilePressureSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmos = default!; + [Dependency] private AtmosphereSystem _atmos = default!; private const float NORMALPRESSURE = 101.325f; diff --git a/Content.Server/_Wega/Projectiles/ProjectileTimerResetsSystem.cs b/Content.Server/_Wega/Projectiles/ProjectileTimerResetsSystem.cs index 8f2f455eee..4695d389ce 100644 --- a/Content.Server/_Wega/Projectiles/ProjectileTimerResetsSystem.cs +++ b/Content.Server/_Wega/Projectiles/ProjectileTimerResetsSystem.cs @@ -8,8 +8,8 @@ namespace Content.Server.Projectiles; public sealed class ProjectileTimerResetsSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private IGameTiming _gameTiming = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Resomi/Abilities/AgillitySkillSystem.cs b/Content.Server/_Wega/Resomi/Abilities/AgillitySkillSystem.cs index 47237e4421..f0fc31e5d9 100644 --- a/Content.Server/_Wega/Resomi/Abilities/AgillitySkillSystem.cs +++ b/Content.Server/_Wega/Resomi/Abilities/AgillitySkillSystem.cs @@ -12,10 +12,10 @@ namespace Content.Server.Resomi.Abilities; public sealed class AgillitySkillSystem : SharedAgillitySkillSystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly StaminaSystem _stamina = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private StaminaSystem _stamina = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; private Entity _action; diff --git a/Content.Server/_Wega/Resomi/Abilities/ListenUpSkillSystem.cs b/Content.Server/_Wega/Resomi/Abilities/ListenUpSkillSystem.cs index 74dd5cb6fb..958aae52ab 100644 --- a/Content.Server/_Wega/Resomi/Abilities/ListenUpSkillSystem.cs +++ b/Content.Server/_Wega/Resomi/Abilities/ListenUpSkillSystem.cs @@ -5,7 +5,7 @@ namespace Content.Server.Resomi.Abilities; public sealed class ListenUpSkillSystem : SharedListenUpSkillSystem { - [Dependency] private readonly ActionsSystem _actionsSystem = default!; + [Dependency] private ActionsSystem _actionsSystem = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Resomi/Abilities/ListenUpSystem.cs b/Content.Server/_Wega/Resomi/Abilities/ListenUpSystem.cs index a8667fb0f0..8589816fb5 100644 --- a/Content.Server/_Wega/Resomi/Abilities/ListenUpSystem.cs +++ b/Content.Server/_Wega/Resomi/Abilities/ListenUpSystem.cs @@ -6,7 +6,7 @@ namespace Content.Server.Resomi.Abilities; public sealed class ListenUpSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Shadow/PhotophobiaSystem.cs b/Content.Server/_Wega/Shadow/PhotophobiaSystem.cs index 974bee6168..87bf79025a 100644 --- a/Content.Server/_Wega/Shadow/PhotophobiaSystem.cs +++ b/Content.Server/_Wega/Shadow/PhotophobiaSystem.cs @@ -22,17 +22,17 @@ namespace Content.Server.Shadow; public sealed class PhotophobiaSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly HandsSystem _handsSystem = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speed = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private HandsSystem _handsSystem = default!; + [Dependency] private MovementSpeedModifierSystem _speed = default!; + [Dependency] private IRobustRandom _random = default!; private static readonly ProtoId Damage = "Heat"; diff --git a/Content.Server/_Wega/Sharpening/Systems/SharpeningSystem.cs b/Content.Server/_Wega/Sharpening/Systems/SharpeningSystem.cs index c8d814f2fd..1bb1e8f16f 100644 --- a/Content.Server/_Wega/Sharpening/Systems/SharpeningSystem.cs +++ b/Content.Server/_Wega/Sharpening/Systems/SharpeningSystem.cs @@ -8,7 +8,7 @@ namespace Content.Server.Sharpening.Systems; public sealed class SharpeningSystem : SharedSharpeningSystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/_Wega/Skrell/SkrellSystem.cs b/Content.Server/_Wega/Skrell/SkrellSystem.cs index c71433a6a5..36a93222cd 100644 --- a/Content.Server/_Wega/Skrell/SkrellSystem.cs +++ b/Content.Server/_Wega/Skrell/SkrellSystem.cs @@ -11,8 +11,8 @@ namespace Content.Server.Skrell; public sealed class SkrellSystem : EntitySystem { - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/SlotMachine/SlotMachineSystem.cs b/Content.Server/_Wega/SlotMachine/SlotMachineSystem.cs index 00fa5bcd51..c9c043c3d8 100644 --- a/Content.Server/_Wega/SlotMachine/SlotMachineSystem.cs +++ b/Content.Server/_Wega/SlotMachine/SlotMachineSystem.cs @@ -20,16 +20,16 @@ namespace Content.Server.Economy.SlotMachine; public sealed class SlotMachineSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly DestructibleSystem _destructible = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly StackSystem _stack = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private DestructibleSystem _destructible = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private StackSystem _stack = default!; + [Dependency] private IGameTiming _timing = default!; private static readonly string[] AllSymbols = { "♥", "★", "♠", "♦", "♣", "♡" }; private static readonly string[] CursedSymbols = { "☠", "🩸", "☢", "☣" }; diff --git a/Content.Server/_Wega/Speech/EntitySystems/AphasiaAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/AphasiaAccentSystem.cs index 100ca3b80a..4aa884c187 100644 --- a/Content.Server/_Wega/Speech/EntitySystems/AphasiaAccentSystem.cs +++ b/Content.Server/_Wega/Speech/EntitySystems/AphasiaAccentSystem.cs @@ -8,7 +8,7 @@ namespace Content.Server.Speech.EntitySystems { public sealed class GibberishSpeechSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Speech/EntitySystems/ClownAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/ClownAccentSystem.cs index 5adf0f592d..b17c37a442 100644 --- a/Content.Server/_Wega/Speech/EntitySystems/ClownAccentSystem.cs +++ b/Content.Server/_Wega/Speech/EntitySystems/ClownAccentSystem.cs @@ -5,7 +5,7 @@ namespace Content.Server.Speech.EntitySystems { public sealed class ClownAccentSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Speech/EntitySystems/LoudAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/LoudAccentSystem.cs index 4c3dfd9df4..b4ef0e4f96 100644 --- a/Content.Server/_Wega/Speech/EntitySystems/LoudAccentSystem.cs +++ b/Content.Server/_Wega/Speech/EntitySystems/LoudAccentSystem.cs @@ -6,7 +6,7 @@ namespace Content.Server.Speech.EntitySystems { public sealed class LoudAccentSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Speech/EntitySystems/ResomiAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/ResomiAccentSystem.cs index 1397bf33ab..4546067f09 100644 --- a/Content.Server/_Wega/Speech/EntitySystems/ResomiAccentSystem.cs +++ b/Content.Server/_Wega/Speech/EntitySystems/ResomiAccentSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server._Wega.Speech.EntitySystems; public sealed class ResomiAccentSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; private static readonly Regex RegexSh = new("ш+", RegexOptions.Compiled); private static readonly Regex RegexShUpper = new("Ш+", RegexOptions.Compiled); diff --git a/Content.Server/_Wega/Speech/EntitySystems/UnintelligibleAccentSystem.cs b/Content.Server/_Wega/Speech/EntitySystems/UnintelligibleAccentSystem.cs index 3c449b4c96..14df9ab9b9 100644 --- a/Content.Server/_Wega/Speech/EntitySystems/UnintelligibleAccentSystem.cs +++ b/Content.Server/_Wega/Speech/EntitySystems/UnintelligibleAccentSystem.cs @@ -9,7 +9,7 @@ namespace Content.Server.Speech.EntitySystems { public sealed class UnintelligibleAccentSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; private static readonly Regex WordSplitRegex = new Regex(@"(\W+)", RegexOptions.Compiled); public override void Initialize() diff --git a/Content.Server/_Wega/StationEvents/Events/DiseaseOutbreakRule.cs b/Content.Server/_Wega/StationEvents/Events/DiseaseOutbreakRule.cs index 382b1955aa..b15db885db 100644 --- a/Content.Server/_Wega/StationEvents/Events/DiseaseOutbreakRule.cs +++ b/Content.Server/_Wega/StationEvents/Events/DiseaseOutbreakRule.cs @@ -14,8 +14,8 @@ namespace Content.Server.StationEvents.Events; /// public sealed class DiseaseOutbreakRule : StationEventSystem { - [Dependency] private readonly DiseaseSystem _diseaseSystem = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; + [Dependency] private DiseaseSystem _diseaseSystem = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; /// /// Finds 2-5 random, alive entities that can host diseases diff --git a/Content.Server/_Wega/StationEvents/Events/RadiationOutburstRuleSystem.cs b/Content.Server/_Wega/StationEvents/Events/RadiationOutburstRuleSystem.cs index 2ea53839b5..1babc5693b 100644 --- a/Content.Server/_Wega/StationEvents/Events/RadiationOutburstRuleSystem.cs +++ b/Content.Server/_Wega/StationEvents/Events/RadiationOutburstRuleSystem.cs @@ -16,9 +16,9 @@ namespace Content.Server.StationEvents.Events; public sealed class RadiationOutburstRuleSystem : StationEventSystem //port only with codeowner permision @4_ydo { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private TagSystem _tagSystem = default!; private EntityQuery _mobStateQuery; private EntityQuery _ghostQuery; diff --git a/Content.Server/_Wega/Strangulation/StrangulationSystem.cs b/Content.Server/_Wega/Strangulation/StrangulationSystem.cs index 00ff031db7..d3d40643ab 100644 --- a/Content.Server/_Wega/Strangulation/StrangulationSystem.cs +++ b/Content.Server/_Wega/Strangulation/StrangulationSystem.cs @@ -26,17 +26,17 @@ namespace Content.Server.Strangulation { public sealed partial class StrangulationSystem : SharedStrangulationSystem { - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly VirtualItemSystem _virtualItemSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly PullingSystem _pulling = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly SharedStutteringSystem _stutteringSystem = default!; - [Dependency] private readonly SharedCombatModeSystem _combatModeSystem = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffect = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private VirtualItemSystem _virtualItemSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private PullingSystem _pulling = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private SharedStutteringSystem _stutteringSystem = default!; + [Dependency] private SharedCombatModeSystem _combatModeSystem = default!; + [Dependency] private StatusEffectsSystem _statusEffect = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Surgery/BodyScannerConsoleSystem.cs b/Content.Server/_Wega/Surgery/BodyScannerConsoleSystem.cs index 5dd12f7355..a961ecfe3a 100644 --- a/Content.Server/_Wega/Surgery/BodyScannerConsoleSystem.cs +++ b/Content.Server/_Wega/Surgery/BodyScannerConsoleSystem.cs @@ -15,10 +15,10 @@ namespace Content.Server.Medical.Surgery { public sealed class BodyScannerConsoleSystem : EntitySystem { - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedDeviceLinkSystem _deviceLink = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Surgery/SurgerySystem.Graphs.cs b/Content.Server/_Wega/Surgery/SurgerySystem.Graphs.cs index 5765550817..1c3e44b9af 100644 --- a/Content.Server/_Wega/Surgery/SurgerySystem.Graphs.cs +++ b/Content.Server/_Wega/Surgery/SurgerySystem.Graphs.cs @@ -17,11 +17,11 @@ namespace Content.Server.Surgery; public sealed partial class SurgerySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly StackSystem _stack = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private StackSystem _stack = default!; private void GraphsInitialize() { diff --git a/Content.Server/_Wega/Surgery/SurgerySystem.InternalDamage.cs b/Content.Server/_Wega/Surgery/SurgerySystem.InternalDamage.cs index 2bf419a093..b744f915e3 100644 --- a/Content.Server/_Wega/Surgery/SurgerySystem.InternalDamage.cs +++ b/Content.Server/_Wega/Surgery/SurgerySystem.InternalDamage.cs @@ -29,10 +29,10 @@ namespace Content.Server.Surgery; public sealed partial class SurgerySystem { - [Dependency] private readonly PainSystem _pain = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly PhysicsSystem _physics = default!; - [Dependency] private readonly MovementModStatusSystem _movementMod = default!; + [Dependency] private PainSystem _pain = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private PhysicsSystem _physics = default!; + [Dependency] private MovementModStatusSystem _movementMod = default!; private static readonly SoundSpecifier GibSound = new SoundPathSpecifier("/Audio/Effects/gib3.ogg"); diff --git a/Content.Server/_Wega/Surgery/SurgerySystem.Operation.cs b/Content.Server/_Wega/Surgery/SurgerySystem.Operation.cs index 4707f22b37..fcc15a52b8 100644 --- a/Content.Server/_Wega/Surgery/SurgerySystem.Operation.cs +++ b/Content.Server/_Wega/Surgery/SurgerySystem.Operation.cs @@ -26,10 +26,10 @@ namespace Content.Server.Surgery; public sealed partial class SurgerySystem { - [Dependency] private readonly BloodstreamSystem _bloodstream = default!; - [Dependency] private readonly SharedDirtSystem _dirt = default!; - [Dependency] private readonly SharedSubdermalImplantSystem _implant = default!; - [Dependency] private readonly SharedInternalStorageSystem _internal = default!; + [Dependency] private BloodstreamSystem _bloodstream = default!; + [Dependency] private SharedDirtSystem _dirt = default!; + [Dependency] private SharedSubdermalImplantSystem _implant = default!; + [Dependency] private SharedInternalStorageSystem _internal = default!; private void PerformSurgeryEffect(SurgeryActionType action, string? requiredPart, ProtoId? damageType, float successChance, List? failureEffect, EntityUid patient, EntityUid? item) diff --git a/Content.Server/_Wega/Surgery/SurgerySystem.Sterility.cs b/Content.Server/_Wega/Surgery/SurgerySystem.Sterility.cs index 4bcacf6a4c..6e6df48765 100644 --- a/Content.Server/_Wega/Surgery/SurgerySystem.Sterility.cs +++ b/Content.Server/_Wega/Surgery/SurgerySystem.Sterility.cs @@ -11,7 +11,7 @@ namespace Content.Server.Surgery; public sealed partial class SurgerySystem { - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; private void UpdateOperationSterility(EntityUid patient, OperatedComponent operated) { diff --git a/Content.Server/_Wega/Surgery/SurgerySystem.cs b/Content.Server/_Wega/Surgery/SurgerySystem.cs index f2e7c85919..2162ae35a9 100644 --- a/Content.Server/_Wega/Surgery/SurgerySystem.cs +++ b/Content.Server/_Wega/Surgery/SurgerySystem.cs @@ -31,21 +31,21 @@ namespace Content.Server.Surgery; public sealed partial class SurgerySystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _admin = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly DiseaseSystem _disease = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedJitteringSystem _jittering = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private IAdminLogManager _admin = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private DiseaseSystem _disease = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedJitteringSystem _jittering = default!; + [Dependency] private SharedToolSystem _tool = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private InventorySystem _inventory = default!; private static readonly ProtoId Scream = "Scream"; private static readonly ProtoId BluntDamage = "Blunt"; diff --git a/Content.Server/_Wega/TapeRecorder/TapeRecorderSystem.cs b/Content.Server/_Wega/TapeRecorder/TapeRecorderSystem.cs index ad10fc180f..040e7d9757 100644 --- a/Content.Server/_Wega/TapeRecorder/TapeRecorderSystem.cs +++ b/Content.Server/_Wega/TapeRecorder/TapeRecorderSystem.cs @@ -15,10 +15,10 @@ namespace Content.Server.TapeRecorder; public sealed class TapeRecorderSystem : SharedTapeRecorderSystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly PaperSystem _paper = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private PaperSystem _paper = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Traits/Assorted/UncontrollableCoughSystem.cs b/Content.Server/_Wega/Traits/Assorted/UncontrollableCoughSystem.cs index 1b95650946..31ccb4dd43 100644 --- a/Content.Server/_Wega/Traits/Assorted/UncontrollableCoughSystem.cs +++ b/Content.Server/_Wega/Traits/Assorted/UncontrollableCoughSystem.cs @@ -6,8 +6,8 @@ namespace Content.Server.Traits.Assorted; public sealed class UncontrollableCoughSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly DiseaseSystem _diseaseSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private DiseaseSystem _diseaseSystem = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Traits/Assorted/UncontrollableSnoughSystem.cs b/Content.Server/_Wega/Traits/Assorted/UncontrollableSnoughSystem.cs index 922dd3bdc8..f23dfd7b2e 100644 --- a/Content.Server/_Wega/Traits/Assorted/UncontrollableSnoughSystem.cs +++ b/Content.Server/_Wega/Traits/Assorted/UncontrollableSnoughSystem.cs @@ -8,8 +8,8 @@ namespace Content.Server.Traits.Assorted; /// public sealed class UncontrollableSnoughSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly DiseaseSystem _diseaseSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private DiseaseSystem _diseaseSystem = default!; /// public override void Initialize() diff --git a/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Bestia.cs b/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Bestia.cs index 3ece262485..c24aa8c62e 100644 --- a/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Bestia.cs +++ b/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Bestia.cs @@ -45,9 +45,9 @@ namespace Content.Server.Vampire; public sealed partial class VampireSystem { - [Dependency] private readonly SharedCuffableSystem _cuffable = default!; - [Dependency] private readonly SharedGunSystem _gun = default!; - [Dependency] private readonly SleepingSystem _sleeping = default!; + [Dependency] private SharedCuffableSystem _cuffable = default!; + [Dependency] private SharedGunSystem _gun = default!; + [Dependency] private SleepingSystem _sleeping = default!; private static readonly SoundSpecifier BestiaScream = new SoundPathSpecifier("/Audio/_Wega/Effects/Vampire/creepyshriek.ogg"); diff --git a/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Dantalion.cs b/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Dantalion.cs index 942329982d..2722b0254e 100644 --- a/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Dantalion.cs +++ b/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Dantalion.cs @@ -25,10 +25,10 @@ namespace Content.Server.Vampire; public sealed partial class VampireSystem { - [Dependency] private readonly CloningSystem _cloning = default!; - [Dependency] private readonly HallucinationsSystem _hallucinations = default!; - [Dependency] private readonly PrayerSystem _prayerSystem = default!; - [Dependency] private readonly QuickDialogSystem _quickDialog = default!; + [Dependency] private CloningSystem _cloning = default!; + [Dependency] private HallucinationsSystem _hallucinations = default!; + [Dependency] private PrayerSystem _prayerSystem = default!; + [Dependency] private QuickDialogSystem _quickDialog = default!; private void InitializeDantalion() { diff --git a/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Hemomancer.cs b/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Hemomancer.cs index 436fbe5b23..d25efe0fb0 100644 --- a/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Hemomancer.cs +++ b/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Hemomancer.cs @@ -30,7 +30,7 @@ namespace Content.Server.Vampire; public sealed partial class VampireSystem { - [Dependency] private readonly LoadoutSystem _loadout = default!; + [Dependency] private LoadoutSystem _loadout = default!; private void InitializeHemomancer() { diff --git a/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Umbrae.cs b/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Umbrae.cs index de9cead5ef..e7a2a1f284 100644 --- a/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Umbrae.cs +++ b/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.Umbrae.cs @@ -19,8 +19,8 @@ namespace Content.Server.Vampire; public sealed partial class VampireSystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly SharedEmpSystem _emp = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private SharedEmpSystem _emp = default!; private void InitializeUmbrae() { diff --git a/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.cs b/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.cs index e415df73ec..9f83cd788e 100644 --- a/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.cs +++ b/Content.Server/_Wega/Vampire/Abilities/VampireSystem.Abilities.cs @@ -26,16 +26,16 @@ namespace Content.Server.Vampire; public sealed partial class VampireSystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly MobThresholdSystem _threshold = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speed = default!; - [Dependency] private readonly SharedStaminaSystem _stamina = default!; - [Dependency] private readonly StatusEffectsSystem _status = default!; - [Dependency] private readonly SharedStealthSystem _stealth = default!; - [Dependency] private readonly SharedFlashSystem _flash = default!; - [Dependency] private readonly MovementModStatusSystem _movementMod = default!; - [Dependency] private readonly PolymorphSystem _polymorph = default!; - [Dependency] private readonly SurgerySystem _surgery = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private MobThresholdSystem _threshold = default!; + [Dependency] private MovementSpeedModifierSystem _speed = default!; + [Dependency] private SharedStaminaSystem _stamina = default!; + [Dependency] private StatusEffectsSystem _status = default!; + [Dependency] private SharedStealthSystem _stealth = default!; + [Dependency] private SharedFlashSystem _flash = default!; + [Dependency] private MovementModStatusSystem _movementMod = default!; + [Dependency] private PolymorphSystem _polymorph = default!; + [Dependency] private SurgerySystem _surgery = default!; private static readonly ProtoId InternalBleeding = "ArterialBleeding"; private static readonly EntProtoId ForceSleeping = "StatusEffectForcedSleeping"; diff --git a/Content.Server/_Wega/Vampire/BittenByVampireSystem.cs b/Content.Server/_Wega/Vampire/BittenByVampireSystem.cs index 7cbad888a0..a68051c77c 100644 --- a/Content.Server/_Wega/Vampire/BittenByVampireSystem.cs +++ b/Content.Server/_Wega/Vampire/BittenByVampireSystem.cs @@ -10,7 +10,7 @@ namespace Content.Server.Vampire; /// public sealed class BittenByVampireSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Vampire/HolyPointSystem.cs b/Content.Server/_Wega/Vampire/HolyPointSystem.cs index 0dc52823a6..a20c11489a 100644 --- a/Content.Server/_Wega/Vampire/HolyPointSystem.cs +++ b/Content.Server/_Wega/Vampire/HolyPointSystem.cs @@ -10,11 +10,11 @@ namespace Content.Server.Vampire; public sealed class HolyPointSystem : EntitySystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly FlammableSystem _flammable = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private FlammableSystem _flammable = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedPopupSystem _popup = default!; private static readonly ProtoId Scream = "Scream"; private static readonly float FireStackCount = 2.5f; diff --git a/Content.Server/_Wega/Vampire/VampireSystem.Diablerie.cs b/Content.Server/_Wega/Vampire/VampireSystem.Diablerie.cs index 4086e0485f..11cf893812 100644 --- a/Content.Server/_Wega/Vampire/VampireSystem.Diablerie.cs +++ b/Content.Server/_Wega/Vampire/VampireSystem.Diablerie.cs @@ -20,8 +20,8 @@ namespace Content.Server.Vampire; public sealed partial class VampireSystem { - [Dependency] private readonly RejuvenateSystem _rejuvenate = default!; - [Dependency] private readonly SharedChargesSystem _charges = default!; + [Dependency] private RejuvenateSystem _rejuvenate = default!; + [Dependency] private SharedChargesSystem _charges = default!; private static readonly EntProtoId Ash = "Ash"; diff --git a/Content.Server/_Wega/Vampire/VampireSystem.cs b/Content.Server/_Wega/Vampire/VampireSystem.cs index 687f8eb62a..3fc1ee32a6 100644 --- a/Content.Server/_Wega/Vampire/VampireSystem.cs +++ b/Content.Server/_Wega/Vampire/VampireSystem.cs @@ -63,39 +63,39 @@ namespace Content.Server.Vampire; public sealed partial class VampireSystem : SharedVampireSystem { - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly BloodstreamSystem _blood = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly EuiManager _euiMan = default!; - [Dependency] private readonly IAdminLogManager _admin = default!; - [Dependency] private readonly IComponentFactory _componentFactory = default!; - [Dependency] private readonly IMapManager _mapMan = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly MetabolizerSystem _metabolism = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly NullDamageSystem _nullDamage = default!; - [Dependency] private readonly RottingSystem _rotting = default!; - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly StomachSystem _stomach = default!; - [Dependency] private readonly TileSystem _tile = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly VampireRuleSystem _vampireRule = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private BloodstreamSystem _blood = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private EuiManager _euiMan = default!; + [Dependency] private IAdminLogManager _admin = default!; + [Dependency] private IComponentFactory _componentFactory = default!; + [Dependency] private IMapManager _mapMan = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private MetabolizerSystem _metabolism = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private NullDamageSystem _nullDamage = default!; + [Dependency] private RottingSystem _rotting = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solution = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private StomachSystem _stomach = default!; + [Dependency] private TileSystem _tile = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private VampireRuleSystem _vampireRule = default!; + [Dependency] private ThrowingSystem _throwing = default!; private const int MaxBloodToConsume = 200; diff --git a/Content.Server/_Wega/VeilCult/TeleportationEnchantSystem.cs b/Content.Server/_Wega/VeilCult/TeleportationEnchantSystem.cs index 960a3bf8ec..fafe2ec471 100644 --- a/Content.Server/_Wega/VeilCult/TeleportationEnchantSystem.cs +++ b/Content.Server/_Wega/VeilCult/TeleportationEnchantSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.Veil.Cult; public sealed partial class TeleportionEnchantSystem : SharedTeleportationEnchantSystem { - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/VeilCult/VeilCultSystem.Abilities.cs b/Content.Server/_Wega/VeilCult/VeilCultSystem.Abilities.cs index bea77fd07b..4fa95dc839 100644 --- a/Content.Server/_Wega/VeilCult/VeilCultSystem.Abilities.cs +++ b/Content.Server/_Wega/VeilCult/VeilCultSystem.Abilities.cs @@ -22,18 +22,18 @@ namespace Content.Server.Veil.Cult; public sealed partial class VeilCultSystem { - [Dependency] private readonly BloodstreamSystem _blood = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly EmpSystem _emp = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly FlashSystem _flash = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedStackSystem _stack = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly VisibilitySystem _visibility = default!; - [Dependency] private readonly SharedStationAiSystem _stationAi = default!; + [Dependency] private BloodstreamSystem _blood = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private EmpSystem _emp = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private FlashSystem _flash = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedStackSystem _stack = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private VisibilitySystem _visibility = default!; + [Dependency] private SharedStationAiSystem _stationAi = default!; private static readonly SoundPathSpecifier CultSpell = new SoundPathSpecifier("/Audio/_Wega/Effects/cult_spell.ogg"); private static readonly int EnergyPerOne = 100; // TODO: МБ сделать значение в компоненте рула, а не хардкодом | Не, похуй, но я бы вывел в константу :P diff --git a/Content.Server/_Wega/VeilCult/VeilCultSystem.Enchantments.cs b/Content.Server/_Wega/VeilCult/VeilCultSystem.Enchantments.cs index 5213ad3e38..76715da9d2 100644 --- a/Content.Server/_Wega/VeilCult/VeilCultSystem.Enchantments.cs +++ b/Content.Server/_Wega/VeilCult/VeilCultSystem.Enchantments.cs @@ -46,13 +46,13 @@ namespace Content.Server.Veil.Cult; public sealed partial class VeilCultSystem { - [Dependency] private readonly MovementSpeedModifierSystem _speed = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly SharedDoorSystem _door = default!; - [Dependency] private readonly SurgerySystem _surgery = default!; - [Dependency] private readonly TileSystem _tile = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private MovementSpeedModifierSystem _speed = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private SharedDoorSystem _door = default!; + [Dependency] private SurgerySystem _surgery = default!; + [Dependency] private TileSystem _tile = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; private static readonly ProtoId WallTag = "Wall"; diff --git a/Content.Server/_Wega/VeilCult/VeilCultSystem.cs b/Content.Server/_Wega/VeilCult/VeilCultSystem.cs index f988d151bf..0d951755bf 100644 --- a/Content.Server/_Wega/VeilCult/VeilCultSystem.cs +++ b/Content.Server/_Wega/VeilCult/VeilCultSystem.cs @@ -42,20 +42,20 @@ namespace Content.Server.Veil.Cult; public sealed partial class VeilCultSystem : SharedVeilCultSystem { - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly VeilCultRuleSystem _veilCult = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly ServerGlobalSoundSystem _sound = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly RejuvenateSystem _rejuvenate = default!; - [Dependency] private readonly NavMapSystem _navMap = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private VeilCultRuleSystem _veilCult = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private ServerGlobalSoundSystem _sound = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private RejuvenateSystem _rejuvenate = default!; + [Dependency] private NavMapSystem _navMap = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/VentCraw/VentCrawTubeSystem.cs b/Content.Server/_Wega/VentCraw/VentCrawTubeSystem.cs index 3345cf8b89..fd2e930033 100644 --- a/Content.Server/_Wega/VentCraw/VentCrawTubeSystem.cs +++ b/Content.Server/_Wega/VentCraw/VentCrawTubeSystem.cs @@ -23,15 +23,15 @@ namespace Content.Server.VentCraw; public sealed class VentCrawTubeSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly MapSystem _mapSystem = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedMoverController _mover = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly VentCrawableSystem _ventCrawableSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private MapSystem _mapSystem = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedMoverController _mover = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private VentCrawableSystem _ventCrawableSystem = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/VentCraw/VentCrawableSystem.cs b/Content.Server/_Wega/VentCraw/VentCrawableSystem.cs index 6ddfdc11bd..ede6ba1417 100644 --- a/Content.Server/_Wega/VentCraw/VentCrawableSystem.cs +++ b/Content.Server/_Wega/VentCraw/VentCrawableSystem.cs @@ -19,12 +19,12 @@ namespace Content.Server.VentCraw; public sealed class VentCrawableSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!; - [Dependency] private readonly SharedTransformSystem _xformSystem = default!; - [Dependency] private readonly VentCrawTubeSystem _ventCrawTubeSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedPhysicsSystem _physicsSystem = default!; + [Dependency] private SharedTransformSystem _xformSystem = default!; + [Dependency] private VentCrawTubeSystem _ventCrawTubeSystem = default!; public static readonly TimeSpan CrawlDelay = TimeSpan.FromSeconds(0.5); diff --git a/Content.Server/_Wega/Weapons/Marker/DamageMarkerSystem.cs b/Content.Server/_Wega/Weapons/Marker/DamageMarkerSystem.cs index 381963dec6..7546476e1f 100644 --- a/Content.Server/_Wega/Weapons/Marker/DamageMarkerSystem.cs +++ b/Content.Server/_Wega/Weapons/Marker/DamageMarkerSystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Weapons.Marker; public sealed class DamageMarkerSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly AtmosphereSystem _atmos = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private AtmosphereSystem _atmos = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private MobStateSystem _mobState = default!; private const float NORMALPRESSURE = 101.325f; diff --git a/Content.Server/_Wega/Weapons/Systems/LeechMeleeWeaponSystem.cs b/Content.Server/_Wega/Weapons/Systems/LeechMeleeWeaponSystem.cs index a704658aeb..cf6203ff45 100644 --- a/Content.Server/_Wega/Weapons/Systems/LeechMeleeWeaponSystem.cs +++ b/Content.Server/_Wega/Weapons/Systems/LeechMeleeWeaponSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Weapons.Marker; public sealed class LeechMeleeWeaponSystem : EntitySystem { - [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private EntityWhitelistSystem _entityWhitelist = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private MobStateSystem _mobState = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Xenobiology/CellSystem.cs b/Content.Server/_Wega/Xenobiology/CellSystem.cs index 2fc0b154ac..be601ff09c 100644 --- a/Content.Server/_Wega/Xenobiology/CellSystem.cs +++ b/Content.Server/_Wega/Xenobiology/CellSystem.cs @@ -16,11 +16,11 @@ namespace Content.Server.Xenobiology; public sealed class CellSystem : SharedCellSystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly DoAfterSystem _doAfter = default!; - [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!; - [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private DoAfterSystem _doAfter = default!; + [Dependency] private EntityWhitelistSystem _entityWhitelist = default!; + [Dependency] private PopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/_Wega/Xenobiology/Machines/SlimeExtractorSystem.cs b/Content.Server/_Wega/Xenobiology/Machines/SlimeExtractorSystem.cs index fb6e2be634..8bc7281ce2 100644 --- a/Content.Server/_Wega/Xenobiology/Machines/SlimeExtractorSystem.cs +++ b/Content.Server/_Wega/Xenobiology/Machines/SlimeExtractorSystem.cs @@ -25,17 +25,17 @@ namespace Content.Server.Xenobiology { public sealed class SlimeExtractorSystem : EntitySystem { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedJitteringSystem _jittering = default!; - [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambient = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedJitteringSystem _jittering = default!; + [Dependency] private PuddleSystem _puddle = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedAmbientSoundSystem _ambient = default!; public const string SlimeExtractPrefix = "MaterialSlimeExtract"; diff --git a/Content.Server/_Wega/Xenobiology/Mobs/SlimeGrowthSystem.cs b/Content.Server/_Wega/Xenobiology/Mobs/SlimeGrowthSystem.cs index 2b2ce17a11..b18955b8d4 100644 --- a/Content.Server/_Wega/Xenobiology/Mobs/SlimeGrowthSystem.cs +++ b/Content.Server/_Wega/Xenobiology/Mobs/SlimeGrowthSystem.cs @@ -10,7 +10,7 @@ namespace Content.Server.Xenobiology; public sealed class SlimeGrowthSystem : SharedSlimeGrowthSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; private static readonly EntProtoId DefaultSlime = "MobXenoSlimeGray"; diff --git a/Content.Server/_Wega/Xenobiology/Mobs/SlimeHungerSystem.cs b/Content.Server/_Wega/Xenobiology/Mobs/SlimeHungerSystem.cs index 8489935ed6..8f002e052c 100644 --- a/Content.Server/_Wega/Xenobiology/Mobs/SlimeHungerSystem.cs +++ b/Content.Server/_Wega/Xenobiology/Mobs/SlimeHungerSystem.cs @@ -16,13 +16,13 @@ namespace Content.Server.Xenobiology; public sealed class SlimeHungerSystem : EntitySystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SlimeSocialSystem _social = default!; - [Dependency] private readonly SlimeGrowthSystem _growth = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SlimeSocialSystem _social = default!; + [Dependency] private SlimeGrowthSystem _growth = default!; + [Dependency] private MobStateSystem _mobState = default!; private readonly Dictionary _slimePhrases = new() { diff --git a/Content.Server/_Wega/Xenobiology/Mobs/SlimeRebellionSystem.cs b/Content.Server/_Wega/Xenobiology/Mobs/SlimeRebellionSystem.cs index b3d75405ed..c92641dc48 100644 --- a/Content.Server/_Wega/Xenobiology/Mobs/SlimeRebellionSystem.cs +++ b/Content.Server/_Wega/Xenobiology/Mobs/SlimeRebellionSystem.cs @@ -6,10 +6,10 @@ namespace Content.Server.Xenobiology; public sealed class SlimeRebellionSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SlimeSocialSystem _slimeSocial = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SlimeSocialSystem _slimeSocial = default!; + [Dependency] private EntityLookupSystem _lookup = default!; private const int MaxSafeSlimes = 7; private const int MinRebellionGroup = 3; diff --git a/Content.Server/_Wega/Xenobiology/Mobs/SlimeSocialSystem.cs b/Content.Server/_Wega/Xenobiology/Mobs/SlimeSocialSystem.cs index 324bbca1b5..c25e9c9c02 100644 --- a/Content.Server/_Wega/Xenobiology/Mobs/SlimeSocialSystem.cs +++ b/Content.Server/_Wega/Xenobiology/Mobs/SlimeSocialSystem.cs @@ -18,12 +18,12 @@ namespace Content.Server.Xenobiology; public sealed class SlimeSocialSystem : EntitySystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly HTNSystem _htn = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private HTNSystem _htn = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private MobStateSystem _mobState = default!; private static readonly TimeSpan MinCommandInterval = TimeSpan.FromSeconds(6); diff --git a/Content.Server/_Wega/Xenobiology/SlimeAnalyzerSystem.cs b/Content.Server/_Wega/Xenobiology/SlimeAnalyzerSystem.cs index 2c94c711ab..8c85be22a9 100644 --- a/Content.Server/_Wega/Xenobiology/SlimeAnalyzerSystem.cs +++ b/Content.Server/_Wega/Xenobiology/SlimeAnalyzerSystem.cs @@ -20,14 +20,14 @@ namespace Content.Server.Medical; public sealed class SlimeAnalyzerSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly PowerCellSystem _cell = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private PowerCellSystem _cell = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Android/SharedAndroidFrameSystem.cs b/Content.Shared/_Wega/Android/SharedAndroidFrameSystem.cs index cc68a78f6b..ba28bc2e81 100644 --- a/Content.Shared/_Wega/Android/SharedAndroidFrameSystem.cs +++ b/Content.Shared/_Wega/Android/SharedAndroidFrameSystem.cs @@ -6,8 +6,8 @@ namespace Content.Shared._Wega.Android; public abstract partial class SharedAndroidFrameSystem : EntitySystem { - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly ItemSlotsSystem _slots = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; + [Dependency] private ItemSlotsSystem _slots = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Android/SharedAndroidSystem.cs b/Content.Shared/_Wega/Android/SharedAndroidSystem.cs index beb1c554a0..31658e8598 100644 --- a/Content.Shared/_Wega/Android/SharedAndroidSystem.cs +++ b/Content.Shared/_Wega/Android/SharedAndroidSystem.cs @@ -9,7 +9,7 @@ namespace Content.Shared.Android; public abstract partial class SharedAndroidSystem : EntitySystem { - [Dependency] private readonly ItemToggleSystem _toggle = default!; + [Dependency] private ItemToggleSystem _toggle = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/BloodCult/SharedBloodCultSystem.cs b/Content.Shared/_Wega/BloodCult/SharedBloodCultSystem.cs index 92e2fcfad3..5f6aac7f6c 100644 --- a/Content.Shared/_Wega/BloodCult/SharedBloodCultSystem.cs +++ b/Content.Shared/_Wega/BloodCult/SharedBloodCultSystem.cs @@ -11,9 +11,9 @@ namespace Content.Shared.Blood.Cult; public abstract class SharedBloodCultSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedStunSystem _stun = default!; #region Deconvertation public void CultistDeconvertation(EntityUid cultist) diff --git a/Content.Shared/_Wega/Botany/SharedPlantAnalyzerSystem.cs b/Content.Shared/_Wega/Botany/SharedPlantAnalyzerSystem.cs index c326ad07ad..3686f6d00e 100644 --- a/Content.Shared/_Wega/Botany/SharedPlantAnalyzerSystem.cs +++ b/Content.Shared/_Wega/Botany/SharedPlantAnalyzerSystem.cs @@ -9,7 +9,7 @@ namespace Content.Shared.Botany.Systems; public abstract partial class SharedPlantAnalyzerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; #region Loc diff --git a/Content.Shared/_Wega/Cargo/Systems/ChangeableCargoAccountSystem.cs b/Content.Shared/_Wega/Cargo/Systems/ChangeableCargoAccountSystem.cs index 738a2443b8..26165215cd 100644 --- a/Content.Shared/_Wega/Cargo/Systems/ChangeableCargoAccountSystem.cs +++ b/Content.Shared/_Wega/Cargo/Systems/ChangeableCargoAccountSystem.cs @@ -11,9 +11,9 @@ namespace Content.Shared.Cargo; public sealed class ChangeableCargoAccountSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private AccessReaderSystem _accessReaderSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Carrying/CarryingSlowdownSystem.cs b/Content.Shared/_Wega/Carrying/CarryingSlowdownSystem.cs index 9b9c8cec10..6880948141 100644 --- a/Content.Shared/_Wega/Carrying/CarryingSlowdownSystem.cs +++ b/Content.Shared/_Wega/Carrying/CarryingSlowdownSystem.cs @@ -5,7 +5,7 @@ namespace Content.Shared.Carrying { public sealed class CarryingSlowdownSystem : EntitySystem { - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeed = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Clothing/TearableClothingSystem.cs b/Content.Shared/_Wega/Clothing/TearableClothingSystem.cs index 8408eb3588..77e555b2be 100644 --- a/Content.Shared/_Wega/Clothing/TearableClothingSystem.cs +++ b/Content.Shared/_Wega/Clothing/TearableClothingSystem.cs @@ -16,9 +16,9 @@ namespace Content.Shared.Clothing; public sealed class TearableClothingSystem : EntitySystem { - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private SharedPopupSystem _popup = default!; private static readonly ProtoId Damage = "Slash"; diff --git a/Content.Shared/_Wega/Clothing/ToggleableSpriteClothingSystem.cs b/Content.Shared/_Wega/Clothing/ToggleableSpriteClothingSystem.cs index 7237aa4b9f..14be4d2d49 100644 --- a/Content.Shared/_Wega/Clothing/ToggleableSpriteClothingSystem.cs +++ b/Content.Shared/_Wega/Clothing/ToggleableSpriteClothingSystem.cs @@ -10,8 +10,8 @@ namespace Content.Shared.Clothing; public sealed class ToggleableSpriteClothingSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Clothing/Upgrades/ClothingUpgradeSystem.cs b/Content.Shared/_Wega/Clothing/Upgrades/ClothingUpgradeSystem.cs index 96e01a1a0c..2fc1a153be 100644 --- a/Content.Shared/_Wega/Clothing/Upgrades/ClothingUpgradeSystem.cs +++ b/Content.Shared/_Wega/Clothing/Upgrades/ClothingUpgradeSystem.cs @@ -19,11 +19,11 @@ namespace Content.Shared.Clothing.Upgrades; public sealed class ClothingUpgradeSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private ISharedAdminLogManager _adminLog = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private EntityWhitelistSystem _entityWhitelist = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedHandsSystem _hands = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Damage/Systems/IncreasedDamageSystem.cs b/Content.Shared/_Wega/Damage/Systems/IncreasedDamageSystem.cs index 2947b4eefa..a4b540c3a3 100644 --- a/Content.Shared/_Wega/Damage/Systems/IncreasedDamageSystem.cs +++ b/Content.Shared/_Wega/Damage/Systems/IncreasedDamageSystem.cs @@ -5,8 +5,8 @@ namespace Content.Shared.Damage.Systems; public sealed class IncreasedDamageSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Dirt/PuddleContactSystem.cs b/Content.Shared/_Wega/Dirt/PuddleContactSystem.cs index 4cfb9e5f46..59bc9ba5e8 100644 --- a/Content.Shared/_Wega/Dirt/PuddleContactSystem.cs +++ b/Content.Shared/_Wega/Dirt/PuddleContactSystem.cs @@ -5,8 +5,8 @@ namespace Content.Shared.DirtVisuals; public sealed class PuddleContactSystem : EntitySystem { - [Dependency] private readonly SharedDirtSystem _dirt = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; + [Dependency] private SharedDirtSystem _dirt = default!; + [Dependency] private SharedSolutionContainerSystem _solution = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Dirt/SharedDirtSystem.cs b/Content.Shared/_Wega/Dirt/SharedDirtSystem.cs index 57b1e0519b..bad29ccc10 100644 --- a/Content.Shared/_Wega/Dirt/SharedDirtSystem.cs +++ b/Content.Shared/_Wega/Dirt/SharedDirtSystem.cs @@ -17,11 +17,11 @@ namespace Content.Shared.DirtVisuals; public sealed class SharedDirtSystem : EntitySystem { - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private SharedTransformSystem _transform = default!; public const float MaxDirtLevel = 100f; private const float DirtAccumulationRate = 0.01f; diff --git a/Content.Shared/_Wega/Disease/SharedDiseaseSystem.cs b/Content.Shared/_Wega/Disease/SharedDiseaseSystem.cs index db5f332d82..02281824ce 100644 --- a/Content.Shared/_Wega/Disease/SharedDiseaseSystem.cs +++ b/Content.Shared/_Wega/Disease/SharedDiseaseSystem.cs @@ -6,8 +6,8 @@ namespace Content.Shared.Disease; public abstract class SharedDiseaseSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ISerializationManager _serializationManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ISerializationManager _serializationManager = default!; public Queue AddQueue = new(); diff --git a/Content.Shared/_Wega/EnergyShield/EnergyShieldSystem.cs b/Content.Shared/_Wega/EnergyShield/EnergyShieldSystem.cs index 8e14827680..b0036072b5 100644 --- a/Content.Shared/_Wega/EnergyShield/EnergyShieldSystem.cs +++ b/Content.Shared/_Wega/EnergyShield/EnergyShieldSystem.cs @@ -6,7 +6,7 @@ namespace Content.Shared.EnergyShield; public sealed partial class EnergyShieldSystem : EntitySystem { - [Dependency] private readonly SharedMeleeWeaponSystem _meleeWeapon = default!; + [Dependency] private SharedMeleeWeaponSystem _meleeWeapon = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/EntityEffects/Effects/ApplyRotSlowdownEffect.cs b/Content.Shared/_Wega/EntityEffects/Effects/ApplyRotSlowdownEffect.cs index f7721f6ac8..c2708ab2c1 100644 --- a/Content.Shared/_Wega/EntityEffects/Effects/ApplyRotSlowdownEffect.cs +++ b/Content.Shared/_Wega/EntityEffects/Effects/ApplyRotSlowdownEffect.cs @@ -11,7 +11,7 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class ApplyRotSlowdownEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedRottingSystem _rotting = default!; + [Dependency] private SharedRottingSystem _rotting = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/_Wega/EntityEffects/Effects/ChemCauseRandomDisease.cs b/Content.Shared/_Wega/EntityEffects/Effects/ChemCauseRandomDisease.cs index 54532520d6..02330eebcc 100644 --- a/Content.Shared/_Wega/EntityEffects/Effects/ChemCauseRandomDisease.cs +++ b/Content.Shared/_Wega/EntityEffects/Effects/ChemCauseRandomDisease.cs @@ -11,7 +11,7 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class ChemCauseRandomDiseaseEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/_Wega/EntityEffects/Effects/ChemDamageResistReagentEffect.cs b/Content.Shared/_Wega/EntityEffects/Effects/ChemDamageResistReagentEffect.cs index c5a5f6582a..ca30e2cc05 100644 --- a/Content.Shared/_Wega/EntityEffects/Effects/ChemDamageResistReagentEffect.cs +++ b/Content.Shared/_Wega/EntityEffects/Effects/ChemDamageResistReagentEffect.cs @@ -12,8 +12,8 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class ChemDamageResistEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IPrototypeManager _prototype = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/_Wega/EntityEffects/Effects/ChemHealInternalDamage.cs b/Content.Shared/_Wega/EntityEffects/Effects/ChemHealInternalDamage.cs index e9851a4bb8..e288d75919 100644 --- a/Content.Shared/_Wega/EntityEffects/Effects/ChemHealInternalDamage.cs +++ b/Content.Shared/_Wega/EntityEffects/Effects/ChemHealInternalDamage.cs @@ -12,7 +12,7 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class ChemHealInternalDamageEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/_Wega/EntityEffects/Effects/ChemMiasmaPoolSource.cs b/Content.Shared/_Wega/EntityEffects/Effects/ChemMiasmaPoolSource.cs index 280f33161d..534394030d 100644 --- a/Content.Shared/_Wega/EntityEffects/Effects/ChemMiasmaPoolSource.cs +++ b/Content.Shared/_Wega/EntityEffects/Effects/ChemMiasmaPoolSource.cs @@ -13,7 +13,7 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class ChemAtmosPoolSourceEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedRottingSystem _rotting = default!; + [Dependency] private SharedRottingSystem _rotting = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/_Wega/EntityEffects/Effects/ChemStabilizeMutationChanceEffect.cs b/Content.Shared/_Wega/EntityEffects/Effects/ChemStabilizeMutationChanceEffect.cs index 24f2555e65..61cc9a6cd0 100644 --- a/Content.Shared/_Wega/EntityEffects/Effects/ChemStabilizeMutationChanceEffect.cs +++ b/Content.Shared/_Wega/EntityEffects/Effects/ChemStabilizeMutationChanceEffect.cs @@ -11,7 +11,7 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class ChemStabilizeMutationChanceEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/_Wega/EntityEffects/Effects/DamageEntityEffect.cs b/Content.Shared/_Wega/EntityEffects/Effects/DamageEntityEffect.cs index 529a08e61a..af59935f79 100644 --- a/Content.Shared/_Wega/EntityEffects/Effects/DamageEntityEffect.cs +++ b/Content.Shared/_Wega/EntityEffects/Effects/DamageEntityEffect.cs @@ -14,7 +14,7 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class DamageEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private DamageableSystem _damageable = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/_Wega/EntityEffects/Effects/HolyPurification.cs b/Content.Shared/_Wega/EntityEffects/Effects/HolyPurification.cs index aaf8092e34..0f1d1f0885 100644 --- a/Content.Shared/_Wega/EntityEffects/Effects/HolyPurification.cs +++ b/Content.Shared/_Wega/EntityEffects/Effects/HolyPurification.cs @@ -13,8 +13,8 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class HolyPurificationEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedBloodCultSystem _bloodCult = default!; - [Dependency] private readonly SharedVeilCultSystem _veilCult = default!; + [Dependency] private SharedBloodCultSystem _bloodCult = default!; + [Dependency] private SharedVeilCultSystem _veilCult = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/_Wega/EntityEffects/Effects/WashDirtReaction.cs b/Content.Shared/_Wega/EntityEffects/Effects/WashDirtReaction.cs index 8999165cab..1f2f8e67b3 100644 --- a/Content.Shared/_Wega/EntityEffects/Effects/WashDirtReaction.cs +++ b/Content.Shared/_Wega/EntityEffects/Effects/WashDirtReaction.cs @@ -10,7 +10,7 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class WashDirtEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedDirtSystem _dirt = default!; + [Dependency] private SharedDirtSystem _dirt = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/_Wega/Genetics/Systems/Connection/DnaClientSystem.cs b/Content.Shared/_Wega/Genetics/Systems/Connection/DnaClientSystem.cs index 37ab6b91c8..b5d010f023 100644 --- a/Content.Shared/_Wega/Genetics/Systems/Connection/DnaClientSystem.cs +++ b/Content.Shared/_Wega/Genetics/Systems/Connection/DnaClientSystem.cs @@ -5,7 +5,7 @@ namespace Content.Shared.Genetics.Systems; public sealed class DnaClientSystem : EntitySystem { - [Dependency] private readonly DnaServerSystem _dnaServer = default!; + [Dependency] private DnaServerSystem _dnaServer = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Genetics/Systems/Connection/DnaServerSystem.cs b/Content.Shared/_Wega/Genetics/Systems/Connection/DnaServerSystem.cs index 68cbdfc6ff..ea58099570 100644 --- a/Content.Shared/_Wega/Genetics/Systems/Connection/DnaServerSystem.cs +++ b/Content.Shared/_Wega/Genetics/Systems/Connection/DnaServerSystem.cs @@ -6,7 +6,7 @@ namespace Content.Shared.Genetics.Systems; public sealed class DnaServerSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Genetics/Systems/Disease/DizzyGenSystem.cs b/Content.Shared/_Wega/Genetics/Systems/Disease/DizzyGenSystem.cs index 3285cef8bb..f610721442 100644 --- a/Content.Shared/_Wega/Genetics/Systems/Disease/DizzyGenSystem.cs +++ b/Content.Shared/_Wega/Genetics/Systems/Disease/DizzyGenSystem.cs @@ -7,8 +7,8 @@ namespace Content.Shared.Genetics.Systems; // TODO: ref this public sealed class DizzySystem : EntitySystem { - [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private StatusEffectsSystem _statusEffectsSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; [ValidatePrototypeId] public const string DizzyKey = "Dizzy"; diff --git a/Content.Shared/_Wega/Genetics/Systems/MarkingIndexer.cs b/Content.Shared/_Wega/Genetics/Systems/MarkingIndexer.cs index 5906bb5a7e..2241e7dab1 100644 --- a/Content.Shared/_Wega/Genetics/Systems/MarkingIndexer.cs +++ b/Content.Shared/_Wega/Genetics/Systems/MarkingIndexer.cs @@ -8,8 +8,8 @@ namespace Content.Shared.Genetics.Systems { public sealed class MarkingPrototypesIndexerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; private List _markingPrototypes = new List(); private HashSet _usedHexCombinations = new(); diff --git a/Content.Shared/_Wega/Genetics/Systems/SharedDnaModifierSystem.cs b/Content.Shared/_Wega/Genetics/Systems/SharedDnaModifierSystem.cs index 3f20e5cdb6..34aaf27d5f 100644 --- a/Content.Shared/_Wega/Genetics/Systems/SharedDnaModifierSystem.cs +++ b/Content.Shared/_Wega/Genetics/Systems/SharedDnaModifierSystem.cs @@ -6,8 +6,8 @@ namespace Content.Shared.Genetics.Systems; public abstract partial class SharedDnaModifierSystem : EntitySystem { - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private IRobustRandom _random = default!; public void TrySaveInDisk(EntityUid disk, EnzymeInfo enzyme) { diff --git a/Content.Shared/_Wega/Genetics/Systems/StructuralEnzymesIndexer.cs b/Content.Shared/_Wega/Genetics/Systems/StructuralEnzymesIndexer.cs index d5f3b04ac8..a5a7dc06b8 100644 --- a/Content.Shared/_Wega/Genetics/Systems/StructuralEnzymesIndexer.cs +++ b/Content.Shared/_Wega/Genetics/Systems/StructuralEnzymesIndexer.cs @@ -7,8 +7,8 @@ namespace Content.Shared.Genetics.Systems { public sealed class StructuralEnzymesIndexerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; private List _enzymesPrototypes = new List(); private bool _isInitialized = false; diff --git a/Content.Shared/_Wega/Implants/MagbootsImplantSystem.cs b/Content.Shared/_Wega/Implants/MagbootsImplantSystem.cs index 720e19c1da..23feb7c150 100644 --- a/Content.Shared/_Wega/Implants/MagbootsImplantSystem.cs +++ b/Content.Shared/_Wega/Implants/MagbootsImplantSystem.cs @@ -9,9 +9,9 @@ namespace Content.Shared._Wega.Implants; public sealed class SharedMagbootsImplantSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private SharedGravitySystem _gravity = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Implants/SharedInternalStorageSystem.cs b/Content.Shared/_Wega/Implants/SharedInternalStorageSystem.cs index 154c4f57bf..c6ac78b083 100644 --- a/Content.Shared/_Wega/Implants/SharedInternalStorageSystem.cs +++ b/Content.Shared/_Wega/Implants/SharedInternalStorageSystem.cs @@ -14,11 +14,11 @@ namespace Content.Shared.Implants; public abstract class SharedInternalStorageSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; private static readonly EntProtoId ToothImplantAction = "ActionToothImplant"; diff --git a/Content.Shared/_Wega/Interaction/InteractionActionSystem.cs b/Content.Shared/_Wega/Interaction/InteractionActionSystem.cs index ba0d788ce8..c20a858fda 100644 --- a/Content.Shared/_Wega/Interaction/InteractionActionSystem.cs +++ b/Content.Shared/_Wega/Interaction/InteractionActionSystem.cs @@ -15,12 +15,12 @@ namespace Content.Shared.Interaction; public sealed class InteractionActionSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SharedChatSystem _chat = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SharedChatSystem _chat = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Inventory/EmptySlotsRequirementSystem.cs b/Content.Shared/_Wega/Inventory/EmptySlotsRequirementSystem.cs index f97a3a54c7..3d7b0ffb24 100644 --- a/Content.Shared/_Wega/Inventory/EmptySlotsRequirementSystem.cs +++ b/Content.Shared/_Wega/Inventory/EmptySlotsRequirementSystem.cs @@ -6,8 +6,8 @@ namespace Content.Shared.Inventory; public sealed partial class EmptySlotsRequirementSystem : EntitySystem { - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private InventorySystem _inventory = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Lavaland/Systems/OreProcessorPointsSystem.cs b/Content.Shared/_Wega/Lavaland/Systems/OreProcessorPointsSystem.cs index c9956238ec..5de297fafe 100644 --- a/Content.Shared/_Wega/Lavaland/Systems/OreProcessorPointsSystem.cs +++ b/Content.Shared/_Wega/Lavaland/Systems/OreProcessorPointsSystem.cs @@ -9,7 +9,7 @@ namespace Content.Shared.Lavaland; public sealed partial class OreProcessorPointsSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Lavaland/Systems/SharedJaunterSystem.cs b/Content.Shared/_Wega/Lavaland/Systems/SharedJaunterSystem.cs index dd918cc478..7385b39902 100644 --- a/Content.Shared/_Wega/Lavaland/Systems/SharedJaunterSystem.cs +++ b/Content.Shared/_Wega/Lavaland/Systems/SharedJaunterSystem.cs @@ -15,10 +15,10 @@ namespace Content.Shared.Jaunter; public sealed partial class SharedJaunterSystem : EntitySystem { - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedTransformSystem _transform = default!; private static readonly EntProtoId Lava = "FloorLavaEntity"; private const float PROBCHANCE = 0.05f; diff --git a/Content.Shared/_Wega/Lavaland/Systems/TrophyHunterSystem.cs b/Content.Shared/_Wega/Lavaland/Systems/TrophyHunterSystem.cs index 906cd59962..8a91249bd2 100644 --- a/Content.Shared/_Wega/Lavaland/Systems/TrophyHunterSystem.cs +++ b/Content.Shared/_Wega/Lavaland/Systems/TrophyHunterSystem.cs @@ -14,12 +14,12 @@ namespace Content.Shared.Lavaland; public sealed partial class TrophyHunterSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly MobThresholdSystem _threshold = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private MobThresholdSystem _threshold = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private INetManager _net = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Lavaland/Systems/UtilityVendorSystem.cs b/Content.Shared/_Wega/Lavaland/Systems/UtilityVendorSystem.cs index 5911825a3c..22c8553308 100644 --- a/Content.Shared/_Wega/Lavaland/Systems/UtilityVendorSystem.cs +++ b/Content.Shared/_Wega/Lavaland/Systems/UtilityVendorSystem.cs @@ -10,10 +10,10 @@ namespace Content.Shared.Lavaland; public sealed partial class UtilityVendorSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/MartialArts/SharedMartialArtsSystem.cs b/Content.Shared/_Wega/MartialArts/SharedMartialArtsSystem.cs index 463c86a952..f94b69ed48 100644 --- a/Content.Shared/_Wega/MartialArts/SharedMartialArtsSystem.cs +++ b/Content.Shared/_Wega/MartialArts/SharedMartialArtsSystem.cs @@ -13,9 +13,9 @@ namespace Content.Shared.Martial.Arts; public abstract class SharedMartialArtsSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Mobs/MobAngerSystem.cs b/Content.Shared/_Wega/Mobs/MobAngerSystem.cs index 6813918898..4ac8bdc27a 100644 --- a/Content.Shared/_Wega/Mobs/MobAngerSystem.cs +++ b/Content.Shared/_Wega/Mobs/MobAngerSystem.cs @@ -10,9 +10,9 @@ namespace Content.Shared.Mobs.Anger; public sealed class MobAngerSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speed = default!; - [Dependency] private readonly MobThresholdSystem _threshold = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private MovementSpeedModifierSystem _speed = default!; + [Dependency] private MobThresholdSystem _threshold = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/ModularSuit/SharedModularSuitHiddenClothingSystem.cs b/Content.Shared/_Wega/ModularSuit/SharedModularSuitHiddenClothingSystem.cs index dc6458b91e..616cbd1dd2 100644 --- a/Content.Shared/_Wega/ModularSuit/SharedModularSuitHiddenClothingSystem.cs +++ b/Content.Shared/_Wega/ModularSuit/SharedModularSuitHiddenClothingSystem.cs @@ -14,8 +14,8 @@ namespace Content.Shared.Modular.Suit; /// public abstract partial class SharedModularSuitHiddenClothingSystem : EntitySystem { - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly StandingStateSystem _standing = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private StandingStateSystem _standing = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/ModularSuit/SharedModularSuitSystem.cs b/Content.Shared/_Wega/ModularSuit/SharedModularSuitSystem.cs index b206c3aabd..25ab10b007 100644 --- a/Content.Shared/_Wega/ModularSuit/SharedModularSuitSystem.cs +++ b/Content.Shared/_Wega/ModularSuit/SharedModularSuitSystem.cs @@ -20,13 +20,13 @@ public abstract partial class SharedModularSuitSystem : EntitySystem [Dependency] protected readonly ItemToggleSystem Toggle = default!; [Dependency] protected readonly SharedContainerSystem Container = default!; [Dependency] protected readonly SharedPopupSystem Popup = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SlotBlockSystem _slotBlock = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speed = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SlotBlockSystem _slotBlock = default!; + [Dependency] private MovementSpeedModifierSystem _speed = default!; - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; public const string CoreContainer = "suit_core"; public const string PartContainer = "suit_part"; diff --git a/Content.Shared/_Wega/Movement/Systems/FlyAbilitySystem.cs b/Content.Shared/_Wega/Movement/Systems/FlyAbilitySystem.cs index 2e4bbc442e..5a68876545 100644 --- a/Content.Shared/_Wega/Movement/Systems/FlyAbilitySystem.cs +++ b/Content.Shared/_Wega/Movement/Systems/FlyAbilitySystem.cs @@ -13,9 +13,9 @@ namespace Content.Shared.Movement.Systems; public abstract class SharedFlyAbilitySystem : EntitySystem { [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambient = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private SharedAmbientSoundSystem _ambient = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; public override void Initialize() diff --git a/Content.Shared/_Wega/Objectives/Systems/BloodCondition.cs b/Content.Shared/_Wega/Objectives/Systems/BloodCondition.cs index 7ca1f61f4d..59b492d381 100644 --- a/Content.Shared/_Wega/Objectives/Systems/BloodCondition.cs +++ b/Content.Shared/_Wega/Objectives/Systems/BloodCondition.cs @@ -7,8 +7,8 @@ namespace Content.Server.Objectives.Systems; public sealed class BloodConditionSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MetaDataSystem _metaData = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Offer/SharedOfferItemSystem.cs b/Content.Shared/_Wega/Offer/SharedOfferItemSystem.cs index 7b84f39a9a..9a102a1a45 100644 --- a/Content.Shared/_Wega/Offer/SharedOfferItemSystem.cs +++ b/Content.Shared/_Wega/Offer/SharedOfferItemSystem.cs @@ -12,10 +12,10 @@ namespace Content.Shared.Offer; public abstract partial class SharedOfferItemSystem : EntitySystem { - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Overlays/Abstract/SharedToggleableEquipmentHudSystem.cs b/Content.Shared/_Wega/Overlays/Abstract/SharedToggleableEquipmentHudSystem.cs index f631221537..24bee545ae 100644 --- a/Content.Shared/_Wega/Overlays/Abstract/SharedToggleableEquipmentHudSystem.cs +++ b/Content.Shared/_Wega/Overlays/Abstract/SharedToggleableEquipmentHudSystem.cs @@ -11,13 +11,13 @@ namespace Content.Shared.Overlay; public abstract class SharedToggleableEquipmentHudSystem : EntitySystem where T : ToggleableHudComponent { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private IGameTiming _gameTiming = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Posing/SharedPosingSystem.cs b/Content.Shared/_Wega/Posing/SharedPosingSystem.cs index d04f713774..28e84cdd3f 100644 --- a/Content.Shared/_Wega/Posing/SharedPosingSystem.cs +++ b/Content.Shared/_Wega/Posing/SharedPosingSystem.cs @@ -17,10 +17,10 @@ namespace Content.Shared.Posing; public abstract partial class SharedPosingSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly StandingStateSystem _standing = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private StandingStateSystem _standing = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private IGameTiming _timing = default!; private readonly Dictionary _continuousInput = new(); diff --git a/Content.Shared/_Wega/RCD/Systems/RCDUpgradeKitSystem.cs b/Content.Shared/_Wega/RCD/Systems/RCDUpgradeKitSystem.cs index bb71af5674..858d2dad11 100644 --- a/Content.Shared/_Wega/RCD/Systems/RCDUpgradeKitSystem.cs +++ b/Content.Shared/_Wega/RCD/Systems/RCDUpgradeKitSystem.cs @@ -8,7 +8,7 @@ namespace Content.Shared.RCD.Systems; public sealed partial class RCDUpgradeKitSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Resomi/Abilities/Hearing/SharedListenUpSkillSystem.cs b/Content.Shared/_Wega/Resomi/Abilities/Hearing/SharedListenUpSkillSystem.cs index 57395d6b5e..152ff66119 100644 --- a/Content.Shared/_Wega/Resomi/Abilities/Hearing/SharedListenUpSkillSystem.cs +++ b/Content.Shared/_Wega/Resomi/Abilities/Hearing/SharedListenUpSkillSystem.cs @@ -6,8 +6,8 @@ namespace Content.Shared.Resomi.Abilities.Hearing; public abstract class SharedListenUpSkillSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillSystem.cs b/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillSystem.cs index 0fe63956be..91e848bfcb 100644 --- a/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillSystem.cs +++ b/Content.Shared/_Wega/Resomi/Abilities/SharedAgillitySkillSystem.cs @@ -10,9 +10,9 @@ namespace Content.Shared.Resomi.Abilities; public abstract class SharedAgillitySkillSystem : EntitySystem { [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly ClimbSystem _climb = default!; - [Dependency] private readonly SharedStaminaSystem _stamina = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private ClimbSystem _climb = default!; + [Dependency] private SharedStaminaSystem _stamina = default!; + [Dependency] private SharedActionsSystem _actions = default!; protected const int BaseCollisionGroup = (int)(CollisionGroup.MobMask); diff --git a/Content.Shared/_Wega/Shader/SharedNaturalNightVisionSystem.cs b/Content.Shared/_Wega/Shader/SharedNaturalNightVisionSystem.cs index 4c45ce33a9..6f16ce5dc5 100644 --- a/Content.Shared/_Wega/Shader/SharedNaturalNightVisionSystem.cs +++ b/Content.Shared/_Wega/Shader/SharedNaturalNightVisionSystem.cs @@ -4,7 +4,7 @@ namespace Content.Shared.Shaders; public sealed class SharedNaturalNightVisionSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _action = default!; + [Dependency] private SharedActionsSystem _action = default!; public override void Initialize() { @@ -16,4 +16,4 @@ public sealed class SharedNaturalNightVisionSystem : EntitySystem ent.Comp.Action = _action.AddAction(ent, ent.Comp.ActionProto); Dirty(ent.Owner, ent.Comp); } -} \ No newline at end of file +} diff --git a/Content.Shared/_Wega/Sharpening/Systems/SharedSharpeningSystem.cs b/Content.Shared/_Wega/Sharpening/Systems/SharedSharpeningSystem.cs index 56a6ee1423..ce9eae2728 100644 --- a/Content.Shared/_Wega/Sharpening/Systems/SharedSharpeningSystem.cs +++ b/Content.Shared/_Wega/Sharpening/Systems/SharedSharpeningSystem.cs @@ -10,7 +10,7 @@ namespace Content.Shared.Sharpening.Systems; public abstract class SharedSharpeningSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/SoundInsulation/SoundInsulationSystem.cs b/Content.Shared/_Wega/SoundInsulation/SoundInsulationSystem.cs index 24ddf0d287..1e455ff9bf 100644 --- a/Content.Shared/_Wega/SoundInsulation/SoundInsulationSystem.cs +++ b/Content.Shared/_Wega/SoundInsulation/SoundInsulationSystem.cs @@ -12,10 +12,10 @@ namespace Content.Shared.SoundInsolation; public sealed class SoundInsulationSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private IRobustRandom _random = default!; public float GetSoundInsulation(EntityUid source, EntityUid listener) { diff --git a/Content.Shared/_Wega/Strangulation/SharedStrangulationSystem.cs b/Content.Shared/_Wega/Strangulation/SharedStrangulationSystem.cs index 4085797dec..6778755512 100644 --- a/Content.Shared/_Wega/Strangulation/SharedStrangulationSystem.cs +++ b/Content.Shared/_Wega/Strangulation/SharedStrangulationSystem.cs @@ -5,7 +5,7 @@ namespace Content.Shared.Strangulation { public abstract class SharedStrangulationSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Stunnable/SharedStunSystem.Slowdown.cs b/Content.Shared/_Wega/Stunnable/SharedStunSystem.Slowdown.cs index 3dc7379576..372db6a132 100644 --- a/Content.Shared/_Wega/Stunnable/SharedStunSystem.Slowdown.cs +++ b/Content.Shared/_Wega/Stunnable/SharedStunSystem.Slowdown.cs @@ -5,7 +5,7 @@ namespace Content.Shared.Stunnable; public abstract partial class SharedStunSystem { - [Dependency] private readonly MovementModStatusSystem _movementMod = default!; + [Dependency] private MovementModStatusSystem _movementMod = default!; private void OnSlowdownOnContactCollide(Entity ent, ref StartCollideEvent args) { diff --git a/Content.Shared/_Wega/TapeRecorder/SharedTapeRecorderSystem.cs b/Content.Shared/_Wega/TapeRecorder/SharedTapeRecorderSystem.cs index 9ba22c21f4..4485fe0030 100644 --- a/Content.Shared/_Wega/TapeRecorder/SharedTapeRecorderSystem.cs +++ b/Content.Shared/_Wega/TapeRecorder/SharedTapeRecorderSystem.cs @@ -20,14 +20,14 @@ namespace Content.Shared.TapeRecorder; public abstract class SharedTapeRecorderSystem : EntitySystem { - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly ItemSlotsSystem _slots = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private ItemSlotsSystem _slots = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; protected const string SlotName = "cassette_tape"; diff --git a/Content.Shared/_Wega/Vampire/SharedVampireSystem.cs b/Content.Shared/_Wega/Vampire/SharedVampireSystem.cs index 3aea6e5e25..085f8eea21 100644 --- a/Content.Shared/_Wega/Vampire/SharedVampireSystem.cs +++ b/Content.Shared/_Wega/Vampire/SharedVampireSystem.cs @@ -12,8 +12,8 @@ namespace Content.Shared.Vampire; public abstract class SharedVampireSystem : EntitySystem { - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; #region Blood Management diff --git a/Content.Shared/_Wega/Vehicle/SharedVehicleSystem.cs b/Content.Shared/_Wega/Vehicle/SharedVehicleSystem.cs index 3399fbfeb3..bd8a6dd7b7 100644 --- a/Content.Shared/_Wega/Vehicle/SharedVehicleSystem.cs +++ b/Content.Shared/_Wega/Vehicle/SharedVehicleSystem.cs @@ -29,21 +29,21 @@ namespace Content.Shared.Vehicle; /// public abstract partial class SharedVehicleSystem : EntitySystem { - [Dependency] private readonly INetManager _netManager = default!; + [Dependency] private INetManager _netManager = default!; [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly MovementSpeedModifierSystem _modifier = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedVirtualItemSystem _virtualItemSystem = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly SharedJointSystem _joints = default!; - [Dependency] private readonly SharedBuckleSystem _buckle = default!; - [Dependency] private readonly SharedMoverController _mover = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private MovementSpeedModifierSystem _modifier = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSound = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedVirtualItemSystem _virtualItemSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedJointSystem _joints = default!; + [Dependency] private SharedBuckleSystem _buckle = default!; + [Dependency] private SharedMoverController _mover = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedHandsSystem _hands = default!; private static readonly ProtoId Dump = "DoorBumpOpener"; private static readonly ProtoId Key = "VehicleKey"; diff --git a/Content.Shared/_Wega/VeilCult/SharedTeleportationEnchantSystem.cs b/Content.Shared/_Wega/VeilCult/SharedTeleportationEnchantSystem.cs index cb747d52e2..cd5bcedc0d 100644 --- a/Content.Shared/_Wega/VeilCult/SharedTeleportationEnchantSystem.cs +++ b/Content.Shared/_Wega/VeilCult/SharedTeleportationEnchantSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Veil.Cult; public abstract partial class SharedTeleportationEnchantSystem : EntitySystem { - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/VeilCult/SharedVeilBeaconSystem.cs b/Content.Shared/_Wega/VeilCult/SharedVeilBeaconSystem.cs index 34b69903bb..6bb85df8cf 100644 --- a/Content.Shared/_Wega/VeilCult/SharedVeilBeaconSystem.cs +++ b/Content.Shared/_Wega/VeilCult/SharedVeilBeaconSystem.cs @@ -6,7 +6,7 @@ namespace Content.Shared.Veil.Cult; public sealed class VeilBeaconSystem : EntitySystem { - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/VeilCult/SharedVeilCultSystem.cs b/Content.Shared/_Wega/VeilCult/SharedVeilCultSystem.cs index e676048fc1..fc8550fa6c 100644 --- a/Content.Shared/_Wega/VeilCult/SharedVeilCultSystem.cs +++ b/Content.Shared/_Wega/VeilCult/SharedVeilCultSystem.cs @@ -18,14 +18,14 @@ namespace Content.Shared.Veil.Cult; public abstract class SharedVeilCultSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speed = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private MovementSpeedModifierSystem _speed = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Voucher/VoucherSystem.cs b/Content.Shared/_Wega/Voucher/VoucherSystem.cs index f21da4381c..ae3e8b5bd4 100644 --- a/Content.Shared/_Wega/Voucher/VoucherSystem.cs +++ b/Content.Shared/_Wega/Voucher/VoucherSystem.cs @@ -9,10 +9,10 @@ namespace Content.Shared.Voucher; public sealed partial class VoucherSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Weapons/Hitscan/System/HitscanIEMPSystem.cs b/Content.Shared/_Wega/Weapons/Hitscan/System/HitscanIEMPSystem.cs index 9f07971abf..fd6a0dcff7 100644 --- a/Content.Shared/_Wega/Weapons/Hitscan/System/HitscanIEMPSystem.cs +++ b/Content.Shared/_Wega/Weapons/Hitscan/System/HitscanIEMPSystem.cs @@ -7,7 +7,7 @@ namespace Content.Shared.Weapons.Hitscan.Systems; public sealed class HitscanEMPSystem : EntitySystem { - [Dependency] private readonly SharedEmpSystem _emp = default!; + [Dependency] private SharedEmpSystem _emp = default!; public override void Initialize() { @@ -27,4 +27,4 @@ public sealed class HitscanEMPSystem : EntitySystem if (HasComp(target.Value)) _emp.EmpPulse(Transform(target.Value).Coordinates, ent.Comp.Range, ent.Comp.EnergyConsumption, ent.Comp.DisableDuration); } -} \ No newline at end of file +} diff --git a/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeEffectsSystem.cs b/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeEffectsSystem.cs index 6698083a14..1af7654cf6 100644 --- a/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeEffectsSystem.cs +++ b/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeEffectsSystem.cs @@ -25,17 +25,17 @@ namespace Content.Shared.Weapons.Misc.Upgrades; public sealed class CrusherUpgradeEffectsSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MobThresholdSystem _threshold = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MobThresholdSystem _threshold = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private TurfSystem _turf = default!; private static readonly ProtoId SlowImmune = "SlowImmune"; private static readonly ProtoId StunImmune = "StunImmune"; diff --git a/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeSystem.cs b/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeSystem.cs index 0b8ae2fb3b..784c72824d 100644 --- a/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeSystem.cs +++ b/Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeSystem.cs @@ -21,12 +21,12 @@ namespace Content.Shared.Weapons.Misc.Upgrades; public sealed class CrusherUpgradeSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; + [Dependency] private ISharedAdminLogManager _adminLog = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private EntityWhitelistSystem _entityWhitelist = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedToolSystem _tool = default!; /// public override void Initialize() diff --git a/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellInjectorSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellInjectorSystem.cs index 2a5eb5ac13..11ed90ddf5 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellInjectorSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellInjectorSystem.cs @@ -15,12 +15,12 @@ namespace Content.Shared.Xenobiology.Systems.Machines; public sealed class CellMutagenicInjectorSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedCellSystem _cell = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedCellSystem _cell = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedPowerReceiverSystem _powerReceiver = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellSequencerSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellSequencerSystem.cs index d92a6a75c0..8bab1d79ab 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellSequencerSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellSequencerSystem.cs @@ -11,15 +11,15 @@ namespace Content.Shared.Xenobiology.Systems.Machines; public sealed class CellSequencerSystem : EntitySystem { - [Dependency] private readonly CellClientSystem _cellClient = default!; - [Dependency] private readonly CellServerSystem _cellServer = default!; + [Dependency] private CellClientSystem _cellClient = default!; + [Dependency] private CellServerSystem _cellServer = default!; - [Dependency] private readonly SharedMaterialStorageSystem _materialStorage = default!; + [Dependency] private SharedMaterialStorageSystem _materialStorage = default!; - [Dependency] private readonly SharedCellSystem _cell = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!; + [Dependency] private SharedCellSystem _cell = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedUserInterfaceSystem _userInterface = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellularFusionSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellularFusionSystem.cs index 8ca8d123f5..b0a10a4356 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellularFusionSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/Machines/CellularFusionSystem.cs @@ -9,12 +9,12 @@ namespace Content.Shared.Xenobiology.Systems.Machines; public sealed class CellularFusionSystem : EntitySystem { - [Dependency] private readonly CellClientSystem _cellClient = default!; - [Dependency] private readonly CellServerSystem _cellServer = default!; + [Dependency] private CellClientSystem _cellClient = default!; + [Dependency] private CellServerSystem _cellServer = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!; - [Dependency] private readonly SharedMaterialStorageSystem _materialStorage = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedUserInterfaceSystem _userInterface = default!; + [Dependency] private SharedMaterialStorageSystem _materialStorage = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Xenobiology/Systems/Machines/Connection/CellClientSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/Machines/Connection/CellClientSystem.cs index fabd28d628..bd3a0f89a7 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/Machines/Connection/CellClientSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/Machines/Connection/CellClientSystem.cs @@ -5,7 +5,7 @@ namespace Content.Shared.Xenobiology.Systems.Machines.Connection; public sealed class CellClientSystem : EntitySystem { - [Dependency] private readonly CellServerSystem _cellServer = default!; + [Dependency] private CellServerSystem _cellServer = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Xenobiology/Systems/SharedCellSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/SharedCellSystem.cs index ae8764a424..37877b203c 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/SharedCellSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/SharedCellSystem.cs @@ -16,7 +16,7 @@ namespace Content.Shared.Xenobiology.Systems; [PublicAPI] public abstract partial class SharedCellSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Xenobiology/Systems/SharedCellVisualsSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/SharedCellVisualsSystem.cs index 482b500b4b..1e33a37bc9 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/SharedCellVisualsSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/SharedCellVisualsSystem.cs @@ -6,7 +6,7 @@ namespace Content.Shared.Xenobiology.Systems; public abstract class SharedCellVisualsSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Shared/_Wega/Xenobiology/Systems/SharedSlimeGrowthSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/SharedSlimeGrowthSystem.cs index c5ccbb81f4..9ff1b4863b 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/SharedSlimeGrowthSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/SharedSlimeGrowthSystem.cs @@ -5,7 +5,7 @@ namespace Content.Shared.Xenobiology.Systems; public abstract partial class SharedSlimeGrowthSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public static readonly Dictionary> MutationTable = new() { diff --git a/Content.Shared/_Wega/Xenobiology/Systems/SharedSlimeVisualSystem.cs b/Content.Shared/_Wega/Xenobiology/Systems/SharedSlimeVisualSystem.cs index 82ebe2baea..b9dea1db8b 100644 --- a/Content.Shared/_Wega/Xenobiology/Systems/SharedSlimeVisualSystem.cs +++ b/Content.Shared/_Wega/Xenobiology/Systems/SharedSlimeVisualSystem.cs @@ -5,9 +5,9 @@ namespace Content.Shared.Xenobiology; public abstract class SharedSlimeVisualSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/RobustToolbox b/RobustToolbox index 3136118b53..08a3d120b7 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 3136118b5338ef2d9580178caf5c723e65eb76e7 +Subproject commit 08a3d120b7029d03e60b44b23fed2b2659ed3224