Offmed-1 merge 0 errs

Content.Client/Corvax/SecApartment/SquadEntry.xaml.cs

@@ -251,6 +251,8 @@ public sealed partial class SquadEntry : PanelContainer
             {
                 specifier = new SpriteSpecifier.Rsi(new ResPath("Interface/Alerts/human_crew_monitoring.rsi"), "dead");
             }
+            /*
+            WL-Offbrand: Suit senso
             else if (member.SensorStatus.DamagePercentage != null)
             {
                 var index = MathF.Round(4f * member.SensorStatus.DamagePercentage.Value);
@@ -260,6 +262,7 @@ public sealed partial class SquadEntry : PanelContainer
                 else
                     specifier = new SpriteSpecifier.Rsi(new ResPath("Interface/Alerts/human_crew_monitoring.rsi"), "health" + index);
             }
+            */
         }/*
         else
         {
@@ -409,6 +412,8 @@ public sealed partial class SquadEntry : PanelContainer
                                     "dead"
                                 );
                             }
+                            /*
+                            WL-Offbrand: Suitsensors
                             else if (status.DamagePercentage != null)
                             {
                                 var index = MathF.Round(4f * status.DamagePercentage.Value);
@@ -423,6 +428,7 @@ public sealed partial class SquadEntry : PanelContainer
                                         "health" + index
                                     );
                             }
+                            */
                         }/*
                         else
                         {

Content.Client/_Offbrand/Overlays/HeartrateOverlay.cs

@@ -12,11 +12,11 @@ using Robust.Shared.Utility;
 
 namespace Content.Client._Offbrand.Overlays;
 
-public sealed class HeartrateOverlay : Overlay
+public sealed partial class HeartrateOverlay : Overlay
 {
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private IEntityManager _entityManager = default!;
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private IPrototypeManager _prototype = default!;
 
     private readonly HeartSystem _heart;
     private readonly SharedTransformSystem _transform;

Content.Client/_Offbrand/Surgery/SurgeryGuideMenu.xaml.cs

@@ -16,8 +16,8 @@ public record SurgeryListData(ConstructionPrototype Construction) : ListData;
 [GenerateTypedNameReferences]
 public sealed partial class SurgeryGuideMenu : FancyWindow
 {
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private IEntityManager _entityManager = default!;
+    [Dependency] private IPrototypeManager _prototypeManager = default!;
 
     private readonly ConstructionSystem _construction = default!;
     private readonly SpriteSystem _sprite = default!;

Content.Server/NPC/Systems/NPCUtilitySystem.cs

@@ -61,7 +61,7 @@ public sealed partial class NPCUtilitySystem : EntitySystem
     [Dependency] private TurretTargetSettingsSystem _turretTargetSettings = default!;
     [Dependency] private DamageableSystem _damageable = default!;
     [Dependency] private SharedStealthSystem _stealth = default!;
-    [Dependency] private readonly HealthRankingSystem _healthRanking = default!; // Offbrand
+    [Dependency] private HealthRankingSystem _healthRanking = default!; // Offbrand
 
     private EntityQuery<PuddleComponent> _puddleQuery;
     private EntityQuery<TransformComponent> _xformQuery;

Content.Server/_Offbrand/EntityEffects/MetaboliteThresholdSystem.cs

@@ -10,10 +10,10 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Server._Offbrand.EntityEffects;
 
-public sealed class MetaboliteThresholdEntityConditionSystem : EntityConditionSystem<MetabolizerComponent, MetaboliteThresholdCondition>
+public sealed partial class MetaboliteThresholdEntityConditionSystem : EntityConditionSystem<MetabolizerComponent, MetaboliteThresholdCondition>
 {
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly MetabolizerSystem _metabolizer = default!;
+    [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private MetabolizerSystem _metabolizer = default!;
 
     private static readonly ProtoId<MetabolismStagePrototype> MetabolitesStage = "Metabolites";
     private static readonly ProtoId<MetabolismStagePrototype> BloodstreamStage = "Bloodstream";

Content.Server/_Offbrand/EntityEffects/ZombifySystem.cs

@@ -4,9 +4,9 @@ using Content.Shared.EntityEffects;
 
 namespace Content.Server._Offbrand.EntityEffects;
 
-public sealed class ZombifySystem : EntityEffectSystem<MetaDataComponent, Zombify>
+public sealed partial class ZombifySystem : EntityEffectSystem<MetaDataComponent, Zombify>
 {
-    [Dependency] private readonly ZombieSystem _zombie = default!;
+    [Dependency] private ZombieSystem _zombie = default!;
 
     protected override void Effect(Entity<MetaDataComponent> ent, ref EntityEffectEvent<Zombify> args)
     {

Content.Server/_Offbrand/MMI/MMIExtractorSystem.cs

@@ -15,17 +15,17 @@ using Robust.Shared.Player;
 
 namespace Content.Server._Offbrand.MMI;
 
-public sealed class MMIExtractorSystem : EntitySystem
+public sealed partial class MMIExtractorSystem : EntitySystem
 {
-    [Dependency] private readonly BrainDamageSystem _brainDamage = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
-    [Dependency] private readonly EuiManager _eui = default!;
-    [Dependency] private readonly ISharedPlayerManager _player = default!;
-    [Dependency] private readonly ItemSlotsSystem _slots = default!;
-    [Dependency] private readonly BodySystem _body = default!;
-    [Dependency] private readonly SharedChatSystem _chat = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private BrainDamageSystem _brainDamage = default!;
+    [Dependency] private EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private EuiManager _eui = default!;
+    [Dependency] private ISharedPlayerManager _player = default!;
+    [Dependency] private ItemSlotsSystem _slots = default!;
+    [Dependency] private BodySystem _body = default!;
+    [Dependency] private SharedChatSystem _chat = default!;
+    [Dependency] private SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private SharedMindSystem _mind = default!;
 
     public override void Initialize()
     {

Content.Server/_Offbrand/Surgery/SurgeryGuideTargetSystem.cs

@@ -4,10 +4,10 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Server._Offbrand.Surgery;
 
-public sealed class SurgeryGuideTargetSystem : SharedSurgeryGuideTargetSystem
+public sealed partial class SurgeryGuideTargetSystem : SharedSurgeryGuideTargetSystem
 {
-    [Dependency] private readonly ConstructionSystem _construction = default!;
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private ConstructionSystem _construction = default!;
+    [Dependency] private IPrototypeManager _prototype = default!;
 
     protected override void OnStartSurgery(Entity<SurgeryGuideTargetComponent> ent, ref SurgeryGuideStartSurgeryMessage args)
     {

Content.Server/_Offbrand/Wounds/BrainGaspThresholdsSystem.cs

@@ -4,9 +4,9 @@ using Content.Shared._Offbrand.Wounds;
 
 namespace Content.Server._Offbrand.Wounds;
 
-public sealed class BrainGaspThresholdsSystem : EntitySystem
+public sealed partial class BrainGaspThresholdsSystem : EntitySystem
 {
-    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private ChatSystem _chat = default!;
 
     public override void Initialize()
     {

Content.Server/_Offbrand/Wounds/ShockGaspThresholdsSystem.cs

@@ -4,10 +4,10 @@ using Content.Shared._Offbrand.Wounds;
 
 namespace Content.Server._Offbrand.Wounds;
 
-public sealed class ShockGaspThresholdsSystem : EntitySystem
+public sealed partial class ShockGaspThresholdsSystem : EntitySystem
 {
-    [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly PainSystem _pain = default!;
+    [Dependency] private ChatSystem _chat = default!;
+    [Dependency] private PainSystem _pain = default!;
 
     public override void Initialize()
     {

Content.Server/_Offbrand/Wounds/WoundableHealthAnalyzerSystem.cs

@@ -11,13 +11,13 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Server._Offbrand.Wounds;
 
-public sealed class WoundableHealthAnalyzerSystem : SharedWoundableHealthAnalyzerSystem
+public sealed partial class WoundableHealthAnalyzerSystem : SharedWoundableHealthAnalyzerSystem
 {
-    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
-    [Dependency] private readonly BodySystem _body = default!;
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
-    [Dependency] private readonly MetabolizerSystem _metabolizer = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private AtmosphereSystem _atmosphere = default!;
+    [Dependency] private BodySystem _body = default!;
+    [Dependency] private IPrototypeManager _prototype = default!;
+    [Dependency] private MetabolizerSystem _metabolizer = default!;
+    [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
 
     private static readonly ProtoId<MetabolismStagePrototype> MetabolitesStage = "Metabolites";
 

Content.Shared/_Offbrand/Buckle/StatusEffectOnStrapSystem.cs

@@ -5,10 +5,10 @@ using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared._Offbrand.Buckle;
 
-public sealed class StatusEffectOnStrapSystem : EntitySystem
+public sealed partial class StatusEffectOnStrapSystem : EntitySystem
 {
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
-    [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!;
+    [Dependency] private StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private SharedPowerReceiverSystem _powerReceiver = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/EntityEffects/AdjustReagentGaussian.cs

@@ -33,11 +33,11 @@ public sealed partial class AdjustReagentGaussian : EntityEffectBase<AdjustReage
     }
 }
 
-public sealed class AdjustReagentGaussianEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustReagentGaussian>
+public sealed partial class AdjustReagentGaussianEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustReagentGaussian>
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private IGameTiming _timing = default!;
+    // [Dependency] private IRobustRandom _random = default!;
+    [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
 
     protected override void Effect(Entity<SolutionComponent> ent, ref EntityEffectEvent<AdjustReagentGaussian> args)
     {

Content.Shared/_Offbrand/EntityEffects/ClampWounds.cs

@@ -16,9 +16,9 @@ public sealed partial class ClampWounds : EntityEffectBase<ClampWounds>
     }
 }
 
-public sealed class ClampWoundsEntityEffectSystem : EntityEffectSystem<WoundableComponent, ClampWounds>
+public sealed partial class ClampWoundsEntityEffectSystem : EntityEffectSystem<WoundableComponent, ClampWounds>
 {
-    [Dependency] private readonly WoundableSystem _woundable = default!;
+    [Dependency] private WoundableSystem _woundable = default!;
 
     protected override void Effect(Entity<WoundableComponent> ent, ref EntityEffectEvent<ClampWounds> args)
     {

Content.Shared/_Offbrand/EntityEffects/ModifyBrainDamage.cs

@@ -19,9 +19,9 @@ public sealed partial class ModifyBrainDamage : EntityEffectBase<ModifyBrainDama
     }
 }
 
-public sealed class ModifyBrainDamageEntityEffectSystem : EntityEffectSystem<BrainDamageComponent, ModifyBrainDamage>
+public sealed partial class ModifyBrainDamageEntityEffectSystem : EntityEffectSystem<BrainDamageComponent, ModifyBrainDamage>
 {
-    [Dependency] private readonly BrainDamageSystem _brainDamage = default!;
+    [Dependency] private BrainDamageSystem _brainDamage = default!;
 
     protected override void Effect(Entity<BrainDamageComponent> ent, ref EntityEffectEvent<ModifyBrainDamage> args)
     {

Content.Shared/_Offbrand/EntityEffects/ModifyBrainOxygen.cs

@@ -19,9 +19,9 @@ public sealed partial class ModifyBrainOxygen : EntityEffectBase<ModifyBrainOxyg
     }
 }
 
-public sealed class ModifyBrainOxygenEntityEffectSystem : EntityEffectSystem<BrainDamageComponent, ModifyBrainOxygen>
+public sealed partial class ModifyBrainOxygenEntityEffectSystem : EntityEffectSystem<BrainDamageComponent, ModifyBrainOxygen>
 {
-    [Dependency] private readonly BrainDamageSystem _brainDamage = default!;
+    [Dependency] private BrainDamageSystem _brainDamage = default!;
 
     protected override void Effect(Entity<BrainDamageComponent> ent, ref EntityEffectEvent<ModifyBrainOxygen> args)
     {

Content.Shared/_Offbrand/EntityEffects/ModifyHeartDamage.cs

@@ -19,9 +19,9 @@ public sealed partial class ModifyHeartDamage : EntityEffectBase<ModifyHeartDama
     }
 }
 
-public sealed class ModifyHeartDamageEntityEffectSystem : EntityEffectSystem<HeartrateComponent, ModifyHeartDamage>
+public sealed partial class ModifyHeartDamageEntityEffectSystem : EntityEffectSystem<HeartrateComponent, ModifyHeartDamage>
 {
-    [Dependency] private readonly HeartSystem _heart = default!;
+    [Dependency] private HeartSystem _heart = default!;
 
     protected override void Effect(Entity<HeartrateComponent> ent, ref EntityEffectEvent<ModifyHeartDamage> args)
     {

Content.Shared/_Offbrand/EntityEffects/ModifyLungDamage.cs

@@ -19,9 +19,9 @@ public sealed partial class ModifyLungDamage : EntityEffectBase<ModifyLungDamage
     }
 }
 
-public sealed class ModifyLungDamageEntityEffectSystem : EntityEffectSystem<LungDamageComponent, ModifyLungDamage>
+public sealed partial class ModifyLungDamageEntityEffectSystem : EntityEffectSystem<LungDamageComponent, ModifyLungDamage>
 {
-    [Dependency] private readonly LungDamageSystem _lungDamage = default!;
+    [Dependency] private LungDamageSystem _lungDamage = default!;
 
     protected override void Effect(Entity<LungDamageComponent> ent, ref EntityEffectEvent<ModifyLungDamage> args)
     {

Content.Shared/_Offbrand/EntityEffects/RemoveStatusEffect.cs

@@ -18,9 +18,9 @@ public sealed partial class RemoveStatusEffect : EntityEffectBase<RemoveStatusEf
             ("key", prototype.Index(EffectProto).Name));
 }
 
-public sealed class RemoveStatusEffectEntityEffectSystem : EntityEffectSystem<StatusEffectContainerComponent, RemoveStatusEffect>
+public sealed partial class RemoveStatusEffectEntityEffectSystem : EntityEffectSystem<StatusEffectContainerComponent, RemoveStatusEffect>
 {
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private StatusEffectsSystem _statusEffects = default!;
 
     protected override void Effect(Entity<StatusEffectContainerComponent> ent, ref EntityEffectEvent<RemoveStatusEffect> args)
     {

Content.Shared/_Offbrand/EntityEffects/StartHeart.cs

@@ -12,9 +12,9 @@ public sealed partial class StartHeart : EntityEffectBase<StartHeart>
     }
 }
 
-public sealed class StartHeartEntityEffectSystem : EntityEffectSystem<HeartrateComponent, StartHeart>
+public sealed partial class StartHeartEntityEffectSystem : EntityEffectSystem<HeartrateComponent, StartHeart>
 {
-    [Dependency] private readonly HeartSystem _heart = default!;
+    [Dependency] private HeartSystem _heart = default!;
 
     protected override void Effect(Entity<HeartrateComponent> ent, ref EntityEffectEvent<StartHeart> args)
     {

Content.Shared/_Offbrand/IV/IVSystem.cs

@@ -16,16 +16,16 @@ using Robust.Shared.Timing;
 
 namespace Content.Shared._Offbrand.IV;
 
-public sealed class IVSystem : EntitySystem
+public sealed partial class IVSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly SharedJointSystem _joint = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private ItemSlotsSystem _itemSlots = default!;
+    [Dependency] private SharedAppearanceSystem _appearance = default!;
+    [Dependency] private SharedBloodstreamSystem _bloodstream = default!;
+    [Dependency] private SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private SharedJointSystem _joint = default!;
+    [Dependency] private SharedPopupSystem _popup = default!;
+    [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/SolutionAppearanceRelay/SolutionAppearanceRelaySystem.cs

@@ -7,23 +7,23 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared._Offbrand.SolutionAppearanceRelay;
 
-public sealed class SolutionAppearanceRelaySystem : EntitySystem
+public sealed partial class SolutionAppearanceRelaySystem : EntitySystem
 {
-    [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
-    [Dependency] private readonly SharedContainerSystem _container = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private EntityWhitelistSystem _entityWhitelist = default!;
+    [Dependency] private SharedContainerSystem _container = default!;
+    [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private SharedAppearanceSystem _appearance = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SolutionAppearanceRelayComponent, SolutionContainerChangedEvent>(OnSolutionContainerChanged);
+        SubscribeLocalEvent<SolutionAppearanceRelayComponent, SolutionChangedEvent>(OnSolutionContainerChanged);
         SubscribeLocalEvent<SolutionAppearanceRelayComponent, EntGotInsertedIntoContainerMessage>(OnEntGotInsertedIntoContainer);
         SubscribeLocalEvent<SolutionAppearanceRelayComponent, EntGotRemovedFromContainerMessage>(OnEntGotRemovedFromContainer);
     }
 
-    private void OnSolutionContainerChanged(Entity<SolutionAppearanceRelayComponent> ent, ref SolutionContainerChangedEvent args)
+    private void OnSolutionContainerChanged(Entity<SolutionAppearanceRelayComponent> ent, ref SolutionChangedEvent args)
     {
         UpdateAppearance(ent);
     }
@@ -56,7 +56,7 @@ public sealed class SolutionAppearanceRelaySystem : EntitySystem
         if (!_entityWhitelist.CheckBoth(container.Owner, ent.Comp.Blacklist, ent.Comp.Whitelist))
             return;
 
-        _solutionContainer.UpdateAppearance(container.Owner, (solutionEntity.Value.Owner, solutionEntity.Value.Comp, containedSolution));
+        _solutionContainer.UpdateAppearance(container.Owner, (solutionEntity.Value.Owner, solutionEntity.Value.Comp));
         _appearance.SetData(container.Owner, SolutionAppearanceRelayedVisuals.HasRelay, true);
     }
 }

Content.Shared/_Offbrand/StatusEffects/BlindnessStatusEffectSystem.cs

@@ -3,9 +3,9 @@ using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class BlindnessStatusEffectSystem : EntitySystem
+public sealed partial class BlindnessStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly BlindableSystem _blindable = default!;
+    [Dependency] private BlindableSystem _blindable = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/BlockMovementWhenPulledStatusEffectSystem.cs

@@ -7,9 +7,9 @@ using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class BlockMovementWhenPulledStatusEffectSystem : EntitySystem
+public sealed partial class BlockMovementWhenPulledStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private ActionBlockerSystem _actionBlocker = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/BlurryVisionStatusEffectSystem.cs

@@ -3,9 +3,9 @@ using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class BlurryVisionStatusEffectSystem : EntitySystem
+public sealed partial class BlurryVisionStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly BlurryVisionSystem _blurryVision = default!;
+    [Dependency] private BlurryVisionSystem _blurryVision = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/CauseStatusEffectRandomlyStatusEffectSystem.cs

@@ -7,10 +7,10 @@ using Robust.Shared.Timing;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class CauseStatusEffectRandomlyStatusEffectSystem : EntitySystem
+public sealed partial class CauseStatusEffectRandomlyStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private StatusEffectsSystem _statusEffects = default!;
 
     public override void Update(float frameTime)
     {

Content.Shared/_Offbrand/StatusEffects/DamageOverTimeStatusEffectSystem.cs

@@ -6,10 +6,10 @@ using Robust.Shared.Timing;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class DamageOverTimeStatusEffectSystem : EntitySystem
+public sealed partial class DamageOverTimeStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private DamageableSystem _damageable = default!;
 
     public override void Update(float frameTime)
     {

Content.Shared/_Offbrand/StatusEffects/DisruptOnAttackStatusEffectSystem.cs

@@ -7,9 +7,9 @@ using Robust.Shared.GameObjects;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class DisruptOnAttackStatusEffectSystem : EntitySystem
+public sealed partial class DisruptOnAttackStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!;
+    [Dependency] private SharedUserInterfaceSystem _userInterface = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/GunAccuracyStatusEffectSystem.cs

@@ -7,10 +7,10 @@ using Content.Shared.Weapons.Ranged.Systems;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class GunAccuracyStatusEffectSystem : EntitySystem
+public sealed partial class GunAccuracyStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly SharedGunSystem _gun = default!;
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private SharedGunSystem _gun = default!;
+    [Dependency] private SharedHandsSystem _hands = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/GunBackfireStatusEffectSystem.cs

@@ -10,12 +10,12 @@ using Robust.Shared.Timing;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class GunBackfireStatusEffectSystem : EntitySystem
+public sealed partial class GunBackfireStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private SharedAudioSystem _audio = default!;
+    [Dependency] private SharedPopupSystem _popup = default!;
+    [Dependency] private SharedStunSystem _stun = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/HyposprayBackfireStatusEffectSystem.cs

@@ -10,12 +10,12 @@ using Robust.Shared.Timing;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class HyposprayBackfireStatusEffectSystem : EntitySystem
+public sealed partial class HyposprayBackfireStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private SharedAudioSystem _audio = default!;
+    [Dependency] private SharedPopupSystem _popup = default!;
+    [Dependency] private SharedStunSystem _stun = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/KnockdownOnAppliedStatusEffectSystem.cs

@@ -3,9 +3,9 @@ using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class KnockdownOnAppliedStatusEffectSystem : EntitySystem
+public sealed partial class KnockdownOnAppliedStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private SharedStunSystem _stun = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/ModifyBrainDamageChanceStatusEffectSystem.cs

@@ -4,9 +4,9 @@ using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class ModifyBrainDamageChanceStatusEffectSystem : EntitySystem
+public sealed partial class ModifyBrainDamageChanceStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly HeartSystem _heart = default!;
+    [Dependency] private HeartSystem _heart = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/ModifyBrainOxygenDepletionChanceStatusEffectSystem.cs

@@ -4,9 +4,9 @@ using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class ModifyBrainOxygenDepletionChanceStatusEffectSystem : EntitySystem
+public sealed partial class ModifyBrainOxygenDepletionChanceStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly HeartSystem _heart = default!;
+    [Dependency] private HeartSystem _heart = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/PainSuppressionStatusEffectSystem.cs

@@ -3,9 +3,9 @@ using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class PainSuppressionStatusEffectSystem : EntitySystem
+public sealed partial class PainSuppressionStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly PainSystem _pain = default!;
+    [Dependency] private PainSystem _pain = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/PopupOnAppliedStatusEffectSystem.cs

@@ -3,9 +3,9 @@ using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class PopupOnAppliedStatusEffectSystem : EntitySystem
+public sealed partial class PopupOnAppliedStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private SharedPopupSystem _popup = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/RemovableStatusEffectSystem.cs

@@ -8,11 +8,11 @@ using Content.Shared.Verbs;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class RemovableStatusEffectSystem : EntitySystem
+public sealed partial class RemovableStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private SharedHandsSystem _hands = default!;
+    [Dependency] private SharedPopupSystem _popup = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/SlowOnDamageModifierStatusEffectSystem.cs

@@ -4,9 +4,9 @@ using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class SlowOnDamageModifierStatusEffectSystem : EntitySystem
+public sealed partial class SlowOnDamageModifierStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
+    [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/StatusEffects/StaminaDamageOnAppliedStatusEffectSystem.cs

@@ -3,9 +3,9 @@ using Content.Shared.StatusEffectNew;
 
 namespace Content.Shared._Offbrand.StatusEffects;
 
-public sealed class StaminaDamageOnAppliedStatusEffectSystem : EntitySystem
+public sealed partial class StaminaDamageOnAppliedStatusEffectSystem : EntitySystem
 {
-    [Dependency] private readonly SharedStaminaSystem _stamina = default!;
+    [Dependency] private SharedStaminaSystem _stamina = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Surgery/SharedSurgeryGuideTargetSystem.cs

@@ -4,10 +4,10 @@ using Robust.Shared.GameObjects;
 
 namespace Content.Shared._Offbrand.Surgery;
 
-public abstract class SharedSurgeryGuideTargetSystem : EntitySystem
+public abstract partial class SharedSurgeryGuideTargetSystem : EntitySystem
 {
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!;
+    [Dependency] private SharedPopupSystem _popup = default!;
+    [Dependency] private SharedUserInterfaceSystem _userInterface = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Surgery/SurgeryToolSystem.cs

@@ -7,12 +7,12 @@ using Content.Shared.Whitelist;
 namespace Content.Shared._Offbrand.Surgery;
 
 // this code needs to use predicted popups when construction gets predicted
-public sealed class SurgeryToolSystem : EntitySystem
+public sealed partial class SurgeryToolSystem : EntitySystem
 {
-    [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly StandingStateSystem _standingState = default!;
+    [Dependency] private EntityWhitelistSystem _entityWhitelist = default!;
+    [Dependency] private InventorySystem _inventory = default!;
+    [Dependency] private SharedPopupSystem _popup = default!;
+    [Dependency] private StandingStateSystem _standingState = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Triggers/StatusEffectTriggerConditionSystem.cs

@@ -3,9 +3,9 @@ using Content.Shared.Trigger;
 
 namespace Content.Shared._Offbrand.Triggers;
 
-public sealed class StatusEffectTriggerConditionSystem : EntitySystem
+public sealed partial class StatusEffectTriggerConditionSystem : EntitySystem
 {
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private StatusEffectsSystem _statusEffects = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Triggers/TriggerOnDoAfterSystem.cs

@@ -11,15 +11,15 @@ using Robust.Shared.Audio.Systems;
 
 namespace Content.Shared._Offbrand.Triggers;
 
-public sealed class TriggerOnDoAfterSystem : EntitySystem
+public sealed partial class TriggerOnDoAfterSystem : EntitySystem
 {
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedStackSystem _stack = default!;
-    [Dependency] private readonly TriggerSystem _trigger = default!;
-    [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
+    [Dependency] private SharedAudioSystem _audio = default!;
+    [Dependency] private SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private SharedInteractionSystem _interaction = default!;
+    [Dependency] private SharedPopupSystem _popup = default!;
+    [Dependency] private SharedStackSystem _stack = default!;
+    [Dependency] private TriggerSystem _trigger = default!;
+    [Dependency] private EntityWhitelistSystem _entityWhitelist = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Weapons/HeldGunModifierRefreshSystem.cs

@@ -7,7 +7,7 @@ namespace Content.Shared._Offbrand.Weapons;
 
 public sealed partial class HeldGunModifierRefreshSystem : EntitySystem
 {
-    [Dependency] private readonly SharedGunSystem _gun = default!;
+    [Dependency] private SharedGunSystem _gun = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/BrainDamageOnDamageSystem.cs

@@ -5,9 +5,9 @@ using Content.Shared.FixedPoint;
 
 namespace Content.Shared._Offbrand.Wounds;
 
-public sealed class BrainDamageOnDamageSystem : OffbrandDamageSystem
+public sealed partial class BrainDamageOnDamageSystem : OffbrandDamageSystem
 {
-    [Dependency] private readonly BrainDamageSystem _brain = default!;
+    [Dependency] private BrainDamageSystem _brain = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/BrainDamageSystem.cs

@@ -11,8 +11,8 @@ namespace Content.Shared._Offbrand.Wounds;
 
 public sealed partial class BrainDamageSystem : EntitySystem
 {
-    [Dependency] private readonly HeartSystem _heart = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private HeartSystem _heart = default!;
+    [Dependency] private IGameTiming _timing = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/BrainDamageThresholdsSystem.cs

@@ -9,9 +9,9 @@ namespace Content.Shared._Offbrand.Wounds;
 
 public sealed partial class BrainDamageThresholdsSystem : EntitySystem
 {
-    [Dependency] private readonly AlertsSystem _alerts = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private AlertsSystem _alerts = default!;
+    [Dependency] private MobStateSystem _mobState = default!;
+    [Dependency] private StatusEffectsSystem _statusEffects = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/CprSystem.cs

@@ -11,14 +11,14 @@ using Robust.Shared.Timing;
 
 namespace Content.Shared._Offbrand.Wounds;
 
-public sealed class CprSystem : EntitySystem
+public sealed partial class CprSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
-    [Dependency] private readonly WoundableSystem _woundable = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private SharedPopupSystem _popup = default!;
+    [Dependency] private StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private WoundableSystem _woundable = default!;
+    [Dependency] private MobStateSystem _mobState = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/CryostasisFactorSystem.cs

@@ -7,9 +7,9 @@ using Content.Shared.Temperature;
 
 namespace Content.Server._Offbrand.Wounds;
 
-public sealed class CryostasisFactorSystem : EntitySystem
+public sealed partial class CryostasisFactorSystem : EntitySystem
 {
-    [Dependency] protected readonly MetabolizerSystem _metabolizer = default!;
+    [Dependency] private MetabolizerSystem _metabolizer = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/HealthRankingSystem.cs

@@ -6,11 +6,11 @@ namespace Content.Shared._Offbrand.Wounds;
 
 public sealed partial class HealthRankingSystem : EntitySystem
 {
-    [Dependency] private readonly BrainDamageSystem _brainDamage = default!;
-    [Dependency] private readonly HeartSystem _heart = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly PainSystem _pain = default!;
-    [Dependency] private readonly ShockThresholdsSystem _shockThresholds = default!;
+    [Dependency] private BrainDamageSystem _brainDamage = default!;
+    [Dependency] private HeartSystem _heart = default!;
+    [Dependency] private MobStateSystem _mobState = default!;
+    [Dependency] private PainSystem _pain = default!;
+    [Dependency] private ShockThresholdsSystem _shockThresholds = default!;
 
     private const float PainDeathRatio = 0.5f;
     private const float BrainDeathRatio = 0.3f;

Content.Shared/_Offbrand/Wounds/HeartDamageOnDamageSystem.cs

@@ -5,9 +5,9 @@ using Content.Shared.FixedPoint;
 
 namespace Content.Shared._Offbrand.Wounds;
 
-public sealed class HeartDamageOnDamageSystem : OffbrandDamageSystem
+public sealed partial class HeartDamageOnDamageSystem : OffbrandDamageSystem
 {
-    [Dependency] private readonly HeartSystem _heart = default!;
+    [Dependency] private HeartSystem _heart = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/HeartSystem.cs

@@ -16,10 +16,10 @@ namespace Content.Shared._Offbrand.Wounds;
 
 public sealed partial class HeartSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly PainSystem _pain = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private PainSystem _pain = default!;
+    [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private StatusEffectsSystem _statusEffects = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/HeartrateAlertsSystem.cs

@@ -3,10 +3,10 @@ using Content.Shared.FixedPoint;
 
 namespace Content.Shared._Offbrand.Wounds;
 
-public sealed class HeartrateAlertsSystem : EntitySystem
+public sealed partial class HeartrateAlertsSystem : EntitySystem
 {
-    [Dependency] private readonly AlertsSystem _alerts = default!;
-    [Dependency] private readonly HeartSystem _heart = default!;
+    [Dependency] private AlertsSystem _alerts = default!;
+    [Dependency] private HeartSystem _heart = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/HeartrateComponent.cs

@@ -82,7 +82,7 @@ public sealed partial class HeartrateComponent : Component
 
     #region Heartstop
     [DataField, AutoNetworkedField]
-    public bool Running = true;
+    new public bool Running = true;
 
     /// <summary>
     /// The status effect to apply when the heart is not running

Content.Shared/_Offbrand/Wounds/LungDamageSystem.cs

@@ -7,10 +7,10 @@ using Robust.Shared.Timing;
 
 namespace Content.Shared._Offbrand.Wounds;
 
-public sealed class LungDamageSystem : OffbrandDamageSystem
+public sealed partial class LungDamageSystem : OffbrandDamageSystem
 {
-    [Dependency] private readonly AlertsSystem _alerts = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private AlertsSystem _alerts = default!;
+    [Dependency] private IGameTiming _timing = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/LungDamageTemperatureSystem.cs

@@ -3,9 +3,9 @@ using Content.Shared._Offbrand.Wounds;
 
 namespace Content.Shared._Offbrand.Wounds;
 
-public sealed class LungDamageTemperatureSystem : EntitySystem
+public sealed partial class LungDamageTemperatureSystem : EntitySystem
 {
-    [Dependency] private readonly LungDamageSystem _lungDamage = default!;
+    [Dependency] private LungDamageSystem _lungDamage = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/PainSystem.cs

@@ -7,7 +7,7 @@ namespace Content.Shared._Offbrand.Wounds;
 
 public sealed partial class PainSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private IGameTiming _timing = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/ShockAlertsSystem.cs

@@ -5,10 +5,10 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Shared._Offbrand.Wounds;
 
-public sealed class ShockAlertsSystem : EntitySystem
+public sealed partial class ShockAlertsSystem : EntitySystem
 {
-    [Dependency] private readonly AlertsSystem _alerts = default!;
-    [Dependency] private readonly PainSystem _pain = default!;
+    [Dependency] private AlertsSystem _alerts = default!;
+    [Dependency] private PainSystem _pain = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/ShockThresholdsSystem.cs

@@ -9,9 +9,9 @@ namespace Content.Shared._Offbrand.Wounds;
 
 public sealed partial class ShockThresholdsSystem : EntitySystem
 {
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly PainSystem _pain = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private MobStateSystem _mobState = default!;
+    [Dependency] private PainSystem _pain = default!;
+    [Dependency] private StatusEffectsSystem _statusEffects = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/TendingSystem.cs

@@ -12,16 +12,16 @@ using Robust.Shared.Audio.Systems;
 
 namespace Content.Shared._Offbrand.Wounds;
 
-public sealed class TendingSystem : EntitySystem
+public sealed partial class TendingSystem : EntitySystem
 {
-    [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedStackSystem _stack = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
-    [Dependency] private readonly WoundableSystem _woundable = default!;
+    [Dependency] private EntityWhitelistSystem _entityWhitelist = default!;
+    [Dependency] private SharedAudioSystem _audio = default!;
+    [Dependency] private SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private SharedInteractionSystem _interaction = default!;
+    [Dependency] private SharedPopupSystem _popup = default!;
+    [Dependency] private SharedStackSystem _stack = default!;
+    [Dependency] private StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private WoundableSystem _woundable = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/UniqueWoundOnDamageSystem.cs

@@ -9,8 +9,8 @@ namespace Content.Shared._Offbrand.Wounds;
 
 public sealed partial class UniqueWoundOnDamageSystem : OffbrandDamageSystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly WoundableSystem _woundable = default!;
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private WoundableSystem _woundable = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/UnvisitOnAliveSystem.cs

@@ -3,9 +3,9 @@ using Content.Shared.Mobs;
 
 namespace Content.Shared._Offbrand.Wounds;
 
-public sealed class UnvisitOnAliveSystem : EntitySystem
+public sealed partial class UnvisitOnAliveSystem : EntitySystem
 {
-    [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private SharedMindSystem _mind = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/WoundRegenerationSystem.cs

@@ -3,10 +3,10 @@ using Robust.Shared.Timing;
 
 namespace Content.Shared._Offbrand.Wounds;
 
-public sealed class WoundRegenerationSystem : EntitySystem
+public sealed partial class WoundRegenerationSystem : EntitySystem
 {
-	[Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly WoundableSystem _woundable = default!;
+	[Dependency] private IGameTiming _timing = default!;
+    [Dependency] private WoundableSystem _woundable = default!;
 
     public override void Initialize()
     {

Content.Shared/_Offbrand/Wounds/WoundableHealthAnalyzer.cs

@@ -71,12 +71,12 @@ public enum MetricRanking : byte
     Dangerous = 4,
 }
 
-public abstract class SharedWoundableHealthAnalyzerSystem : EntitySystem
+public abstract partial class SharedWoundableHealthAnalyzerSystem : EntitySystem
 {
-    [Dependency] private readonly BrainDamageSystem _brainDamage = default!;
-    [Dependency] private readonly HeartSystem _heart = default!;
-    [Dependency] private readonly ShockThresholdsSystem _shockThresholds = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private BrainDamageSystem _brainDamage = default!;
+    [Dependency] private HeartSystem _heart = default!;
+    [Dependency] private ShockThresholdsSystem _shockThresholds = default!;
+    [Dependency] private StatusEffectsSystem _statusEffects = default!;
 
     protected const string MedicineGroup = "Medicine";
 

Content.Shared/_Offbrand/Wounds/WoundableSystem.cs

@@ -18,12 +18,12 @@ using Robust.Shared.Utility;
 
 namespace Content.Shared._Offbrand.Wounds;
 
-public sealed class WoundableSystem : OffbrandDamageSystem
+public sealed partial class WoundableSystem : OffbrandDamageSystem
 {
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly INetManager _net = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private DamageableSystem _damageable = default!;
+    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private INetManager _net = default!;
+    [Dependency] private StatusEffectsSystem _statusEffects = default!;
 
     public override void Initialize()
     {