diff --git a/Content.Server/Audio/ContentAudioSystem.cs b/Content.Server/Audio/ContentAudioSystem.cs index f36d14cbaf..4109263e03 100644 --- a/Content.Server/Audio/ContentAudioSystem.cs +++ b/Content.Server/Audio/ContentAudioSystem.cs @@ -14,7 +14,7 @@ namespace Content.Server.Audio; public sealed class ContentAudioSystem : SharedContentAudioSystem { [ValidatePrototypeId] - private const string LobbyMusicCollection = "LobbyMusic"; + private const string LobbyMusicCollection = "WhiteLobbyMusic"; // WD EDIT [Dependency] private readonly AudioSystem _serverAudio = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!; diff --git a/Resources/Audio/_White/Lobby/all-that-I-can-see.ogg b/Resources/Audio/_White/Lobby/all-that-I-can-see.ogg new file mode 100644 index 0000000000..01d8974015 Binary files /dev/null and b/Resources/Audio/_White/Lobby/all-that-I-can-see.ogg differ diff --git a/Resources/Audio/_White/Lobby/atomicamnesiammx.ogg b/Resources/Audio/_White/Lobby/atomicamnesiammx.ogg new file mode 100644 index 0000000000..ab36bf8743 Binary files /dev/null and b/Resources/Audio/_White/Lobby/atomicamnesiammx.ogg differ diff --git a/Resources/Audio/_White/Lobby/attributions.yml b/Resources/Audio/_White/Lobby/attributions.yml new file mode 100644 index 0000000000..0c8e310bf0 --- /dev/null +++ b/Resources/Audio/_White/Lobby/attributions.yml @@ -0,0 +1,79 @@ +- files: ["all-that-I-can-see.ogg"] + 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: "https://youtu.be/Hz6KO0gnrS8" \ No newline at end of file diff --git a/Resources/Audio/_White/Lobby/circles-around-the-sun.ogg b/Resources/Audio/_White/Lobby/circles-around-the-sun.ogg new file mode 100644 index 0000000000..35fbddcc70 Binary files /dev/null and b/Resources/Audio/_White/Lobby/circles-around-the-sun.ogg differ diff --git a/Resources/Audio/_White/Lobby/comet_haley.ogg b/Resources/Audio/_White/Lobby/comet_haley.ogg new file mode 100644 index 0000000000..fe5e52138d Binary files /dev/null and b/Resources/Audio/_White/Lobby/comet_haley.ogg differ diff --git a/Resources/Audio/_White/Lobby/endless_space.ogg b/Resources/Audio/_White/Lobby/endless_space.ogg new file mode 100644 index 0000000000..8325f05c5b Binary files /dev/null and b/Resources/Audio/_White/Lobby/endless_space.ogg differ diff --git a/Resources/Audio/_White/Lobby/every_light_is_blinking_at_once.ogg b/Resources/Audio/_White/Lobby/every_light_is_blinking_at_once.ogg new file mode 100644 index 0000000000..d5a14dae1d Binary files /dev/null and b/Resources/Audio/_White/Lobby/every_light_is_blinking_at_once.ogg differ diff --git a/Resources/Audio/_White/Lobby/lasers_rip_apart_the_bulkhead.ogg b/Resources/Audio/_White/Lobby/lasers_rip_apart_the_bulkhead.ogg new file mode 100644 index 0000000000..47eae7ef06 Binary files /dev/null and b/Resources/Audio/_White/Lobby/lasers_rip_apart_the_bulkhead.ogg differ diff --git a/Resources/Audio/_White/Lobby/level!.ogg b/Resources/Audio/_White/Lobby/level!.ogg new file mode 100644 index 0000000000..3b42ada880 Binary files /dev/null and b/Resources/Audio/_White/Lobby/level!.ogg differ diff --git a/Resources/Audio/_White/Lobby/marhaba.ogg b/Resources/Audio/_White/Lobby/marhaba.ogg new file mode 100644 index 0000000000..7aa5902f15 Binary files /dev/null and b/Resources/Audio/_White/Lobby/marhaba.ogg differ diff --git a/Resources/Audio/_White/Lobby/mod.flip-flap.ogg b/Resources/Audio/_White/Lobby/mod.flip-flap.ogg new file mode 100644 index 0000000000..dd582c564f Binary files /dev/null and b/Resources/Audio/_White/Lobby/mod.flip-flap.ogg differ diff --git a/Resources/Audio/_White/Lobby/monument.ogg b/Resources/Audio/_White/Lobby/monument.ogg new file mode 100644 index 0000000000..f27554f57f Binary files /dev/null and b/Resources/Audio/_White/Lobby/monument.ogg differ diff --git a/Resources/Audio/_White/Lobby/singuloose.ogg b/Resources/Audio/_White/Lobby/singuloose.ogg new file mode 100644 index 0000000000..8e6871831e Binary files /dev/null and b/Resources/Audio/_White/Lobby/singuloose.ogg differ diff --git a/Resources/Audio/_White/Lobby/space-oddity.ogg b/Resources/Audio/_White/Lobby/space-oddity.ogg new file mode 100644 index 0000000000..1823e16c2d Binary files /dev/null and b/Resources/Audio/_White/Lobby/space-oddity.ogg differ diff --git a/Resources/Audio/_White/Lobby/space-shuttle.ogg b/Resources/Audio/_White/Lobby/space-shuttle.ogg new file mode 100644 index 0000000000..fb84a6dac5 Binary files /dev/null and b/Resources/Audio/_White/Lobby/space-shuttle.ogg differ diff --git a/Resources/Audio/_White/Lobby/space_asshole.ogg b/Resources/Audio/_White/Lobby/space_asshole.ogg new file mode 100644 index 0000000000..1821c26c09 Binary files /dev/null and b/Resources/Audio/_White/Lobby/space_asshole.ogg differ diff --git a/Resources/Audio/_White/Lobby/spaced.ogg b/Resources/Audio/_White/Lobby/spaced.ogg new file mode 100644 index 0000000000..cf1a52463a Binary files /dev/null and b/Resources/Audio/_White/Lobby/spaced.ogg differ diff --git a/Resources/Audio/_White/Lobby/title3.ogg b/Resources/Audio/_White/Lobby/title3.ogg new file mode 100644 index 0000000000..b448307dc4 Binary files /dev/null and b/Resources/Audio/_White/Lobby/title3.ogg differ diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index 8b9e286066..353ee8e215 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/_White/SoundCollections/lobby.yml b/Resources/Prototypes/_White/SoundCollections/lobby.yml new file mode 100644 index 0000000000..64077d1957 --- /dev/null +++ b/Resources/Prototypes/_White/SoundCollections/lobby.yml @@ -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 \ No newline at end of file