diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index b5444ec6c7..c42c65654d 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1245,7 +1245,7 @@ proc/admin_notice(var/message, var/rights)
M = whom
C = M.client
else
- return "(*not an mob*)"
+ return "(*not a mob*)"
switch(detail)
if(0)
return "[key_name(C, link, name, highlight_special)]"
@@ -1255,15 +1255,15 @@ proc/admin_notice(var/message, var/rights)
if(2) //Admins
var/ref_mob = "\ref[M]"
- return "[key_name(C, link, name, highlight_special)](?) (PP) (VV) (SM) ([admin_jump_link(M, src)]) (CA)"
+ return "[key_name(C, link, name, highlight_special)](?) (PP) (VV) (SM) ([admin_jump_link(M, src)]) (CA) (TAKE)"
if(3) //Devs
var/ref_mob = "\ref[M]"
- return "[key_name(C, link, name, highlight_special)](VV)([admin_jump_link(M, src)])"
+ return "[key_name(C, link, name, highlight_special)](VV)([admin_jump_link(M, src)]) (TAKE)"
if(4) //Mentors
var/ref_mob = "\ref[M]"
- return "[key_name(C, link, name, highlight_special)] (?) (PP) (VV) (SM) ([admin_jump_link(M, src)])"
+ return "[key_name(C, link, name, highlight_special)] (?) (PP) (VV) (SM) ([admin_jump_link(M, src)]) (TAKE)"
/proc/ishost(whom)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index fe427b54d8..4c1a268c3f 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1218,6 +1218,18 @@
else if(href_list["check_antagonist"])
check_antagonists()
+ else if(href_list["take_question"])
+
+ var/mob/M = locate(href_list["take_question"])
+ if(ismob(M))
+ var/take_msg = "ADMINHELP: [key_name(usr.client)] is attending to [key_name(M)]'s adminhelp, please don't dogpile them."
+ for(var/client/X in admins)
+ if((R_ADMIN|R_MOD|R_MENTOR) & X.holder.rights)
+ to_chat(X, take_msg)
+ to_chat(M, "Your adminhelp is being attended to by [key_name(usr.client)]. Thanks for your patience!")
+ else
+ to_chat(usr, "Unable to locate mob.")
+
else if(href_list["adminplayerobservecoodjump"])
if(!check_rights(R_ADMIN|R_SERVER|R_MOD)) return
diff --git a/html/changelogs/zuhayr-dibs.yml b/html/changelogs/zuhayr-dibs.yml
new file mode 100644
index 0000000000..54cf379ed3
--- /dev/null
+++ b/html/changelogs/zuhayr-dibs.yml
@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+#################################
+
+# Your name.
+author: Zuhayr
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Adminhelps now have a TAKE button that allow an admin to claim it, and inform the adminhelper that someone is on the case."