Merge remote-tracking branch 'upstream/master'

code/modules/admin/verbs/adminhelp.dm

@@ -496,6 +496,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		if(alert(usr, "You already have a ticket open. Is this for the same issue?",,"Yes","No") != "No")
 			if(current_ticket)
 				current_ticket.MessageNoRecipient(msg)
+				to_chat(usr, "<span class='adminnotice'>PM to-<b>Admins</b>: [msg]</span>")
 				return
 			else
 				to_chat(usr, "<span class='warning'>Ticket not found, creating new one...</span>")

code/modules/admin/verbs/adminhelp_vr.dm

@@ -1,8 +1,8 @@
-/datum/admin_help/proc/send2adminchat()	
+/datum/admin_help/proc/send2adminchat()
 	if(!config.chat_webhook_url)
 		return
 
-	var/list/adm = get_admin_counts()	
+	var/list/adm = get_admin_counts()
 	var/list/afkmins = adm["afk"]
 	var/list/allmins = adm["total"]
 
@@ -14,3 +14,23 @@
 		query_string += "&admin_number=[allmins.len]"
 		query_string += "&admin_number_afk=[afkmins.len]"
 		world.Export("[config.chat_webhook_url]?[query_string]")
+
+/client/verb/adminspice()
+	set category = "Admin"
+	set name = "Request Spice"
+
+	//handle muting and automuting
+	if(prefs.muted & MUTE_ADMINHELP)
+		to_chat(usr, "<span class='danger'>Error: You cannot request spice (muted from adminhelps).</span>")
+		return
+
+	if(alert(usr, "Are you sure you want to request the admins spice things up for you? You accept the consequences if you do.",,"No","Yes") != "No")
+		message_admins("[ADMIN_FULLMONTY(usr)] has requested the round be spiced up a little.")
+	else
+		to_chat(usr, "<span class='notice'>Spice request cancelled.</span>")
+		return
+
+	//if they requested spice, then remove spice verb temporarily to prevent spamming
+	usr.verbs -= /client/verb/adminspice
+	spawn(6000)
+		usr.verbs += /client/verb/adminspice	// 10 minute cool-down for spice request