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

Revert "Update submodule to 175.0.0 (#21318)" (#21319)

Browse Source
This commit is contained in:
metalgearsloth
2023-10-29 15:29:30 +11:00
committed by GitHub
parent 4f6ea2aef6
commit 5b8f3c48c4
327 changed files with 437 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
namespace Content.Shared.Blocking;
@@ -52,7 +51,7 @@ public sealed partial class BlockingSystem
if (blocking.IsBlocking)
{
_audio.PlayPvs(blocking.BlockSound, uid);
_audio.PlayPvs(blocking.BlockSound, uid, AudioParams.Default.WithVariation(0.2f));
}
}
}

7
Content.Shared/Blocking/Components/BlockingComponent.cs
View File

@@ -57,11 +57,8 @@ public sealed partial class BlockingComponent : Component
/// <summary>
/// The sound to be played when you get hit while actively blocking
/// </summary>
[DataField("blockSound")] public SoundSpecifier BlockSound =
new SoundPathSpecifier("/Audio/Weapons/block_metal1.ogg")
{
Params = AudioParams.Default.WithVariation(0.25f)
};
[DataField("blockSound")]
public SoundSpecifier BlockSound = new SoundPathSpecifier("/Audio/Weapons/block_metal1.ogg");
/// <summary>
/// Fraction of original damage shield will take instead of user