From 077dceeb2df026f5182a5b77447d7c3b795aa476 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
<66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sun, 28 Dec 2025 15:22:04 -0800
Subject: [PATCH] Delete MetabolismMovespeedModifierSystem (#42134)
* delete metabolismmovespeedmodifiersystem
* Revert "delete metabolismmovespeedmodifiersystem"
This reverts commit 19572fa0858bfb9385f4717fc77c8956bdbc56c0.
* delete metabolismmovespeedmodifiersystem and component
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
.../MovespeedModifierMetabolismComponent.cs | 22 -------
.../MetabolismMovespeedModifierSystem.cs | 61 -------------------
2 files changed, 83 deletions(-)
delete mode 100644 Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs
delete mode 100644 Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs
diff --git a/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs b/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs
deleted file mode 100644
index 62127ab533..0000000000
--- a/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Chemistry.Components
-{
- //TODO: refactor movement modifier component because this is a pretty poor solution
- [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
- public sealed partial class MovespeedModifierMetabolismComponent : Component
- {
- [AutoNetworkedField, ViewVariables]
- public float WalkSpeedModifier { get; set; }
-
- [AutoNetworkedField, ViewVariables]
- public float SprintSpeedModifier { get; set; }
-
- ///
- /// When the current modifier is expected to end.
- ///
- [AutoNetworkedField, ViewVariables]
- public TimeSpan ModifierTimer { get; set; } = TimeSpan.Zero;
- }
-}
-
diff --git a/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs b/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs
deleted file mode 100644
index 68a55dd468..0000000000
--- a/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Movement.Systems;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.Chemistry
-{
- // TODO CONVERT THIS TO A STATUS EFFECT!!!!!!!!!!!!!!!!!!!!!!!!
- public sealed class MetabolismMovespeedModifierSystem : EntitySystem
- {
- [Dependency] private readonly IGameTiming _gameTiming = default!;
- [Dependency] private readonly MovementSpeedModifierSystem _movespeed = default!;
-
- private readonly List> _components = new();
-
- public override void Initialize()
- {
- base.Initialize();
-
- UpdatesOutsidePrediction = true;
-
- SubscribeLocalEvent(AddComponent);
- SubscribeLocalEvent(OnRefreshMovespeed);
- }
-
- private void OnRefreshMovespeed(EntityUid uid, MovespeedModifierMetabolismComponent component, RefreshMovementSpeedModifiersEvent args)
- {
- args.ModifySpeed(component.WalkSpeedModifier, component.SprintSpeedModifier);
- }
-
- private void AddComponent(Entity metabolism, ref ComponentStartup args)
- {
- _components.Add(metabolism);
- }
-
- public override void Update(float frameTime)
- {
- base.Update(frameTime);
-
- var currentTime = _gameTiming.CurTime;
-
- for (var i = _components.Count - 1; i >= 0; i--)
- {
- var metabolism = _components[i];
-
- if (metabolism.Comp.Deleted)
- {
- _components.RemoveAt(i);
- continue;
- }
-
- if (metabolism.Comp.ModifierTimer > currentTime)
- continue;
-
- _components.RemoveAt(i);
- RemComp(metabolism);
-
- _movespeed.RefreshMovementSpeedModifiers(metabolism);
- }
- }
- }
-}
--
2.52.0