Skip to content

[Fix] Исправление имплантов. #2799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Armorkillerd wants to merge 5 commits into
base: master
Choose a base branch
from
+12 −9
Open

[Fix] Исправление имплантов. #2799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dbb4bad
sand
Armorkillerd May 24, 2026
39d68b5
2
Armorkillerd May 24, 2026
e403e4d
Update MantisDaggersComponent.cs
Armorkillerd May 24, 2026
1757d47
Update SandevistanSystem.cs
Armorkillerd May 24, 2026
4e94057
Merge branch 'master' into 131
Armorkillerd Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Server/ADT/Implants/VisibleImplantSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ private void OnEmpPulse(Entity<MantisDaggersComponent> 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);
Expand Down
15 changes: 9 additions & 6 deletions Content.Server/ADT/Sandevistan/SandevistanSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,14 @@ private void OnEmpPulse(Entity<SandevistanUserComponent> 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);
}
}
}
2 changes: 1 addition & 1 deletion Content.Server/ADT/Sandevistan/SandevistanUserComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public sealed partial class SandevistanUserComponent : Component
{
DamageDict = new Dictionary<string, FixedPoint2>
{
{ "Shock", 30 },
{ "Shock", 40 },
},
};
}
2 changes: 1 addition & 1 deletion Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading