diff --git a/Content.Server/ADT/Implants/VisibleImplantSystem.cs b/Content.Server/ADT/Implants/VisibleImplantSystem.cs index feb48d15f25..25837f20011 100644 --- a/Content.Server/ADT/Implants/VisibleImplantSystem.cs +++ b/Content.Server/ADT/Implants/VisibleImplantSystem.cs @@ -156,7 +156,7 @@ private void OnEmpPulse(Entity ent, ref EmpPulseEvent ar } _appearance.SetData(uid, MantisDaggersVisuals.Active, false); _appearance.SetData(uid, MantisDaggersVisuals.Inactive, true); - _jittering.DoJitter(uid, TimeSpan.FromSeconds(15f), true); + _jittering.DoJitter(uid, TimeSpan.FromSeconds(10f), true); Spawn("EffectSparks", Transform(uid).Coordinates); ent.Comp.Active = false; _audio.PlayEntity(ent.Comp.Sound, Filter.Pvs(uid), uid, true); diff --git a/Content.Server/ADT/Sandevistan/SandevistanSystem.cs b/Content.Server/ADT/Sandevistan/SandevistanSystem.cs index df2662b82cf..e592e428937 100644 --- a/Content.Server/ADT/Sandevistan/SandevistanSystem.cs +++ b/Content.Server/ADT/Sandevistan/SandevistanSystem.cs @@ -205,11 +205,14 @@ private void OnEmpPulse(Entity ent, ref EmpPulseEvent ent.Comp.EmpLastPulse = _timing.CurTime; var uid = ent.Owner; - ent.Comp.CurrentLoad += ent.Comp.EmpOverload; - _damageable.TryChangeDamage(uid, ent.Comp.EmpDamage, ignoreResistances: true); - _jittering.DoJitter(uid, TimeSpan.FromSeconds(30f), true); - _stun.TryAddParalyzeDuration(uid, TimeSpan.FromSeconds(5f)); - Spawn("EffectSparks", Transform(uid).Coordinates); - Disable(ent, ent.Comp); + if (ent.Comp.Active != null) + { + ent.Comp.CurrentLoad += ent.Comp.EmpOverload; + _damageable.TryChangeDamage(uid, ent.Comp.EmpDamage, ignoreResistances: true); + _jittering.DoJitter(uid, TimeSpan.FromSeconds(30f), true); + _stun.TryAddParalyzeDuration(uid, TimeSpan.FromSeconds(6f)); + Spawn("EffectSparks", Transform(uid).Coordinates); + Disable(ent, ent.Comp); + } } } diff --git a/Content.Server/ADT/Sandevistan/SandevistanUserComponent.cs b/Content.Server/ADT/Sandevistan/SandevistanUserComponent.cs index 66a4eab76f7..25923a89c6d 100644 --- a/Content.Server/ADT/Sandevistan/SandevistanUserComponent.cs +++ b/Content.Server/ADT/Sandevistan/SandevistanUserComponent.cs @@ -107,7 +107,7 @@ public sealed partial class SandevistanUserComponent : Component { DamageDict = new Dictionary { - { "Shock", 30 }, + { "Shock", 40 }, }, }; } diff --git a/Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs b/Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs index a77242aa1a1..23f7e0e1e77 100644 --- a/Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs +++ b/Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs @@ -44,7 +44,7 @@ public sealed partial class MantisDaggersComponent : Component public TimeSpan EmpLastPulse = TimeSpan.Zero; [ViewVariables(VVAccess.ReadOnly)] - public TimeSpan EmpCooldown = TimeSpan.FromSeconds(15f); + public TimeSpan EmpCooldown = TimeSpan.FromSeconds(10f); [DataField] public DamageSpecifier EmpDamage = new()