Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature] New Lobby Music #155

Merged
merged 5 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Server/Audio/ContentAudioSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Content.Server.Audio;
public sealed class ContentAudioSystem : SharedContentAudioSystem
{
[ValidatePrototypeId<SoundCollectionPrototype>]
private const string LobbyMusicCollection = "LobbyMusic";
private const string LobbyMusicCollection = "WhiteLobbyMusic"; // WD EDIT

[Dependency] private readonly AudioSystem _serverAudio = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!;
Expand Down
Binary file not shown.
Binary file added Resources/Audio/_White/Lobby/atomicamnesiammx.ogg
Binary file not shown.
79 changes: 79 additions & 0 deletions Resources/Audio/_White/Lobby/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
- files: ["all-that-I-can-see.ogg"]

Check failure on line 1 in Resources/Audio/_White/Lobby/attributions.yml

View workflow job for this annotation

GitHub Actions / YAML RGA schema validator

[/Resources/Audio/_White/Lobby/attributions.yml] 15.source: 'youtu.be/Hz6KO0gnrS8' is not a url.
license: "CC-BY-NC-SA-3.0"
copyright: "All that i can see by Эдипов Комплекс"
source: "https://www.youtube.com/watch?v=LFXo1XN6xc8&ysclid=m4k6j9v59l684837129"

- files: ["atomicamnesiammx.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Atomic Amnesia MMX by Phillip Dyer"
source: "https://soundcloud.com/3kliksphilip/atomic-amnesia-mmx-1"

- files: ["circles-around-the-sun.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Circles Around The Sun by Dispatch"
source: "https://www.youtube.com/watch?v=V2V8sdbyrAI"

- files: ["comet_haley.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Comet Halley by Stellardrone"
source: "https://freemusicarchive.org/music/Stellardrone/Light_Years_1227/07_Comet_Halley"

- files: ["endless_space.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Endless Space Expanded by Solus"
source: "https://www.newgrounds.com/audio/listen/74946"

- files: ["every_light_is_blinking_at_once.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Lasers rip apart by Sunbeamstress"
source: "https://soundcloud.com/sunbeamstress/lasers-rip-apart-the-bulkhead"

- files: ["level!.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Level! by DapperHusky"
source: "https://www.newgrounds.com/audio/listen/1215730"

- files: ["marhaba.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Marhaba by Ian Alex Mac."
source: "https://freemusicarchive.org/music/Ian_Alex_Mac/Cues/Marhaba"

- files: ["mod.flip-flap.ogg"]
license: "Custom"
copyright: "Flip Flap by X-ceed is licensed under a short but clear license (see flip-flap.txt in Audio/Lobby) and is free for non-commercial use. Converted to mono OGG."
source: "http://aminet.net/package/mods/xceed/Flipflap"

- files: ["monument.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Monument by Six Umbrellas."
source: "https://sixumbrellas.bandcamp.com/album/the-psychedelic-and"

- files: ["singuloose.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Singuloose by Janis Schiedková."
source: "https://youtu.be/k3nLcQOKA8E"

- files: ["space_asshole.ogg"]
license: "Custom"
copyright: "Space Asshole by Chris Remo is used with special permission from the author, under the condition that the project remains non-commercial and open source. The author also requested that a link to his bandcamp be included: https://chrisremo.bandcamp.com/."
source: "https://idlethumbs.bandcamp.com/track/space-asshole"

- files: ["spaced.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Spaced by pinkblossom6"
source: "https://youtu.be/rW86xYFmcVs?si=-UhlsL7qYvvV7Kjv"

- files: ["space-oddity.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Space Oddity by Chris Hadfield"
source: "https://youtu.be/KaOC9danxNo"

- files: ["space-shuttle.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Space Shuttle by Эдипов Комплекс"
source: "https://youtu.be/aOFjbkAHEGg"

- files: ["title3.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Tintin on the Moon by Jeroen Tel"
source: "youtu.be/Hz6KO0gnrS8"
Spatison marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file added Resources/Audio/_White/Lobby/comet_haley.ogg
Binary file not shown.
Binary file added Resources/Audio/_White/Lobby/endless_space.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/_White/Lobby/level!.ogg
Binary file not shown.
Binary file added Resources/Audio/_White/Lobby/marhaba.ogg
Binary file not shown.
Binary file added Resources/Audio/_White/Lobby/mod.flip-flap.ogg
Binary file not shown.
Binary file added Resources/Audio/_White/Lobby/monument.ogg
Binary file not shown.
Binary file added Resources/Audio/_White/Lobby/singuloose.ogg
Binary file not shown.
Binary file added Resources/Audio/_White/Lobby/space-oddity.ogg
Binary file not shown.
Binary file added Resources/Audio/_White/Lobby/space-shuttle.ogg
Binary file not shown.
Binary file added Resources/Audio/_White/Lobby/space_asshole.ogg
Binary file not shown.
Binary file added Resources/Audio/_White/Lobby/spaced.ogg
Binary file not shown.
Binary file added Resources/Audio/_White/Lobby/title3.ogg
Binary file not shown.
2 changes: 1 addition & 1 deletion Resources/Prototypes/SoundCollections/lobby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
- /Audio/Lobby/every_light_is_blinking_at_once.ogg
- /Audio/Lobby/DOS=HIGH,_UMB.ogg
- /Audio/Lobby/atomicamnesiammx.ogg
- /Audio/Lobby/Monument.ogg
- /Audio/Lobby/Monument.ogg
20 changes: 20 additions & 0 deletions Resources/Prototypes/_White/SoundCollections/lobby.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
- type: soundCollection
id: WhiteLobbyMusic
files:
- /Audio/_White/Lobby/all-that-I-can-see.ogg
- /Audio/_White/Lobby/atomicamnesiammx.ogg
- /Audio/_White/Lobby/circles-around-the-sun.ogg
- /Audio/_White/Lobby/comet_haley.ogg
- /Audio/_White/Lobby/endless_space.ogg
- /Audio/_White/Lobby/every_light_is_blinking_at_once.ogg
- /Audio/_White/Lobby/lasers_rip_apart_the_bulkhead.ogg
- /Audio/_White/Lobby/level!.ogg
- /Audio/_White/Lobby/marhaba.ogg
- /Audio/_White/Lobby/mod.flip-flap.ogg
- /Audio/_White/Lobby/monument.ogg
- /Audio/_White/Lobby/singuloose.ogg
- /Audio/_White/Lobby/space_asshole.ogg
- /Audio/_White/Lobby/spaced.ogg
- /Audio/_White/Lobby/space-oddity.ogg
- /Audio/_White/Lobby/space-shuttle.ogg
- /Audio/_White/Lobby/title3.ogg
Loading