diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 199535a04e..469330d398 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -433,6 +433,8 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE #define SUMMON_GUNS "guns" #define SUMMON_MAGIC "magic" +#define STOP_SOUNDS_URL "http://" + //Run the world with this parameter to enable a single run though of the game setup and tear down process with unit tests in between #define TEST_RUN_PARAMETER "test-run" //Force the log directory to be something specific in the data/logs folder diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 24fd6f0491..3d96cbfc91 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -120,10 +120,10 @@ else //pressed ok with blank log_admin("[key_name(src)] stopped web sound") message_admins("[key_name(src)] stopped web sound") - web_sound_url = " " + web_sound_url = STOP_SOUNDS_URL if(web_sound_url) - if(web_sound_url != " " && !findtext(web_sound_url, GLOB.is_http_protocol)) + if(!findtext(web_sound_url, GLOB.is_http_protocol)) to_chat(src, "BLOCKED: Content URL not using http(s) protocol") to_chat(src, "The media provider returned a content URL that isn't using the HTTP or HTTPS protocol") for(var/m in GLOB.player_list) @@ -159,5 +159,5 @@ SEND_SOUND(M, sound(null)) var/client/C = M.client if(C && C.chatOutput && !C.chatOutput.broken && C.chatOutput.loaded) - C.chatOutput.sendMusic(" ") + C.chatOutput.sendMusic(STOP_SOUNDS_URL) SSblackbox.record_feedback("tally", "admin_verb", 1, "Stop All Playing Sounds") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 255423a4fc..32328d555b 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -235,7 +235,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggleprayersounds)() SEND_SOUND(usr, sound(null)) var/client/C = usr.client if(C && C.chatOutput && !C.chatOutput.broken && C.chatOutput.loaded) - C.chatOutput.sendMusic(" ") + C.chatOutput.sendMusic(STOP_SOUNDS_URL) SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Stop Self Sounds")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!