Skip to content

Commit

Permalink
Replaces most lobby music with duke gneiss - adds about ~9 new tracks…
Browse files Browse the repository at this point in the history
…, converts lobby music to use pickweight, renames transit to its proper song (#4830)

* rgrg

* hnh

* i found the fucking thing
  • Loading branch information
nikothedude authored Nov 5, 2023
1 parent 7483b03 commit f60a83e
Show file tree
Hide file tree
Showing 24 changed files with 98 additions and 37 deletions.
36 changes: 20 additions & 16 deletions code/datums/lobbyscreen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,43 +18,47 @@
/datum/lobbyscreen/New()
if(!length(possibleMusic) || !image_file)
CRASH("Login screen setup is wrong.")
musicTrack = pick(possibleMusic)
musicTrack = pickweight(possibleMusic)
return ..()

/datum/lobbyscreen/ship
image_file = 'icons/title_screens/ship.png'
possibleMusic = list(
'sound/music/lobby/To_Eris-Almost_there.ogg',
'sound/music/lobby/Lobo_Loco-Technetium_Planet.ogg'
)

'sound/music/lobby/Duke_Gneiss-Bluespace.ogg' = 100,
'sound/music/lobby/Duke_Gneiss-Exploring.ogg' = 100,
'sound/music/lobby/Duke_Gneiss-Aether.ogg' = 50,
)

/datum/lobbyscreen/enroute
image_file = 'icons/title_screens/transit.png'
possibleMusic = list(
'sound/music/lobby/transit.ogg',
'sound/music/lobby/Grimbeard-Tubeworm_Instrumental.ogg'
)
'sound/music/lobby/ultra_deep_field.ogg' = 100,
'sound/music/lobby/Duke_Gneiss-Phoron_Industry.ogg' = 10,
'sound/music/lobby/Duke_Gneiss-Phoron_Leak.ogg' = 10,
)

/datum/lobbyscreen/ironhammer
image_file = 'icons/title_screens/ironhammer.png'
possibleMusic = list(
'sound/music/lobby/Nctrnm-Dos_Lagos.ogg',
'sound/music/lobby/Grimbeard-Tubeworm_Instrumental.ogg'
)

'sound/music/lobby/Duke_Gneiss-Metropolis.ogg' = 100,
'sound/music/lobby/Duke_Gneiss-Oxygen_Facility.ogg' = 40,
'sound/music/lobby/Duke_Gneiss-O.W.L..ogg' = 10,
'sound/music/lobby/Duke_Gneiss-The_Runner_in_motion.ogg' = 5,
)

/datum/lobbyscreen/onestar
image_file = 'icons/title_screens/onestar.png'
possibleMusic = list(
'sound/music/lobby/Grimbeard-The_Part_Where_You_Always_Leave.ogg',
'sound/music/lobby/Kevin_MacLeod-Impact_Prelude.ogg'
)
'sound/music/lobby/Duke_Gneiss-Downtown_2.ogg' = 100,
'sound/music/lobby/Duke_Gneiss-Codebrain.ogg' = 25,
)

/datum/lobbyscreen/neotheology
image_file = 'icons/title_screens/neotheology.png'
possibleMusic = list(
'sound/music/lobby/To_Eris-Almost_there.ogg')
'sound/music/lobby/Duke_Gneiss-Neotheology.ogg' = 100,
'sound/music/lobby/Duke_Gneiss-Creating_A_Shell.ogg' = 20
)

/datum/lobbyscreen/proc/play_music(client/C)
if(!musicTrack)
Expand Down
7 changes: 7 additions & 0 deletions code/datums/music_tracks/aether.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Taken graciously from duke gneiss (https://soundcloud.com/dukegneiss) under their very unrestrictive liscense of "just inform me"
/music_track/aether
artist = "Duke Gneiss"
title = "Aether"
song = 'sound/music/lobby/Duke_Gneiss-Aether.ogg'
url = "https://soundcloud.com/dukegneiss/aether"

44 changes: 40 additions & 4 deletions code/datums/music_tracks/ascention.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,62 @@
artist = "Duke Gneiss"
title = "Metropolis"
album = "Ascention"
song = 'sound/music/lobby/eris/Duke_Gneiss-Metropolis.ogg'
song = 'sound/music/lobby/Duke_Gneiss-Metropolis.ogg'
url = "https://soundcloud.com/dukegneiss/metropolis"

/music_track/codebrain //Track 3
artist = "Duke Gneiss"
title = "Codebrain"
album = "Ascention"
song = 'sound/music/lobby/Duke_Gneiss-Codebrain.ogg'
url = "https://soundcloud.com/dukegneiss/codebrain"

/music_track/owl //Track 6
artist = "Duke Gneiss"
title = "O.W.L."
album = "Ascention"
song = 'sound/music/lobby/Duke_Gneiss-O.W.L..ogg'
url = "https://soundcloud.com/dukegneiss/o-w-l"

/music_track/bluespace //Track 8
artist = "Duke Gneiss"
title = "Bluespace"
album = "Ascention"
song = 'sound/music/lobby/eris/Duke_Gneiss-Bluespace.ogg'
song = 'sound/music/lobby/Duke_Gneiss-Bluespace.ogg'
url = "https://soundcloud.com/dukegneiss/bluespace"

/music_track/exploring //Track 13
artist = "Duke Gneiss"
title = "Exploring"
album = "Ascention"
song = 'sound/music/lobby/eris/Duke_Gneiss-Exploring.ogg'
song = 'sound/music/lobby/Duke_Gneiss-Exploring.ogg'
url = "https://soundcloud.com/dukegneiss/exploring"

/music_track/oxygen_facility //Track 15
artist = "Duke Gneiss"
title = "Oxygen Facility"
album = "Ascention"
song = 'sound/music/lobby/Duke_Gneiss-Oxygen_Facility.ogg'
url = "https://soundcloud.com/dukegneiss/oxygen-facility"

// i love this song because it implies gneiss knew about ss13
/music_track/phoron_industry //Track 16
artist = "Duke Gneiss"
title = "Phoron Industry"
album = "Ascention"
song = 'sound/music/lobby/Duke_Gneiss-Phoron_Industry.ogg'
url = "https://soundcloud.com/dukegneiss/phoron-industry"

/music_track/phoron_leak //Track 17
artist = "Duke Gneiss"
title = "Phoron Leak"
album = "Ascention"
song = 'sound/music/lobby/Duke_Gneiss-Phoron_Leak.ogg'
url = "https://soundcloud.com/dukegneiss/phoron-leak"

/music_track/runner //Track 20
artist = "Duke Gneiss"
title = "The Runner in Motion"
album = "Ascention"
song = 'sound/music/lobby/eris/Duke_Gneiss-The_Runner_in_motion.ogg'
song = 'sound/music/lobby/Duke_Gneiss-The_Runner_in_motion.ogg'
url = "https://soundcloud.com/dukegneiss/quantums-escape-plan"
7 changes: 0 additions & 7 deletions code/datums/music_tracks/comet_haley.dm

This file was deleted.

4 changes: 3 additions & 1 deletion code/datums/music_tracks/downtown.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Taken graciously from duke gneiss (https://soundcloud.com/dukegneiss) under their very unrestrictive liscense of "just inform me"
/music_track/downtown
artist = "Duke Gneiss"
title = "Downtown 2"
song = 'sound/music/lobby/eris/Duke_Gneiss-Downtown_2.ogg'
song = 'sound/music/lobby/Duke_Gneiss-Downtown_2.ogg'
url = "https://www.youtube.com/watch?v=x9FdMJJYqmU"
3 changes: 2 additions & 1 deletion code/datums/music_tracks/neotheology.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Taken graciously from duke gneiss (https://soundcloud.com/dukegneiss) under their very unrestrictive liscense of "just inform me"
/music_track/neotheology
artist = "Duke Gneiss"
title = "Neotheology"
song = 'sound/music/lobby/eris/Duke_Gneiss-Neotheology.ogg'
song = 'sound/music/lobby/Duke_Gneiss-Neotheology.ogg'
url = "https://www.youtube.com/watch?v=Opr9uLrlYtg"
9 changes: 2 additions & 7 deletions code/datums/music_tracks/sojourn.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*Sojourn's main lobby music - organized into one file for simplicity and easy creditation.
/*Sojourn's main lobby music - organized into one file for simplicity and easy creditation.
Various copyright free songs found using Free Music Archives, protected under cc 3.0.*/

/music_track/almostthere
Expand Down Expand Up @@ -31,11 +31,6 @@ Various copyright free songs found using Free Music Archives, protected under cc
song = 'sound/music/lobby/Nctrnm-Dos_Lagos.ogg'
url = "https://freemusicarchive.org/music/40nctrnm4/Dos_Lagos_-_Single/NctrnmDosLagos111Eb/"

//I have no idea where we got this track from. Someone plug this in when you find out - I don't know why we've had this nearly two years with no creditation.
/music_track/transit
song = 'sound/music/lobby/transit.ogg'


//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////


Expand All @@ -52,4 +47,4 @@ url = "https://soundcloud.com/thousandface/tubeworm-instrumental"
artist = "GimbeardX"
title = "The Part Where You Always Leave"
song = 'sound/music/lobby/Grimbeard-The_Part_Where_You_Always_Leave.ogg'
url = "https://soundcloud.com/thousandface/the-part-where-you-always-leave"
url = "https://soundcloud.com/thousandface/the-part-where-you-always-leave"
15 changes: 15 additions & 0 deletions code/datums/music_tracks/stellardrone.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/music_track/comet_haley
artist = "Stellardrone"
title = "Comet Halley"
album = "Light Years"
song = 'sound/music/comet_haley.ogg'
licence = /decl/licence/cc_by_3_0
url = "http://freemusicarchive.org/music/Stellardrone/Light_Years_1227/07_Comet_Halley"

/music_track/ultra_deep_field
artist = "Stellardrone"
title = "Ultra Deep Field"
album = "Light Years"
song = 'sound/music/lobby/ultra_deep_field.ogg'
licence = /decl/licence/cc_by_3_0
url = "https://freemusicarchive.org/music/Stellardrone/Light_Years_1227/08_Ultra_Deep_Field/"
6 changes: 6 additions & 0 deletions code/datums/music_tracks/synapses.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/music_track/creating_a_shell //Track 3
artist = "Duke Gneiss"
title = "Creating a Shell"
album = "Synapses"
song = 'sound/music/lobby/Duke_Gneiss-Creating_A_Shell.ogg'
url = "https://soundcloud.com/dukegneiss/creating-a-shell"
4 changes: 3 additions & 1 deletion sojourn-station.dme
Original file line number Diff line number Diff line change
Expand Up @@ -391,13 +391,15 @@
#include "code\datums\movement\robot.dm"
#include "code\datums\movement\~defines.dm"
#include "code\datums\music_tracks\_music_track.dm"
#include "code\datums\music_tracks\aether.dm"
#include "code\datums\music_tracks\ascention.dm"
#include "code\datums\music_tracks\comet_haley.dm"
#include "code\datums\music_tracks\downtown.dm"
#include "code\datums\music_tracks\elevator.dm"
#include "code\datums\music_tracks\europa.dm"
#include "code\datums\music_tracks\marhaba.dm"
#include "code\datums\music_tracks\neotheology.dm"
#include "code\datums\music_tracks\stellardrone.dm"
#include "code\datums\music_tracks\synapses.dm"
#include "code\datums\objective\abduct.dm"
#include "code\datums\objective\assassinate.dm"
#include "code\datums\objective\assassinate_marshal.dm"
Expand Down
Binary file added sound/music/lobby/Duke_Gneiss-Aether.ogg
Binary file not shown.
File renamed without changes.
Binary file added sound/music/lobby/Duke_Gneiss-Codebrain.ogg
Binary file not shown.
Binary file not shown.
File renamed without changes.
Binary file added sound/music/lobby/Duke_Gneiss-O.W.L..ogg
Binary file not shown.
Binary file added sound/music/lobby/Duke_Gneiss-Oxygen_Facility.ogg
Binary file not shown.
Binary file added sound/music/lobby/Duke_Gneiss-Phoron_Industry.ogg
Binary file not shown.
Binary file added sound/music/lobby/Duke_Gneiss-Phoron_Leak.ogg
Binary file not shown.
File renamed without changes.

0 comments on commit f60a83e

Please sign in to comment.