cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

New Lobby Music + Adjust Volume (#20965)

Browse Source 
Adds five new songs for Aurora lobby music - no more baseline SS13
stuff!
Also backports the original Title3 for that OG SS13 goodness.

Taken mostly from CCMixter.
Information in licensing_information.txt.

Also, updates the lobby music toggle to be a volume input. Set to 0 to
mute.

---------

Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
This commit is contained in:
Wowzewow (Wezzy)
2025-07-21 10:33:51 +00:00
committed by GitHub
parent 71af7f3f22
commit 5006e41347
24 changed files with 158 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/global/02_settings.dm
+16 -8
View File
@@ -8,6 +8,7 @@
S["toggles"] >> pref.toggles
S["sfx_toggles"] >> pref.sfx_toggles
S["toggles_secondary"] >> pref.toggles_secondary
S["lobby_music_vol"] >> pref.lobby_music_vol
/datum/category_item/player_setup_item/player_global/settings/save_preferences(var/savefile/S)
S["lastchangelog"] << pref.lastchangelog
@@ -15,6 +16,7 @@
S["toggles"] << pref.toggles
S["sfx_toggles"] << pref.sfx_toggles
S["toggles_secondary"] << pref.toggles_secondary
S["lobby_music_vol"] << pref.lobby_music_vol
/datum/category_item/player_setup_item/player_global/settings/gather_load_query()
return list(
@@ -24,7 +26,8 @@
"current_character",
"toggles",
"sfx_toggles",
"toggles_secondary"
"toggles_secondary",
"lobby_music_vol"
),
"args" = list("ckey")
)
@@ -42,6 +45,7 @@
"sfx_toggles",
"ckey" = 1,
"toggles_secondary",
"lobby_music_vol",
)
)
@@ -52,7 +56,8 @@
"current_character" = pref.current_character,
"toggles" = pref.toggles,
"sfx_toggles" = pref.sfx_toggles,
"toggles_secondary" = pref.toggles_secondary
"toggles_secondary" = pref.toggles_secondary,
"lobby_music_vol" = pref.lobby_music_vol
)
/datum/category_item/player_setup_item/player_global/settings/sanitize_preferences(var/sql_load = 0)
@@ -65,11 +70,12 @@
pref.toggles = sanitize_integer(text2num(pref.toggles), 0, BITFIELDMAX, initial(pref.toggles))
pref.sfx_toggles = sanitize_integer(text2num(pref.sfx_toggles), 0, BITFIELDMAX, initial(pref.toggles))
pref.toggles_secondary = sanitize_integer(text2num(pref.toggles_secondary), 0, BITFIELDMAX, initial(pref.toggles_secondary))
pref.lobby_music_vol = sanitize_integer(text2num(pref.lobby_music_vol), 0, BITFIELDMAX, initial(pref.lobby_music_vol))
/datum/category_item/player_setup_item/player_global/settings/content(mob/user)
var/list/dat = list(
"<b>Play admin midis:</b> <a href='byond://?src=[REF(src)];toggle=[SOUND_MIDI]'><b>[(pref.toggles & SOUND_MIDI) ? "Yes" : "No"]</b></a><br>",
"<b>Play lobby music:</b> <a href='byond://?src=[REF(src)];toggle=[SOUND_LOBBY]'><b>[(pref.toggles & SOUND_LOBBY) ? "Yes" : "No"]</b></a><br>",
"<b>Lobby music volume:</b> <a href='byond://?src=[REF(src)];select_volume=1'><b>[(pref.lobby_music_vol)]</b></a><br>",
"<b>Ghost ears:</b> <a href='byond://?src=[REF(src)];toggle=[CHAT_GHOSTEARS]'><b>[(pref.toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"]</b></a><br>",
"<b>Ghost sight:</b> <a href='byond://?src=[REF(src)];toggle=[CHAT_GHOSTSIGHT]'><b>[(pref.toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"]</b></a><br>",
"<b>Ghost radio:</b> <a href='byond://?src=[REF(src)];toggle=[CHAT_GHOSTRADIO]'><b>[(pref.toggles & CHAT_GHOSTRADIO) ? "All Chatter" : "Nearest Speakers"]</b></a><br>",
@@ -87,11 +93,13 @@
if(href_list["toggle"])
var/toggle_flag = text2num(href_list["toggle"])
pref.toggles ^= toggle_flag
if(toggle_flag == SOUND_LOBBY && isnewplayer(user))
if(pref.toggles & SOUND_LOBBY)
user << sound(SSticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1)
else
user << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1)
return TOPIC_REFRESH
if(href_list["select_volume"])
var/lobby_music_vol_new = tgui_input_number(src, "Choose lobby music volume, 0 to mute", "Lobby Music Volume", pref.lobby_music_vol, 100, 0, 0, TRUE)
if(isnull(lobby_music_vol_new))
return
pref.lobby_music_vol = lobby_music_vol_new
return TOPIC_REFRESH
if(href_list["paratoggle"])
code/modules/client/preferences.dm
+1
View File
@@ -33,6 +33,7 @@ GLOBAL_LIST_EMPTY_TYPED(preferences_datums, /datum/preferences)
var/tgui_inputs_swapped = FALSE
var/tgui_say_light_mode = FALSE
var/ui_scale = TRUE
var/lobby_music_vol = 85
//Style for popup tooltips
var/tooltip_style = "Midnight"
code/modules/client/preferences_toggles.dm
+14 -10
View File
@@ -71,19 +71,23 @@
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 name = "Lobby Music Volume"
set category = "Preferences.Sound"
set desc = "Toggles hearing the GameLobby music"
prefs.toggles ^= SOUND_LOBBY
prefs.save_preferences()
if(prefs.toggles & SOUND_LOBBY)
set desc = "Adjusts the Game Lobby music volume"
var/lobby_music_vol_new = tgui_input_number(src, "Choose lobby music volume, 0 to mute", "Lobby Music Volume", prefs.lobby_music_vol, 100, 0, 0, TRUE)
if(isnull(lobby_music_vol_new))
return
if(!prefs.lobby_music_vol && lobby_music_vol_new)
to_chat(src, "You will now hear music in the game lobby.")
if(istype(mob, /mob/abstract/new_player))
playtitlemusic()
else
prefs.lobby_music_vol = lobby_music_vol_new
if(!prefs.lobby_music_vol)
to_chat(src, "You will no longer hear music in the game lobby.")
if(istype(mob, /mob/abstract/new_player))
src << sound(null, repeat = 0, wait = 0, volume = 85, channel = CHANNEL_LOBBYMUSIC) // stop the jamsz)
prefs.save_preferences()
if(istype(mob, /mob/abstract/new_player))
playtitlemusic()
feedback_add_details("admin_verb","TLobby") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/verb/togglemidis()