finally fix ling speed issues (Simple-Station#472)

* gaming * real! * real 3! * fuck * great * ungreat * gnomes are here. * g * fuck * raaagh cleanup * fart * ghfghdfghfbvd * boobooboo * RAAAAAAAAAAAAGH * zased * the unholy shitfix * small chaeng --------- Co-authored-by: whateverusername0 <whateveremail>
VMSolidus · Aug 16, 2024 · 866d0f6 · 866d0f6
1 parent 520f848
commit 866d0f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Content.Server/Goobstation/Changeling/ChangelingSystem.Abilities.cs b/Content.Server/Goobstation/Changeling/ChangelingSystem.Abilities.cs
@@ -349,18 +349,17 @@ private void ToggleStrainedMuscles(EntityUid uid, ChangelingComponent comp)
     {
         if (!comp.StrainedMusclesActive)
         {
-            _speed.ChangeBaseSpeed(uid, 125f, 150f, 1f);
             _popup.PopupEntity(Loc.GetString("changeling-muscles-start"), uid, uid);
             comp.StrainedMusclesActive = true;
         }
         else
         {
-            _speed.ChangeBaseSpeed(uid, 100f, 100f, 1f);
             _popup.PopupEntity(Loc.GetString("changeling-muscles-end"), uid, uid);
             comp.StrainedMusclesActive = false;
         }
 
         PlayMeatySound(uid, comp);
+        _speed.RefreshMovementSpeedModifiers(uid);
     }
 
     #endregion
@@ -527,7 +526,7 @@ public void OnEphedrineOverdose(EntityUid uid, ChangelingComponent comp, ref Act
 
         var reagents = new List<(string, FixedPoint2)>()
         {
-            ("Synaptizine", 5f)
+            ("Desoxyephedrine", 5f)
         };
         if (TryInjectReagents(uid, reagents))
             _popup.PopupEntity(Loc.GetString("changeling-inject"), uid, uid);

diff --git a/Content.Server/Goobstation/Changeling/ChangelingSystem.cs b/Content.Server/Goobstation/Changeling/ChangelingSystem.cs
@@ -121,9 +121,19 @@ public override void Initialize()
         SubscribeLocalEvent<ChangelingComponent, DamageChangedEvent>(OnDamageChange);
         SubscribeLocalEvent<ChangelingComponent, ComponentRemove>(OnComponentRemove);
 
+        SubscribeLocalEvent<ChangelingComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshSpeed);
+
         SubscribeAbilities();
     }
 
+    private void OnRefreshSpeed(Entity<ChangelingComponent> ent, ref RefreshMovementSpeedModifiersEvent args)
+    {
+        if (ent.Comp.StrainedMusclesActive)
+            args.ModifySpeed(1.25f, 1.5f);
+        else
+            args.ModifySpeed(1f, 1f);
+    }
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -221,6 +231,7 @@ private void UpdateBiomass(EntityUid uid, ChangelingComponent comp, float? amoun
     }
     private void UpdateAbilities(EntityUid uid, ChangelingComponent comp)
     {
+        _speed.RefreshMovementSpeedModifiers(uid);
         if (comp.StrainedMusclesActive)
         {
             var stamina = EnsureComp<StaminaComponent>(uid);