From b0fb593210b683c8a59942d3b107026038dc9a6f Mon Sep 17 00:00:00 2001
From: Kyep <github-aweb@sneakemail.com>
Date: Mon, 2 Apr 2018 19:09:50 -0700
Subject: [PATCH] Better ID computer logging

---
 code/game/machinery/computer/card.dm         | 12 ++++++++++++
 code/game/objects/items/weapons/cards_ids.dm |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index c3a650f47be..d4d91b225c6 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -390,6 +390,11 @@ var/time_last_changed_position = 0
 
 						access = jobdatum.get_access()
 
+					var/jobnamedata = modify.getRankAndAssignment()
+					log_game("[key_name(usr)] has reassigned \"[modify.registered_name]\" from [jobnamedata] to [t1].")
+					if(t1 == "Civilian")
+						message_admins("[key_name_admin(usr)] has reassigned \"[modify.registered_name]\" from [jobnamedata] to [t1].")
+
 					modify.access = access
 					modify.rank = t1
 					modify.assignment = t1
@@ -454,6 +459,9 @@ var/time_last_changed_position = 0
 
 		if("terminate")
 			if(is_authenticated(usr) && !target_dept)
+				var/jobnamedata = modify.getRankAndAssignment()
+				log_game("[key_name(usr)] has terminated the employment of \"[modify.registered_name]\" the [jobnamedata].")
+				message_admins("[key_name_admin(usr)] has terminated the employment of \"[modify.registered_name]\" the [jobnamedata].")
 				modify.assignment = "Terminated"
 				modify.access = list()
 				callHook("terminate_employee", list(modify))
@@ -471,6 +479,10 @@ var/time_last_changed_position = 0
 				var/datum/job/jobdatum = new /datum/job/civilian
 				access = jobdatum.get_access()
 
+				var/jobnamedata = modify.getRankAndAssignment()
+				log_game("[key_name(usr)] has demoted \"[modify.registered_name]\" the [jobnamedata] to Civilian.")
+				message_admins("[key_name_admin(usr)] has demoted \"[modify.registered_name]\" the [jobnamedata] to Civilian.")
+
 				modify.access = access
 				modify.rank = "Civilian"
 				modify.assignment = "Unassigned"
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index dc4f23657b5..fa3f7c82cd4 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -187,6 +187,14 @@
 /obj/item/weapon/card/id/GetID()
 	return src
 
+/obj/item/weapon/card/id/proc/getRankAndAssignment()
+	var/jobnamedata = ""
+	if(rank)
+		jobnamedata += rank
+	if(rank != assignment)
+		jobnamedata += " (" + assignment + ")"
+	return jobnamedata
+
 /obj/item/weapon/card/id/proc/is_untrackable()
 	return untrackable