Merge pull request #3226 from VOREStation/aro-reducedouble

Reduce double admin logs

code/_helpers/logging.dm

@@ -25,6 +25,11 @@
 	if (config.log_admin)
 		diary << "\[[time_stamp()]]ADMIN: [text][log_end]"
 
+/proc/log_adminpm(text, client/source, client/dest)
+	admin_log.Add(text)
+	if (config.log_admin)
+		diary << "\[[time_stamp()]]ADMINPM: [key_name(source)]->[key_name(dest)]: [html_decode(text)][log_end]"
+
 /proc/log_debug(text)
 	if (config.log_debug)
 		debug_log << "\[[time_stamp()]]DEBUG: [text][log_end]"

code/modules/admin/admin.dm

@@ -6,7 +6,7 @@ var/global/floorIsLava = 0
 ////////////////////////////////
 /proc/message_admins(var/msg)
 	msg = "<span class=\"log_message\"><span class=\"prefix\">ADMIN LOG:</span> <span class=\"message\">[msg]</span></span>"
-	log_adminwarn(msg)
+	//log_adminwarn(msg) //log_and_message_admins is for this
 	for(var/client/C in admins)
 		if((R_ADMIN|R_MOD) & C.holder.rights)
 			C << msg

code/modules/admin/verbs/adminpm.dm

@@ -104,7 +104,7 @@
 	if(C.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
 		C << 'sound/effects/adminhelp.ogg'
 
-	log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")
+	log_adminpm(msg,src,C)
 	send2adminirc("Reply: [key_name(src)]->[key_name(C)]: [html_decode(msg)]")
 
 	//we don't use message_admins here because the sender/receiver might get it too