From dbb4bad67f5ef9709e95209614c491ceca635202 Mon Sep 17 00:00:00 2001 From: Armorkillerd Date: Sun, 24 May 2026 03:16:33 +0300 Subject: [PATCH 1/4] sand --- .../ADT/Sandevistan/SandevistanSystem.cs | 16 ++++++++++------ .../ADT/Sandevistan/SandevistanUserComponent.cs | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Content.Server/ADT/Sandevistan/SandevistanSystem.cs b/Content.Server/ADT/Sandevistan/SandevistanSystem.cs index df2662b82cf..55c30c5780d 100644 --- a/Content.Server/ADT/Sandevistan/SandevistanSystem.cs +++ b/Content.Server/ADT/Sandevistan/SandevistanSystem.cs @@ -205,11 +205,15 @@ 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 }, }, }; } From 39d68b59568d2cf8a2668e9d8b86718d6be40597 Mon Sep 17 00:00:00 2001 From: Armorkillerd Date: Sun, 24 May 2026 03:38:21 +0300 Subject: [PATCH 2/4] 2 --- Content.Server/ADT/Implants/VisibleImplantSystem.cs | 2 +- .../ADT/Implants/Components/MantisDaggersComponent.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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.Shared/ADT/Implants/Components/MantisDaggersComponent.cs b/Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs index a77242aa1a1..1510930c1fa 100644 --- a/Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs +++ b/Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs @@ -44,14 +44,14 @@ 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() { DamageDict = new Dictionary { - { "Shock", 20 }, + { "Shock", 10 }, }, }; } From e403e4d4dc260eefc51a92dd06d35677ef67f5f7 Mon Sep 17 00:00:00 2001 From: Armorkillerd Date: Sun, 24 May 2026 03:42:19 +0300 Subject: [PATCH 3/4] Update MantisDaggersComponent.cs --- .../ADT/Implants/Components/MantisDaggersComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs b/Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs index 1510930c1fa..23f7e0e1e77 100644 --- a/Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs +++ b/Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs @@ -51,7 +51,7 @@ public sealed partial class MantisDaggersComponent : Component { DamageDict = new Dictionary { - { "Shock", 10 }, + { "Shock", 20 }, }, }; } From 1757d47395f07a61931bef35c34e574c855cee92 Mon Sep 17 00:00:00 2001 From: Armorkillerd Date: Sun, 24 May 2026 08:03:33 +0300 Subject: [PATCH 4/4] Update SandevistanSystem.cs --- Content.Server/ADT/Sandevistan/SandevistanSystem.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Content.Server/ADT/Sandevistan/SandevistanSystem.cs b/Content.Server/ADT/Sandevistan/SandevistanSystem.cs index 55c30c5780d..e592e428937 100644 --- a/Content.Server/ADT/Sandevistan/SandevistanSystem.cs +++ b/Content.Server/ADT/Sandevistan/SandevistanSystem.cs @@ -207,7 +207,6 @@ private void OnEmpPulse(Entity ent, ref EmpPulseEvent 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);