diff --git a/Content.Server/Goobstation/Changeling/ChangelingSystem.Abilities.cs b/Content.Server/Goobstation/Changeling/ChangelingSystem.Abilities.cs index 1feee55e81e..32114dc8d83 100644 --- 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 index a1d37f6ef33..683d589c8e5 100644 --- a/Content.Server/Goobstation/Changeling/ChangelingSystem.cs +++ b/Content.Server/Goobstation/Changeling/ChangelingSystem.cs @@ -121,9 +121,19 @@ public override void Initialize() SubscribeLocalEvent(OnDamageChange); SubscribeLocalEvent(OnComponentRemove); + SubscribeLocalEvent(OnRefreshSpeed); + SubscribeAbilities(); } + private void OnRefreshSpeed(Entity 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(uid);