shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Fixes stopsounds (#5912)

Browse Source 
* Fixes stopsounds

* Update playsound.dm
This commit is contained in:
CitadelStationBot
2018-03-12 07:58:49 -05:00
committed by Poojawa
parent 3e5f79332a
commit fd42d55993
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/misc.dm
+2
View File
@@ -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
code/modules/admin/verbs/playsound.dm
+3 -3
View File
@@ -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, "<span class='boldwarning'>BLOCKED: Content URL not using http(s) protocol</span>")
to_chat(src, "<span class='warning'>The media provider returned a content URL that isn't using the HTTP or HTTPS protocol</span>")
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!
code/modules/client/preferences_toggles.dm
+1 -1
View File
@@ -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!