From a81b925614b060baaef7c801bbddfd63582dc205 Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Mon, 12 Mar 2018 21:06:18 -0400
Subject: [PATCH 1/2] POLARIS: Reduce double admin logs

---
 code/modules/admin/admin.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index e657c718c0..7c5b9194d8 100644
--- a/code/modules/admin/admin.dm
+++ b/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

From b68a94344352ab632a446d033f363f1ef3185bc8 Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Mon, 12 Mar 2018 21:16:47 -0400
Subject: [PATCH 2/2] POLARIS: Clean up adminpm logs

---
 code/_helpers/logging.dm            | 5 +++++
 code/modules/admin/verbs/adminpm.dm | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/_helpers/logging.dm b/code/_helpers/logging.dm
index 06b9fc72fa..b19ecc42c0 100644
--- a/code/_helpers/logging.dm
+++ b/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]"
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index dcaa745485..4ff94877f4 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/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