From 57a008d567ec25bd8ec5e1fcb64371562458219d Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Wed, 26 Aug 2020 11:22:57 +0800 Subject: [PATCH] fixes adminbus --- code/modules/admin/verbs/adminpm.dm | 8 ++++---- code/modules/admin/verbs/playsound.dm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 1f3f94d1f6..2931c52a5c 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -102,7 +102,7 @@ recipient_ticket = recipient.current_ticket if(external) - if(!externalreplyamount) //to prevent people from spamming irc/discord + if(!ircreplyamount) //to prevent people from spamming irc/discord return if(!msg) msg = input(src,"Message:", "Private message to Administrator") as message|null @@ -160,7 +160,7 @@ if(external) to_chat(src, "PM to-Admins: [rawmsg]", confidential = TRUE) var/datum/admin_help/AH = admin_ticket_log(src, "Reply PM from-[key_name(src, TRUE, TRUE)] to External: [keywordparsedmsg]") - externalreplyamount-- + ircreplyamount-- send2irc("[AH ? "#[AH.id] " : ""]Reply: [ckey]", rawmsg) else @@ -191,10 +191,10 @@ else if(holder) //sender is an admin but recipient is not. Do BIG RED TEXT - var/already_logged = FALSE + //var/already_logged = FALSE if(!recipient.current_ticket) new /datum/admin_help(msg, recipient, TRUE) - already_logged = TRUE + //already_logged = TRUE // SSblackbox.LogAhelp(recipient.current_ticket.id, "Ticket Opened", msg, recipient.ckey, src.ckey) to_chat(recipient, "-- Administrator private message --", confidential = TRUE) diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 2acdc26760..fc2ba55f54 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -151,7 +151,7 @@ M = i M?.client?.tgui_panel?.stop_music() return - + var/list/music_extra_data = list() web_sound_input = trim(web_sound_input) if(web_sound_input && (findtext(web_sound_input, ":") && !findtext(web_sound_input, GLOB.is_http_protocol))) @@ -164,7 +164,7 @@ if(!findtext(title, ".mp3") && !findtext(title, ".mp4")) // IE sucks. to_chat(src, "The format is not .mp3/.mp4, IE 8 and above can only support the .mp3/.mp4 format, the music might not play.", confidential = TRUE) - if(title.len > 50) //kev no. + if(length(title) > 50) //kev no. title = "Unknown.mp3" music_extra_data["title"] = title