tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix riot shield audio and popup spam (#21881)

Browse Source
This commit is contained in:
themias
2023-11-28 02:06:38 -05:00
committed by GitHub
parent 79c59a48d7
commit ed2d59aa19
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Blocking/BlockingSystem.User.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.Damage;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
@@ -44,6 +44,9 @@ public sealed partial class BlockingSystem
{
if (TryComp<BlockingComponent>(component.BlockingItem, out var blocking))
{
if (args.Damage.GetTotal() <= 0)
return;
var blockFraction = blocking.IsBlocking ? blocking.ActiveBlockFraction : blocking.PassiveBlockFraction;
blockFraction = Math.Clamp(blockFraction, 0, 1);
_damageable.TryChangeDamage(component.BlockingItem, blockFraction * args.OriginalDamage);