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

Another fixes and features (#392)

Browse Source 
* fix: doorlights supports emagging now + fix emergency light

* add todo to PointLightAirlockSystem.cs

* tweak: reduce captain armor size

* fix: fix wt550 magazine stored rotation

* add: new lobby songs

* fix: fix lobby music rotation
This commit is contained in:
ThereDrD0
2024-06-29 09:49:43 +03:00
committed by GitHub
parent ef4e2feba9
commit e9232e638c
42 changed files with 68 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Audio/ContentAudioSystem.cs
View File

@@ -1,4 +1,5 @@
using System.Linq;
using Content.Server._White.RealRoundEnded;
using Content.Server.GameTicking;
using Content.Server.GameTicking.Events;
using Content.Shared.Audio;
@@ -14,7 +15,7 @@ namespace Content.Server.Audio;
public sealed class ContentAudioSystem : SharedContentAudioSystem
{
[ValidatePrototypeId<SoundCollectionPrototype>]
private const string LobbyMusicCollection = "LobbyMusicWhite";
private const string LobbyMusicCollection = "LobbyMusicSongs";
[Dependency] private readonly AudioSystem _serverAudio = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!;
@@ -30,7 +31,7 @@ public sealed class ContentAudioSystem : SharedContentAudioSystem
_lobbyMusicCollection = _prototypeManager.Index<SoundCollectionPrototype>(LobbyMusicCollection);
_lobbyPlaylist = ShuffleLobbyPlaylist();
SubscribeLocalEvent<RoundEndMessageEvent>(OnRoundEnd);
SubscribeLocalEvent<RealRoundEndedEvent>(OnRoundEnd);
SubscribeLocalEvent<PlayerJoinedLobbyEvent>(OnPlayerJoinedLobby);
SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundCleanup);
SubscribeLocalEvent<RoundStartingEvent>(OnRoundStart);
@@ -64,7 +65,7 @@ public sealed class ContentAudioSystem : SharedContentAudioSystem
}
}
private void OnRoundEnd(RoundEndMessageEvent ev)
private void OnRoundEnd(RealRoundEndedEvent ev)
{
// The lobby song is set here instead of in RestartRound,
// because ShowRoundEndScoreboard triggers the start of the music playing