Skip to content

Commit

Permalink
Added a bunch of music files from Europa.
Browse files Browse the repository at this point in the history
  • Loading branch information
MistakeNot4892 committed Sep 15, 2018
1 parent 8f6134e commit 39cf093
Show file tree
Hide file tree
Showing 15 changed files with 84 additions and 4 deletions.
1 change: 1 addition & 0 deletions baystation12.dme
Expand Up @@ -279,6 +279,7 @@
#include "code\datums\music_tracks\elevator.dm"
#include "code\datums\music_tracks\elibao.dm"
#include "code\datums\music_tracks\endless_space.dm"
#include "code\datums\music_tracks\europa.dm"
#include "code\datums\music_tracks\floating.dm"
#include "code\datums\music_tracks\human.dm"
#include "code\datums\music_tracks\lasers.dm"
Expand Down
10 changes: 9 additions & 1 deletion code/_global_vars/lists/flavor.dm
Expand Up @@ -103,7 +103,15 @@ GLOBAL_LIST_INIT(music_tracks, list(
"Treacherous Voyage" = /music_track/treacherous_voyage,
"Wake" = /music_track/wake,
"phoron will make us rich" = /music_track/pwmur,
"every light is blinking at once" = /music_track/elibao
"every light is blinking at once" = /music_track/elibao,
"In Orbit" = /music_track/inorbit,
"Martian Cowboy" = /music_track/martiancowboy,
"Monument" = /music_track/monument,
"As Far As It Gets" = /music_track/asfarasitgets,
"80s All Over Again" = /music_track/eighties,
"Wild Encounters" = /music_track/wildencounters,
"Torn" = /music_track/torn,
"Nebula" = /music_track/nebula
))

/proc/setup_music_tracks(var/list/tracks)
Expand Down
8 changes: 8 additions & 0 deletions code/datums/licences/license.dm
Expand Up @@ -7,6 +7,14 @@
name = "CC BY 3.0"
url = "https://creativecommons.org/licenses/by/3.0/"

/decl/license/cc_by_4_0
name = "CC BY 4.0"
url = "https://creativecommons.org/licenses/by/4.0/"

/decl/license/cc_by_sa_4_0
name = "CC BY-SA 4.0"
url = "https://creativecommons.org/licenses/by-sa/4.0/"

/decl/license/cc_by_nc_3_0
name = "CC BY-BC 3.0"
url = "https://creativecommons.org/licenses/by-nc/3.0/"
Expand Down
55 changes: 55 additions & 0 deletions code/datums/music_tracks/europa.dm
@@ -0,0 +1,55 @@
/music_track/inorbit
artist = "Chronox"
title = "In Orbit"
song = 'sound/music/europa/Chronox_-_03_-_In_Orbit.ogg'
license = /decl/license/cc_by_4_0
url = "freemusicarchive.org/music/Chronox_2/Voyager/Chronox_-_02_-_In_Orbit"

/music_track/martiancowboy
artist = "Kevin MacLeod"
title = "Martian Cowboy"
song = 'sound/music/europa/Martian Cowboy.ogg'
license = /decl/license/cc_by_3_0
url = "https://incompetech.com/music/royalty-free/index.html?isrc=usuan1100349"

/music_track/monument
artist = "Six Umbrellas"
title = "Monument"
song = 'sound/music/europa/Six_Umbrellas_-_05_-_Monument.ogg'
license = /decl/license/cc_by_sa_4_0
url = "https://sixumbrellas.bandcamp.com/album/the-psychedelic-and"

/music_track/asfarasitgets
artist = "A Drop A Day"
title = "As Far As It Gets"
song = 'sound/music/europa/asfarasitgets.ogg'
license = /decl/license/cc_by_sa_4_0
url = "https://ghyti.bandcamp.com/"

/music_track/eighties
artist = "A Drop A Day"
title = "80s All Over Again"
song = 'sound/music/europa/80salloveragain.ogg'
license = /decl/license/cc_by_sa_4_0
url = "https://ghyti.bandcamp.com/"

/music_track/wildencounters
artist = "A Drop A Day"
title = "Wild Encounters"
song = 'sound/music/europa/WildEncounters.ogg'
license = /decl/license/cc_by_sa_4_0
url = "https://ghyti.bandcamp.com/"

/music_track/torn
artist = "Macamoto"
title = "Torn"
song = 'sound/music/europa/Macamoto_-_05_-_Torn.ogg'
license = /decl/license/cc_by_nc_sa_3_0
url = "https://macamoto.bandcamp.com/track/torn"

/music_track/nebula
artist = "Pulse Emitter"
title = "Nebula"
song = 'sound/music/europa/Pulse_Emitter_-_04_-_Nebula.ogg'
license = /decl/license/cc_by_nc_sa_3_0
url = "https://pulseemitter.bandcamp.com/track/nebula"
3 changes: 2 additions & 1 deletion code/game/movietitles.dm
Expand Up @@ -26,7 +26,8 @@ client
if(mob.get_preference_value(/datum/client_preference/play_lobby_music) == GLOB.PREF_YES)
sound_to(mob, sound(null, channel = GLOB.lobby_sound_channel))
if(GLOB.end_credits_song == null)
sound_to(mob, sound('sound/music/THUNDERDOME.ogg', wait = 0, volume = 40, channel = GLOB.lobby_sound_channel))
var/title_song = pick('sound/music/THUNDERDOME.ogg', 'sound/music/europa/Chronox_-_03_-_In_Orbit.ogg', 'sound/music/europa/asfarasitgets.ogg')
sound_to(mob, sound(title_song, wait = 0, volume = 40, channel = GLOB.lobby_sound_channel))
else if(get_preference_value(/datum/client_preference/play_admin_midis) == GLOB.PREF_YES)
sound_to(mob, sound(GLOB.end_credits_song, wait = 0, volume = 40, channel = GLOB.lobby_sound_channel))
sleep(50)
Expand Down
2 changes: 1 addition & 1 deletion maps/torch/torch_holodecks.dm
Expand Up @@ -6,7 +6,7 @@
"boxingcourt" = new/datum/holodeck_program(/area/holodeck/source_boxingcourt, list('sound/music/THUNDERDOME.ogg')),
"basketball" = new/datum/holodeck_program(/area/holodeck/source_basketball, list('sound/music/THUNDERDOME.ogg')),
"thunderdomecourt" = new/datum/holodeck_program(/area/holodeck/source_thunderdomecourt, list('sound/music/THUNDERDOME.ogg')),
"beach" = new/datum/holodeck_program(/area/holodeck/source_beach),
"beach" = new/datum/holodeck_program(/area/holodeck/source_beach, list('sound/music/europa/WildEncounters.ogg')),
"desert" = new/datum/holodeck_program(/area/holodeck/source_desert,
list(
'sound/effects/wind/wind_2_1.ogg',
Expand Down
9 changes: 8 additions & 1 deletion maps/torch/torch_lobby.dm
Expand Up @@ -9,4 +9,11 @@
/music_track/treacherous_voyage,
/music_track/comet_haley,
/music_track/lysendraa,
/music_track/lasers)
/music_track/lasers,
/music_track/martiancowboy,
/music_track/monument,
/music_track/asfarasitgets,
/music_track/eighties,
/music_track/torn,
/music_track/nebula
)
Binary file added sound/music/europa/80salloveragain.ogg
Binary file not shown.
Binary file added sound/music/europa/Chronox_-_03_-_In_Orbit.ogg
Binary file not shown.
Binary file added sound/music/europa/Macamoto_-_05_-_Torn.ogg
Binary file not shown.
Binary file added sound/music/europa/Martian Cowboy.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added sound/music/europa/WildEncounters.ogg
Binary file not shown.
Binary file added sound/music/europa/asfarasitgets.ogg
Binary file not shown.

0 comments on commit 39cf093

Please sign in to comment.