From 2f0ebbf810ea55138f4a3fa2819d004996132806 Mon Sep 17 00:00:00 2001 From: Incoming Date: Tue, 28 Apr 2015 23:15:27 -0400 Subject: [PATCH] Fixes a pretty significant bug where sounds set with set round end sound would only actually play for the person who set the sound --- code/controllers/subsystem/ticker.dm | 2 -- code/modules/admin/verbs/playsound.dm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index c33ecb81ac9..029481e1598 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -51,8 +51,6 @@ var/datum/subsystem/ticker/ticker if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS]) login_music = 'sound/ambience/clown.ogg' - round_end_sound = pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg','sound/misc/leavingtg.ogg') - /datum/subsystem/ticker/Initialize() if(!syndicate_code_phrase) syndicate_code_phrase = generate_code_phrase() if(!syndicate_code_response) syndicate_code_response = generate_code_phrase() diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 82e183bf91f..04df14ff933 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -42,7 +42,7 @@ var/sound/admin_sound if(!check_rights(R_SOUNDS)) return if(ticker) - ticker.round_end_sound = S + ticker.round_end_sound = fcopy_rsc(S) else return