diff --git a/Content.Shared/_White/Chemistry/NarcoticEffect.cs b/Content.Shared/_White/Chemistry/NarcoticEffect.cs index 167741eb52..91b4d9e579 100644 --- a/Content.Shared/_White/Chemistry/NarcoticEffect.cs +++ b/Content.Shared/_White/Chemistry/NarcoticEffect.cs @@ -53,7 +53,7 @@ public sealed class NarcoticEffect : EntitySystem switch (Enum.GetValues(typeof(NarcoticEffects)).GetValue(index)) { case NarcoticEffects.TremorAndShake when _statusEffectsSystem.HasStatusEffect(uid, "Drunk", statusEffectsComp): - Timer.SpawnRepeating(timer, () => _stamina.TakeStaminaDamage(uid, 15F), token); + Timer.SpawnRepeating(timer + component.TimerScale, () => _stamina.TakeStaminaDamage(uid, 15F), token); _statusEffectsSystem.TryAddTime(uid, "Drunk", TimeSpan.FromSeconds(slur), statusEffectsComp); break; @@ -62,21 +62,21 @@ public sealed class NarcoticEffect : EntitySystem break; case NarcoticEffects.StunAndShake when _statusEffectsSystem.HasStatusEffect(uid, "Drunk", statusEffectsComp): - Timer.SpawnRepeating(timer, () => _standingStateSystem.TryLieDown(uid, standingComp), token); + Timer.SpawnRepeating(timer + component.TimerScale, () => _standingStateSystem.TryLieDown(uid, standingComp), token); _statusEffectsSystem.TryAddTime(uid, "Drunk", TimeSpan.FromSeconds(slur), statusEffectsComp); break; case NarcoticEffects.Stun: - Timer.SpawnRepeating(timer, () => _standingStateSystem.TryLieDown(uid, standingComp), token); + Timer.SpawnRepeating(timer + component.TimerScale, () => _standingStateSystem.TryLieDown(uid, standingComp), token); break; case NarcoticEffects.TremorAndShake: - Timer.SpawnRepeating(timer, () => _stamina.TakeStaminaDamage(uid, 15F), token); + Timer.SpawnRepeating(timer + component.TimerScale, () => _stamina.TakeStaminaDamage(uid, 15F), token); _statusEffectsSystem.TryAddStatusEffect(uid, "Drunk", TimeSpan.FromSeconds(slur), true, statusEffectsComp); break; case NarcoticEffects.Tremor: - Timer.SpawnRepeating(timer, () => _stamina.TakeStaminaDamage(uid, 15F), token); + Timer.SpawnRepeating(timer + component.TimerScale, () => _stamina.TakeStaminaDamage(uid, 15F), token); break; case NarcoticEffects.Shake: @@ -84,7 +84,7 @@ public sealed class NarcoticEffect : EntitySystem break; case NarcoticEffects.StunAndShake: - Timer.SpawnRepeating(timer, () => _standingStateSystem.TryLieDown(uid, standingComp), token); + Timer.SpawnRepeating(timer + component.TimerScale, () => _standingStateSystem.TryLieDown(uid, standingComp), token); _statusEffectsSystem.TryAddStatusEffect(uid, "Drunk", TimeSpan.FromSeconds(slur), true, statusEffectsComp); break; } diff --git a/Content.Shared/_White/Chemistry/NarcoticEffectComponent.cs b/Content.Shared/_White/Chemistry/NarcoticEffectComponent.cs index f23182685e..e34f09217b 100644 --- a/Content.Shared/_White/Chemistry/NarcoticEffectComponent.cs +++ b/Content.Shared/_White/Chemistry/NarcoticEffectComponent.cs @@ -17,6 +17,9 @@ public sealed partial class NarcoticEffectComponent : Component [ViewVariables(VVAccess.ReadOnly), DataField] public List SlurTime = new() { 35, 60, 80, 90, 45 }; + + [ViewVariables(VVAccess.ReadOnly), DataField] + public int TimerScale = 6000; } [Serializable, NetSerializable]