diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 39a5fa778c..9e5260fbd6 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -1,18 +1,8 @@
-#define AHELP_ADMIN 1
-#define AHELP_MENTOR 2
-#define AHELP_DEV 3
//This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as")
-var/list/adminhelp_categories = list("Mentor - Gameplay/Roleplay question" = AHELP_MENTOR,\
- "Admin - Rule/Gameplay issue" = AHELP_ADMIN,\
- "Dev - Bug report" = AHELP_DEV)
-
-/client/proc/adminhelp_admin(message)
- adminhelp("Admin - Rule/Gameplay issue", message)
-
-/client/verb/adminhelp(selected_type in adminhelp_categories, msg as text)
+/client/verb/adminhelp(msg as text)
set category = "Admin"
set name = "Adminhelp"
@@ -27,18 +17,6 @@ var/list/adminhelp_categories = list("Mentor - Gameplay/Roleplay question" = AHE
adminhelped = 1 //Determines if they get the message to reply by clicking the name.
- /**src.verbs -= /client/verb/adminhelp
-
- spawn(1200)
- src.verbs += /client/verb/adminhelp // 2 minute cool-down for adminhelps
- src.verbs += /client/verb/adminhelp // 2 minute cool-down for adminhelps//Go to hell
- **/
-
- if(!msg || alert("The following message will be sent to staff that administers\n the '[selected_type]' category:\n\n[msg]\n", "Admin Help", "Ok", "Cancel") == "Cancel")
- return
-
- var/selected_upper = uppertext(selected_type)
-
if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))
return
@@ -109,62 +87,12 @@ var/list/adminhelp_categories = list("Mentor - Gameplay/Roleplay question" = AHE
var/ai_cl
if(ai_found)
ai_cl = " (CL)"
- var/mentor_msg = "\blue [selected_upper]: [get_options_bar(mob, 0, 0, 1, 0)][ai_cl]: [msg]"
- var/dev_msg = "\blue [selected_upper]: [get_options_bar(mob, 3, 0, 1, 0)][ai_cl]: [msg]"
- msg = "\blue [selected_upper]: [get_options_bar(mob, 2, 1, 1)][ai_cl]: [msg]"
+ var/mentor_msg = "\blue Request for Help: [get_options_bar(mob, 0, 0, 1, 0)][ai_cl]: [msg]"
+ msg = "\blue Request for Help:: [get_options_bar(mob, 2, 1, 1)][ai_cl]: [msg]"
var/admin_number_afk = 0
- var/list/mentorholders = list()
- var/list/debugholders = list()
- var/list/adminholders = list()
for(var/client/X in admins)
- if(R_MENTOR & X.holder.rights && !(R_ADMIN & X.holder.rights)) // we don't want to count admins twice. This list should be JUST mentors
- mentorholders += X
- if(X.is_afk())
- admin_number_afk++
- if(R_DEBUG & X.holder.rights) // Looking for anyone with +Debug which will be admins, developers, and developer mentors
- debugholders += X
- if(!(R_ADMIN & X.holder.rights))
- if(X.is_afk())
- admin_number_afk++
- if(R_ADMIN | R_MOD & X.holder.rights) // just admins here please
- adminholders += X
- if(X.is_afk())
- admin_number_afk++
-
- switch(adminhelp_categories[selected_type])
- if(AHELP_MENTOR)
- if(mentorholders.len)
- for(var/client/X in mentorholders) // Mentors get a message without buttons and no character name
- if(X.prefs.toggles & SOUND_ADMINHELP)
- X << 'sound/effects/adminhelp.ogg'
- X << mentor_msg
- if(adminholders.len)
- for(var/client/X in adminholders) // Admins get the full monty
- if(X.prefs.toggles & SOUND_ADMINHELP)
- X << 'sound/effects/adminhelp.ogg'
- X << msg
- if(AHELP_ADMIN)
- if(adminholders.len)
- for(var/client/X in adminholders) // Admins of course get everything in their helps
- if(X.prefs.toggles & SOUND_ADMINHELP)
- X << 'sound/effects/adminhelp.ogg'
- X << msg
- if(AHELP_DEV)
- if(debugholders.len)
- for(var/client/X in debugholders)
- if(R_ADMIN | R_MOD & X.holder.rights) // Admins get every button & special highlights in theirs
- if(X.prefs.toggles & SOUND_ADMINHELP)
- X << 'sound/effects/adminhelp.ogg'
- X << msg
- else
- if (R_DEBUG & X.holder.rights) // Just devs or devmentors get non-highlighted names, but they do get JMP and VV for their bug reports.
- if(X.prefs.toggles & SOUND_ADMINHELP)
- X << 'sound/effects/adminhelp.ogg'
- X << dev_msg
-
- /*for(var/client/X in admins)
if((R_ADMIN|R_MOD|R_MENTOR) & X.holder.rights)
if(X.is_afk())
admin_number_afk++
@@ -173,20 +101,17 @@ var/list/adminhelp_categories = list("Mentor - Gameplay/Roleplay question" = AHE
if(X.holder.rights == R_MENTOR)
X << mentor_msg // Mentors won't see coloring of names on people with special_roles (Antags, etc.)
else
- X << msg*/
+ X << msg
//show it to the person adminhelping too
- src << "PM to-Staff ([selected_type]): [original_msg]"
+ src << "PM to-Staff : [original_msg]"
var/admin_number_present = admins.len - admin_number_afk
log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
if(admin_number_present <= 0)
- send2adminirc("[selected_upper] from [key_name(src)]: [html_decode(original_msg)] - !![admin_number_afk ? "All admins AFK ([admin_number_afk])" : "No admins online"]!!")
+ send2adminirc("Request for Help from [key_name(src)]: [html_decode(original_msg)] - !![admin_number_afk ? "All admins AFK ([admin_number_afk])" : "No admins online"]!!")
else
- send2adminirc("[selected_upper] from [key_name(src)]: [html_decode(original_msg)]")
+ 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
-#undef AHELP_ADMIN
-#undef AHELP_MENTOR
-#undef AHELP_DEV
\ No newline at end of file
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 0b3f82aaa1..1c358c8cf4 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -96,7 +96,7 @@
if(sender)
C.cmd_admin_pm(sender,reply) //sender is still about, let's reply to them
else
- adminhelp_admin(reply) //sender has left, adminhelp instead
+ adminhelp(reply) //sender has left, adminhelp instead
return
src << "" + create_text_tag("pm_out_alt", "PM", src) + " to [get_options_bar(C, holder ? 1 : 0, holder ? 1 : 0, 1)]: [msg]"
C << "" + create_text_tag("pm_in", "", C) + " \[[recieve_pm_type] PM\] [get_options_bar(src, C.holder ? 1 : 0, C.holder ? 1 : 0, 1)]: [msg]"