From baee4dead58dd0acf1d11d8450acc7d3a9751bc0 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Tue, 8 May 2018 14:37:05 -0400
Subject: [PATCH 1/2] Merge pull request #37396 from
 KorPhaeron/mrcitruswantsyoutoclockin

Track admin observer time
---
 code/__DEFINES/preferences.dm |  1 +
 code/modules/jobs/job_exp.dm  | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
index 7ba693be0a..0dc8a38899 100644
--- a/code/__DEFINES/preferences.dm
+++ b/code/__DEFINES/preferences.dm
@@ -64,6 +64,7 @@
 #define EXP_TYPE_ANTAG			"Antag"
 #define EXP_TYPE_SPECIAL		"Special"
 #define EXP_TYPE_GHOST			"Ghost"
+#define EXP_TYPE_ADMIN			"Admin"
 
 //Flags in the players table in the db
 #define DB_FLAG_EXEMPT 1
diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm
index 3aad52e596..b4679ae479 100644
--- a/code/modules/jobs/job_exp.dm
+++ b/code/modules/jobs/job_exp.dm
@@ -226,9 +226,14 @@ GLOBAL_PROTECT(exp_to_update)
 			if(!rolefound)
 				play_records["Unknown"] += minutes
 		else
-			play_records[EXP_TYPE_GHOST] += minutes
-			if(announce_changes)
-				to_chat(src,"<span class='notice'>You got: [minutes] Ghost EXP!</span>")
+			if(holder && !holder.deadmined)
+				play_records[EXP_TYPE_ADMIN] += minutes
+				if(announce_changes)
+					to_chat(src,"<span class='notice'>You got: [minutes] Admin EXP!</span>")
+			else
+				play_records[EXP_TYPE_GHOST] += minutes
+				if(announce_changes)
+					to_chat(src,"<span class='notice'>You got: [minutes] Ghost EXP!</span>")
 	else if(isobserver(mob))
 		play_records[EXP_TYPE_GHOST] += minutes
 		if(announce_changes)