From a0cbdc0ee47d4de71e9f7e2651a038964b881df7 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 15 Jan 2025 00:04:30 -0500 Subject: [PATCH] Update AssayPowerSystem.cs --- .../Abilities/Psionics/Abilities/AssayPowerSystem.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Content.Server/Abilities/Psionics/Abilities/AssayPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/AssayPowerSystem.cs index 4fe08f303ce..514196e55df 100644 --- a/Content.Server/Abilities/Psionics/Abilities/AssayPowerSystem.cs +++ b/Content.Server/Abilities/Psionics/Abilities/AssayPowerSystem.cs @@ -40,16 +40,19 @@ private void OnPowerUsed(EntityUid uid, PsionicComponent psionic, AssayPowerActi return; var ev = new AssayDoAfterEvent(_gameTiming.CurTime, args.FontSize, args.FontColor); - _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.Performer, args.UseDelay - TimeSpan.FromSeconds(psionic.CurrentAmplification), ev, args.Performer, args.Target, args.Performer) + var doAfterArgs = new DoAfterArgs(EntityManager, args.Performer, args.UseDelay - TimeSpan.FromSeconds(psionic.CurrentAmplification), ev, args.Performer, args.Target, args.Performer) { BlockDuplicate = true, BreakOnMove = true, BreakOnDamage = true, - }, out var doAfterId); + }; + + if (!_doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId)) + return; + psionic.DoAfter = doAfterId; _popups.PopupEntity(Loc.GetString(args.PopupTarget, ("entity", args.Target)), args.Performer, PopupType.Medium); - _audioSystem.PlayPvs(args.SoundUse, args.Performer, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f)); _psionics.LogPowerUsed(args.Performer, args.PowerName, args.MinGlimmer, args.MaxGlimmer); args.Handled = true;