mirror of
https://github.com/DeltaV-Station/Delta-v.git
synced 2026-09-29 23:57:29 +00:00
Nuke/CosCult Global Music and SFX (#5918)
* Extended ServerGlobalSoundSystem and exposed its lies. Now its actually global. * Fixed Epsilon event rule namespacing and formatting. * Cosmic Cult Music Updates * Few more CosCult changes. * Nuke and Alert Changes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update Content.Server/_DV/CosmicCult/EntitySystems/CosmicChantrySystem.cs Co-authored-by: Sir Warock <67167466+SirWarock@users.noreply.github.com> Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> * Update Content.Server/_DV/Audio/ServerGlobalSoundSystem.cs Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> --------- Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
This commit is contained in:
co-authored by
Sir Warock
pre-commit-ci[bot]
parent
e7fe4865de
commit
652e52dbca
@@ -6,6 +6,7 @@ using Robust.Shared.Audio;
|
||||
using Robust.Shared.Audio.Systems;
|
||||
using Robust.Shared.Configuration;
|
||||
using Robust.Shared.Prototypes;
|
||||
using Robust.Shared.Player; // DeltaV
|
||||
|
||||
namespace Content.Server.AlertLevel;
|
||||
|
||||
@@ -191,7 +192,8 @@ public sealed class AlertLevelSystem : EntitySystem
|
||||
{
|
||||
if (detail.Sound != null)
|
||||
{
|
||||
var filter = _stationSystem.GetInOwningStation(station);
|
||||
//var filter = _stationSystem.GetInOwningStation(station); // DeltaV - Global Annoucements
|
||||
var filter = Filter.Empty().AddAllPlayers(); // DeltaV - Global Annoucements
|
||||
_audio.PlayGlobal(detail.Sound, filter, true, detail.Sound.Params);
|
||||
}
|
||||
else
|
||||
@@ -202,7 +204,7 @@ public sealed class AlertLevelSystem : EntitySystem
|
||||
|
||||
if (announce)
|
||||
{
|
||||
_chatSystem.DispatchStationAnnouncement(station, announcementFull, playDefaultSound: playDefault,
|
||||
_chatSystem.DispatchGlobalAnnouncement(announcementFull, playSound: playDefault, // DeltaV - Global Annoucements
|
||||
colorOverride: detail.Color, sender: stationName);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user