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

Fix grid-check audio volume (#6686)

Browse Source
This commit is contained in:
Leon Friedrich
2022-02-13 21:53:44 +13:00
committed by GitHub
parent 5ab4f4d9c9
commit 4540c03ba2
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/StationEvents/Events/PowerGridCheck.cs
View File

@@ -1,11 +1,7 @@
using System.Collections.Generic;
using System.Threading; using System.Threading;
using Content.Server.Power.Components; using Content.Server.Power.Components;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Random; using Robust.Shared.Random;
using Timer = Robust.Shared.Timing.Timer; using Timer = Robust.Shared.Timing.Timer;
@@ -68,7 +64,7 @@ namespace Content.Server.StationEvents.Events
_announceCancelToken = new CancellationTokenSource(); _announceCancelToken = new CancellationTokenSource();
Timer.Spawn(3000, () => Timer.Spawn(3000, () =>
{ {
SoundSystem.Play(Filter.Broadcast(), "/Audio/Announcements/power_on.ogg"); SoundSystem.Play(Filter.Broadcast(), "/Audio/Announcements/power_on.ogg", AudioParams);
}, _announceCancelToken.Token); }, _announceCancelToken.Token);
_powered.Clear(); _powered.Clear();

6
Content.Server/StationEvents/Events/StationEvent.cs
View File

@@ -58,6 +58,8 @@ namespace Content.Server.StationEvents.Events
/// </summary> /// </summary>
public virtual string? EndAudio { get; } = null; public virtual string? EndAudio { get; } = null;
public virtual AudioParams AudioParams { get; } = AudioParams.Default.WithVolume(-10f);
/// <summary> /// <summary>
/// In minutes, when is the first round time this event can start /// In minutes, when is the first round time this event can start
/// </summary> /// </summary>
@@ -135,7 +137,7 @@ namespace Content.Server.StationEvents.Events
if (StartAudio != null) if (StartAudio != null)
{ {
SoundSystem.Play(Filter.Broadcast(), StartAudio, AudioParams.Default.WithVolume(-10f)); SoundSystem.Play(Filter.Broadcast(), StartAudio, AudioParams);
} }
Announced = true; Announced = true;
@@ -158,7 +160,7 @@ namespace Content.Server.StationEvents.Events
if (EndAudio != null) if (EndAudio != null)
{ {
SoundSystem.Play(Filter.Broadcast(), EndAudio, AudioParams.Default.WithVolume(-10f)); SoundSystem.Play(Filter.Broadcast(), EndAudio, AudioParams);
} }
Started = false; Started = false;