cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Internet web sounds will automatically stop lobby music. End of round music will not play if there is ongoing web sounds. (#90330)

Browse Source 
## About The Pull Request
As the title says. Also moves lobby music to use variable instead of the
timer subsystem since it needs to track on client time rather than
server time and variable cooldowns are more relevant for this usecase.

## Why It's Good For The Game
Removes the need for admins to stop all playing sounds. Also, people
with admin sounds turned off will still be able to hear the lobby music
so their experience is improved.

Makes the web sound cooldown timings more consistent, hopefully.

## Changelog
🆑
admin: Play Internet Sound will now automatically stop lobby music and
prevent lobby music from playing at roundend whilst active.
/🆑
This commit is contained in:
Watermelon914
2025-03-30 22:45:14 +02:00
committed by GitHub
parent a834a92ed6
commit b9500efdf8
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/playsound.dm
+9 -4
View File
@@ -60,6 +60,8 @@ ADMIN_VERB(play_direct_mob_sound, R_SOUND, "Play Direct Mob Sound", "Play a soun
SEND_SOUND(target, sound)
BLACKBOX_LOG_ADMIN_VERB("Play Direct Mob Sound")
GLOBAL_VAR_INIT(web_sound_cooldown, 0)
///Takes an input from either proc/play_web_sound or the request manager and runs it through yt-dlp and prompts the user before playing it to the server.
/proc/web_sound(mob/user, input, credit)
if(!check_rights(R_SOUND))
@@ -150,12 +152,15 @@ ADMIN_VERB(play_direct_mob_sound, R_SOUND, "Play Direct Mob Sound", "Play a soun
var/mob/M = m
var/client/C = M.client
if(C.prefs.read_preference(/datum/preference/numeric/volume/sound_midi))
// Stops playing lobby music and admin loaded music automatically.
SEND_SOUND(C, sound(null, channel = CHANNEL_LOBBYMUSIC))
SEND_SOUND(C, sound(null, channel = CHANNEL_ADMIN))
if(!stop_web_sounds)
C.tgui_panel?.play_music(web_sound_url, music_extra_data)
else
C.tgui_panel?.stop_music()
S_TIMER_COOLDOWN_START(SStimer, COOLDOWN_INTERNET_SOUND, duration)
CLIENT_COOLDOWN_START(GLOB, web_sound_cooldown, duration)
BLACKBOX_LOG_ADMIN_VERB("Play Internet Sound")
@@ -163,8 +168,8 @@ ADMIN_VERB_CUSTOM_EXIST_CHECK(play_web_sound)
return !!CONFIG_GET(string/invoke_youtubedl)
ADMIN_VERB(play_web_sound, R_SOUND, "Play Internet Sound", "Play a given internet sound to all players.", ADMIN_CATEGORY_FUN)
if(S_TIMER_COOLDOWN_TIMELEFT(SStimer, COOLDOWN_INTERNET_SOUND))
if(tgui_alert(user, "Someone else is already playing an Internet sound! It has [DisplayTimeText(S_TIMER_COOLDOWN_TIMELEFT(SStimer, COOLDOWN_INTERNET_SOUND), 1)] remaining. \
if(!CLIENT_COOLDOWN_FINISHED(GLOB, web_sound_cooldown))
if(tgui_alert(user, "Someone else is already playing an Internet sound! It has [DisplayTimeText(CLIENT_COOLDOWN_TIMELEFT(GLOB, web_sound_cooldown), 1)] remaining. \
Would you like to override?", "Musicalis Interruptus", list("No","Yes")) != "Yes")
return
@@ -199,7 +204,7 @@ ADMIN_VERB(stop_sounds, R_NONE, "Stop All Playing Sounds", "Stops all playing so
var/client/player_client = player.client
player_client?.tgui_panel?.stop_music()
S_TIMER_COOLDOWN_RESET(SStimer, COOLDOWN_INTERNET_SOUND)
CLIENT_COOLDOWN_RESET(GLOB, web_sound_cooldown)
BLACKBOX_LOG_ADMIN_VERB("Stop All Playing Sounds")
//world/proc/shelleo