Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into upstream-core

Browse Source
This commit is contained in:
Jabak
2024-08-29 13:25:33 +03:00
parent 1659569dcc 697cf6259c
commit ccbfcdfd52
100 changed files with 5214 additions and 2476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Medical/DefibrillatorSystem.cs
View File

@@ -62,13 +62,14 @@ public sealed class DefibrillatorSystem : EntitySystem
// WD START
private void OnStaminaHitAttempt(Entity<DefibrillatorComponent> ent, ref StaminaDamageOnHitAttemptEvent args)
{
var (uid, comp) = ent;
if (comp.Enabled && _powerCell.TryUseActivatableCharge(uid))
if (ent.Comp.Enabled && _powerCell.TryUseActivatableCharge(ent))
{
if (!_powerCell.HasActivatableCharge(uid))
TryDisable(uid, comp);
comp.NextZapTime = _timing.CurTime + TimeSpan.FromSeconds(3);
_appearance.SetData(uid, DefibrillatorVisuals.Ready, false);
if (!_powerCell.HasActivatableCharge(ent))
TryDisable(ent);
ent.Comp.NextZapTime = _timing.CurTime + TimeSpan.FromSeconds(3);
_appearance.SetData(ent, DefibrillatorVisuals.Ready, false);
return;
}
@@ -194,10 +195,11 @@ public sealed class DefibrillatorSystem : EntitySystem
return false;
_audio.PlayPvs(component.ChargeSound, uid);
return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
uid, target, uid)
{
BreakOnMove = user == target, // WD EDIT
BreakOnMove = user != target, // WD EDIT
DuplicateCondition = DuplicateConditions.None, // WD EDIT
BlockDuplicate = true,
BreakOnHandChange = true,