From 69c97863d504cf1d498f03035ada66f64829cb9f Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Sun, 4 Oct 2015 03:11:02 +0200
Subject: [PATCH] Adminhelp update

---
 code/modules/admin/verbs/adminhelp.dm | 37 ++++++++++++---------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 198e5c8a042..b7f2f2d91bb 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -91,41 +91,38 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 
 	//send this msg to all admins
 	var/admin_number_afk = 0
+	var/list/mentorholders = list()
 	var/list/modholders = list()
 	var/list/adminholders = list()
 	for(var/client/X in admins)
-		if(check_rights(R_MOD|R_MENTOR, 0, X.mob))
-			if(X.is_afk())
-				admin_number_afk++
-			modholders += X
 		if(check_rights(R_ADMIN, 0, X.mob))
 			if(X.is_afk())
 				admin_number_afk++
 			adminholders += X
+			continue
+		if(check_rights(R_MOD, 0, X.mob))
+			modholders += X
+			continue
+		if(check_rights(R_MENTOR, 0, X.mob))
+			mentorholders += X
+			continue
 
 	switch(selected_type)
 		if("Question")
-			if(modholders.len)
-				for(var/client/X in modholders)
-					if(X.prefs.sound & SOUND_ADMINHELP)
-						X << 'sound/effects/adminhelp.ogg'
-					X << msg
-			if(adminholders.len)
-				for(var/client/X in adminholders)
-					if(X.prefs.sound & SOUND_ADMINHELP)
-						X << 'sound/effects/adminhelp.ogg'
-					X << msg
+			for(var/client/X in mentorholders + modholders + adminholders)
+				if(X.prefs.sound & SOUND_ADMINHELP)
+					X << 'sound/effects/adminhelp.ogg'
+				X << msg
 		if("Player Complaint")
-			if(adminholders.len)
-				for(var/client/X in adminholders)
-					if(X.prefs.sound & SOUND_ADMINHELP)
-						X << 'sound/effects/adminhelp.ogg'
-					X << msg
+			for(var/client/X in modholders + adminholders)
+				if(X.prefs.sound & SOUND_ADMINHELP)
+					X << 'sound/effects/adminhelp.ogg'
+				X << msg
 
 	//show it to the person adminhelping too
 	src << "<font color='blue'><b>[selected_type]</b>: [original_msg]</font>"
 
-	var/admin_number_present = admins.len - admin_number_afk
+	var/admin_number_present = adminholders.len - admin_number_afk
 	log_admin("[selected_type]: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
 	if(admin_number_present <= 0)
 		if(!admin_number_afk)