From 684d888366448817471cc9512a3d6e0f8f151950 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 1 Oct 2017 22:51:34 -0500 Subject: [PATCH] Update playsound.dm --- code/modules/admin/verbs/playsound.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 3b982fe13e..0cc1f72256 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -92,12 +92,7 @@ if(SSevents.holidays && SSevents.holidays[APRIL_FOOLS]) pitch = pick(0.5, 0.7, 0.8, 0.85, 0.9, 0.95, 1.1, 1.2, 1.4, 1.6, 2.0, 2.5) to_chat(src, "You feel the Honkmother messing with your song...") - -<<<<<<< HEAD - SSblackbox.add_details("played_url", web_sound_input) -======= SSblackbox.add_details("played_url", "[web_sound_input]|[ckey]") ->>>>>>> a6460ce... played_url key_name() to ckey log_admin("[key_name(src)] played web sound: [web_sound_input]") message_admins("[key_name(src)] played web sound: [web_sound_input]") else