]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Title2 (#24254)
authorEmisse <99158783+Emisse@users.noreply.github.com>
Fri, 19 Jan 2024 02:47:19 +0000 (19:47 -0700)
committerGitHub <noreply@github.com>
Fri, 19 Jan 2024 02:47:19 +0000 (13:47 +1100)
* title2

* Update lobby.yml

* Update attributions.yml

* real

Resources/Audio/Lobby/attributions.yml
Resources/Audio/Lobby/title2.ogg [new file with mode: 0644]
Resources/Prototypes/SoundCollections/lobby.yml

index ff30ef98e40da661b16b6b93232692b62d183032..c2dbd80d731f2e1acc3f88b44ca16ad4ef5f88dc 100644 (file)
   copyright: "Vibe Ace by Kevin MacLeod. Converted from MP3 to OGG."
   source: "https://freemusicarchive.org/music/Kevin_MacLeod/Jazz_Sampler/Vibe_Ace"
 
+- files: ["title2.ogg"]
+  license: "Custom"
+  copyright: "Originally composed by Jonathan Dunn for Robocop 2 Gameboy published by Ocean Software. Remixed by Eric Shumaker for his video Dilbert 3. As of October 9th, 2008 nobody owns the rights to this song and copyright action has never been taken against anyone using this song in their projects."
+  source: "https://www.youtube.com/watch?v=4o6_8Unj2mQ"
+
 - files: ["title3.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "Title3 by Cuboos. It is a remix of the song 'Tintin on the Moon'. Converted from MP3 to OGG."
diff --git a/Resources/Audio/Lobby/title2.ogg b/Resources/Audio/Lobby/title2.ogg
new file mode 100644 (file)
index 0000000..ae36089
Binary files /dev/null and b/Resources/Audio/Lobby/title2.ogg differ
index ae3b2910b8aafae8e6e770537f0311ad906f61f6..56cad93ef2c68617efd11da308fe1a8250f9b165 100644 (file)
@@ -9,6 +9,7 @@
     - /Audio/Lobby/singuloose.ogg
     - /Audio/Lobby/comet_haley.ogg
     - /Audio/Lobby/marhaba.ogg
+    - /Audio/Lobby/title2.ogg
     - /Audio/Lobby/title3.ogg
     - /Audio/Lobby/mod.flip-flap.ogg
     - /Audio/Lobby/Monument.ogg