From e5b224fb96d84bd751d9a09072e4cef568abd22e Mon Sep 17 00:00:00 2001 From: oranges Date: Thu, 12 Jan 2017 21:36:46 +1300 Subject: [PATCH] Fix lack of feedback when users try to reach admins (#22783) * Players can now see afk mins It's important that players know ahead of time that their ahelps are not reaching someone who is currently active * Add feedback for the player when adminhelping about how many admins saw their message --- code/modules/admin/verbs/adminhelp.dm | 4 +++- code/modules/client/verbs/who.dm | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 67298d24d75..e53602e39ec 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -126,6 +126,8 @@ //send it to irc if nobody is on and tell us how many were on var/admin_number_present = send2irc_adminless_only(ckey,original_msg) log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins who have +BAN.") + if(admin_number_present <= 0) + src << "No active admins are online, your adminhelp was sent to the admin irc." feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return @@ -184,4 +186,4 @@ msg += "(AFK)" msg += ", " - return msg \ No newline at end of file + return msg diff --git a/code/modules/client/verbs/who.dm b/code/modules/client/verbs/who.dm index 1937a60da78..aa60254bccf 100644 --- a/code/modules/client/verbs/who.dm +++ b/code/modules/client/verbs/who.dm @@ -80,6 +80,8 @@ msg += "\n" else for(var/client/C in admins) + if(C.is_afk()) + continue //Don't show afk admins to adminwho if(!C.holder.fakekey) msg += "\t[C] is a [C.holder.rank]\n" msg += "Adminhelps are also sent to IRC. If no admins are available in game adminhelp anyways and an admin on IRC will see it and respond."