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

Add gatherable break sounds (#19360)

Browse Source
This commit is contained in:
metalgearsloth
2023-08-21 07:05:43 +10:00
committed by GitHub
parent 3fb9624bf3
commit d7abbab082
10 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Audio/SharedContentAudioSystem.cs
View File

@@ -6,6 +6,11 @@ public abstract class SharedContentAudioSystem : EntitySystem
{
[Dependency] private readonly SharedAudioSystem _audio = default!;
/// <summary>
/// Standard variation to use for sounds.
/// </summary>
public const float DefaultVariation = 0.05f;
public override void Initialize()
{
base.Initialize();

7
Content.Shared/Fluids/AbsorbentComponent.cs
View File

@@ -1,3 +1,4 @@
using Content.Shared.Audio;
using Content.Shared.FixedPoint;
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
@@ -23,18 +24,18 @@ public sealed class AbsorbentComponent : Component
[DataField("pickupSound")]
public SoundSpecifier PickupSound = new SoundPathSpecifier("/Audio/Effects/Fluids/watersplash.ogg")
{
Params = AudioParams.Default.WithVariation(0.05f),
Params = AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation),
};
[DataField("transferSound")] public SoundSpecifier TransferSound =
new SoundPathSpecifier("/Audio/Effects/Fluids/slosh.ogg")
{
Params = AudioParams.Default.WithVariation(0.05f).WithVolume(-3f),
Params = AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-3f),
};
public static readonly SoundSpecifier DefaultTransferSound =
new SoundPathSpecifier("/Audio/Effects/Fluids/slosh.ogg")
{
Params = AudioParams.Default.WithVariation(0.05f).WithVolume(-3f),
Params = AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-3f),
};
}

3
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
View File

@@ -1,6 +1,7 @@
using System.Diagnostics.CodeAnalysis;
using Content.Shared.Actions;
using Content.Shared.Administration.Logs;
using Content.Shared.Audio;
using Content.Shared.CombatMode;
using Content.Shared.Containers.ItemSlots;
using Content.Shared.Damage;
@@ -403,7 +404,7 @@ public abstract partial class SharedGunSystem : EntitySystem
}
if (playSound && TryComp<CartridgeAmmoComponent>(entity, out var cartridge))
{
Audio.PlayPvs(cartridge.EjectSound, entity, AudioParams.Default.WithVariation(0.05f).WithVolume(-1f));
Audio.PlayPvs(cartridge.EjectSound, entity, AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-1f));
}
}