diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index f7490501f0b..587b50b6a05 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -16,7 +16,6 @@ var/global/datum/controller/gameticker/ticker var/event_time = null var/event = 0 - var/login_music // music played in pregame lobby var/list/datum/mind/minds = list()//The people in the game. Used for objective tracking. @@ -39,14 +38,6 @@ var/global/datum/controller/gameticker/ticker var/initialtpass = 0 //holder for inital autotransfer vote timer /datum/controller/gameticker/proc/pregame() - login_music = pick(\ - 'sound/music/therock.ogg',\ - 'sound/music/klendathu.ogg',\ - 'sound/music/knights.ogg',\ - 'sound/music/space.ogg',\ - 'sound/music/Title1.ogg',\ - 'sound/music/Title2.ogg',\ - 'sound/music/space_oddity.ogg') //Ground Control to Major Tom, this song is cool, what's going on? do pregame_timeleft = 180 world << "Welcome to the pre-game lobby!" diff --git a/code/game/sound.dm b/code/game/sound.dm index a1653ba20cd..4b2e037d2a8 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -53,11 +53,6 @@ var/const/SURROUND_CAP = 7 src << S -/client/proc/playtitlemusic() - if(!ticker || !ticker.login_music) return - if(prefs.sound & SOUND_LOBBY) - src << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS - /proc/get_rand_frequency() return rand(32000, 55000) //Frequency stuff only works with 45kbps oggs. diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index a823550cef0..c6f7c750358 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -329,10 +329,7 @@ send_resources() -/* - if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates. - winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold") -*/ + nanomanager.send_resources(src) ////////////// //DISCONNECT// diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index dd1124e5f37..6c16ee1e11c 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -310,7 +310,6 @@ datum/preferences dat += "-Color: [UI_style_color]
__

" dat += "-Alpha(transparence): [UI_style_alpha]
" dat += "Play admin midis: [(sound & SOUND_MIDI) ? "Yes" : "No"]
" - dat += "Play lobby music: [(sound & SOUND_LOBBY) ? "Yes" : "No"]
" dat += "Randomized Character Slot: [randomslot ? "Yes" : "No"]
" dat += "Ghost ears: [(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]
" dat += "Ghost sight: [(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"]
" @@ -1290,13 +1289,6 @@ datum/preferences if("hear_midis") sound ^= SOUND_MIDI - if("lobby_music") - sound ^= SOUND_LOBBY - if(sound & SOUND_LOBBY) - user << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1) - else - user << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) - if("ghost_ears") toggles ^= CHAT_GHOSTEARS diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index cc5eae08826..38eefa915cd 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -68,32 +68,6 @@ src << "You will [(prefs.toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat." feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/verb/toggletitlemusic() - set name = "Hear/Silence LobbyMusic" - set category = "Preferences" - set desc = "Toggles hearing the GameLobby music" - prefs.sound ^= SOUND_LOBBY - prefs.save_preferences(src) - if(prefs.sound & SOUND_LOBBY) - src << "You will now hear music in the game lobby." - if(istype(mob, /mob/new_player)) - playtitlemusic() - else - src << "You will no longer hear music in the game lobby." - if(istype(mob, /mob/new_player)) - src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jamsz - feedback_add_details("admin_verb","TLobby") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/* -/client/verb/togglevoices() - set name = "Toggle player voices" - set category = "Preferences" - set desc = "Toggle hearing player voice sounds" - prefs.sound ^= SOUND_VOICES - prefs.save_preferences() - src << "You will [(prefs.sound & SOUND_VOICES) ? "now" : "no longer"] hear voices of players around you, or your own voice." - feedback_add_details("admin_verb","TVoice") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -*/ /client/verb/togglemidis() set name = "Hear/Silence Midis" diff --git a/code/modules/media/jukebox.dm b/code/modules/media/jukebox.dm index b18e3537ca0..e19729bc1c4 100644 --- a/code/modules/media/jukebox.dm +++ b/code/modules/media/jukebox.dm @@ -322,3 +322,11 @@ var/global/loopModeNames=list( ) invisibility=101 // FAK U NO SONG 4 U +/obj/machinery/media/jukebox/lobby + playlist_id="lobby" + // Must be defined on your server. + playlists=list( + "lobby" = "Lobby Mix" + ) + invisibility=101 + autoplay = 1 \ No newline at end of file diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm index 076c82b6773..a7ce6fa98ab 100644 --- a/code/modules/mob/new_player/login.dm +++ b/code/modules/mob/new_player/login.dm @@ -29,6 +29,4 @@ new_player_panel() spawn(40) if(client) - nanomanager.send_resources(client) handle_privacy_poll() - client.playtitlemusic() diff --git a/code/setup.dm b/code/setup.dm index 5ee5bc8d791..fb50fa7f0b7 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -687,7 +687,7 @@ var/list/TAGGERLOCATIONS = list("Disposals", #define SOUND_ADMINHELP 1 #define SOUND_MIDI 2 #define SOUND_AMBIENCE 4 -#define SOUND_LOBBY 8 +#define SOUND_LOBBY 8 //Removed, can be replaced with any other sound bitflag as needed. #define SOUND_STREAMING 16 #define SOUND_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|SOUND_STREAMING) diff --git a/maps/cyberiad.dmm b/maps/cyberiad.dmm index 6bbde05d74c..4920f4cc463 100644 --- a/maps/cyberiad.dmm +++ b/maps/cyberiad.dmm @@ -7895,7 +7895,7 @@ "cVQ" = (/obj/structure/shuttle/engine/propulsion,/turf/space,/area/syndicate_station/start) "cVR" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_r"; icon_state = "propulsion_r"},/turf/space,/area/syndicate_station/start) "cVS" = (/turf/unsimulated/wall,/area/start) -"cVT" = (/obj/effect/landmark/start,/turf/unsimulated/floor,/area/start) +"cVT" = (/obj/effect/landmark/start,/obj/machinery/media/jukebox/lobby,/turf/unsimulated/floor,/area/start) "cVU" = (/turf/unsimulated/wall/splashscreen,/area/start) "cVV" = (/turf/unsimulated/wall,/area/shuttle/gamma/space) "cVW" = (/obj/machinery/mech_bay_recharge_port,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/shuttle/gamma/space) diff --git a/sound/music/klendathu.ogg b/sound/music/klendathu.ogg deleted file mode 100644 index f01f88d82c6..00000000000 Binary files a/sound/music/klendathu.ogg and /dev/null differ diff --git a/sound/music/knights.ogg b/sound/music/knights.ogg deleted file mode 100644 index e74e6a33521..00000000000 Binary files a/sound/music/knights.ogg and /dev/null differ diff --git a/sound/music/space_oddity.ogg b/sound/music/space_oddity.ogg deleted file mode 100644 index 8baa94c0432..00000000000 Binary files a/sound/music/space_oddity.ogg and /dev/null differ diff --git a/sound/music/therock.ogg b/sound/music/therock.ogg deleted file mode 100644 index 926374aac66..00000000000 Binary files a/sound/music/therock.ogg and /dev/null differ