Dibs

code/modules/admin/admin.dm

@@ -1315,9 +1315,9 @@ proc/admin_notice(var/message, var/rights)
 			var/ref_mob = "\ref[M]"
 			return "<b>[key_name(C, link, name, highlight_special)](<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[ref_mob]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=[ref_mob]'>JMP</A>) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>)</b>"
 
-		if(3)	//Devs
+		if(3)	//Undibbsed
 			var/ref_mob = "\ref[M]"
-			return "<b>[key_name(C, link, name, highlight_special)](<A HREF='?_src_=vars;Vars=[ref_mob]'>VV</A>)(<A HREF='?_src_=holder;adminplayerobservejump=[ref_mob]'>JMP</A>)</b>"
+			return "<b>[key_name(C, link, name, highlight_special)](<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;admindibs=\ref[C]'>DIBS</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[M]'>PP</A>) (<A HREF='?_src_=holder;adminplayerobservejump=[ref_mob]'>JMP</A>)</b>"
 
 		if(4)	//Mentors
 			var/ref_mob = "\ref[M]"

code/modules/admin/topic.dm

@@ -2682,6 +2682,26 @@
 
 		paralyze_mob(M)
 
+	else if(href_list["admindibs"])
+		if (!check_rights(R_ADMIN|R_MOD))
+			return
+
+		var/client/C = locate(href_list["admindibs"])
+
+		if (!istype(C) || !C)
+			usr << "\red Player not found!"
+			return
+
+		if (C.adminhelped == 2)
+			log_and_message_admins("has called <font color='red'>dibs</font> on [key_name_admin(C)]'s adminhelp!")
+			usr << "<font color='blue'><b>You have taken over [key_name_admin(C)]'s adminhelp.</b></font>'"
+			usr << "[get_options_bar(C, 2, 1, 1)]"
+
+			C << "<font color='red'><b>Your adminhelp will be tended [usr.client.holder.fakekey ? "shortly" : "by [key_name(usr, 0, 0)]"]. Please allow the staff member a minute or two to write up a response.</b></font>"
+			C.adminhelped = 1
+		else
+			usr << "<font color='red'><b>The adminhelp has already been claimed!</b></font>"
+
 		return
 
 mob/living/proc/can_centcom_reply()

code/modules/admin/verbs/adminhelp.dm

@@ -15,7 +15,13 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 		src << "<font color='red'>Error: Admin-PM: You cannot send adminhelps (Muted).</font>"
 		return
 
-	adminhelped = 1 //Determines if they get the message to reply by clicking the name.
+	adminhelped = 2 //Determines if they get the message to reply by clicking the name.
+
+	/*A wee bit of an update here: we're using the following table for adminhelped values:
+	2 - Adminhelp has not been claimed by anyone.
+	1 - Adminhelp has been claimed, initial message has not been sent.
+	0 - Adminhelp has been claimed, initial message has been sent.
+	*/
 
 	if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))
 		return
@@ -88,11 +94,11 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	if(ai_found)
 		ai_cl = " (<A HREF='?_src_=holder;adminchecklaws=\ref[mob]'>CL</A>)"
 
-			//Options bar:  mob, details ( admin = 2, dev = 3, mentor = 4, character name (0 = just ckey, 1 = ckey and character name), link? (0 no don't make it a link, 1 do so),
+			//Options bar:  mob, details ( admin = 2, undibbsed admin = 3, mentor = 4, character name (0 = just ckey, 1 = ckey and character name), link? (0 no don't make it a link, 1 do so),
 			//		highlight special roles (0 = everyone has same looking name, 1 = antags / special roles get a golden name)
 
 	var/mentor_msg = "\blue <b><font color=red>Request for Help: </font>[get_options_bar(mob, 4, 1, 1, 0)][ai_cl]:</b> [msg]"
-	msg = "\blue <b><font color=red>Request for Help:: </font>[get_options_bar(mob, 2, 1, 1)][ai_cl]:</b> [msg]"
+	msg = "\blue <b><font color=red>Request for Help:: </font>[get_options_bar(mob, 3, 1, 1)][ai_cl]:</b> [msg]"
 
 	var/admin_number_afk = 0
 
@@ -118,4 +124,3 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 		send2adminirc("Request for Help from [key_name(src)]: [html_decode(original_msg)]")
 	feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return
-