From ea2062e13f0e9b0b4efc68f1d032ba517ae697c2 Mon Sep 17 00:00:00 2001
From: "baloh.matevz" <baloh.matevz@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Fri, 16 Dec 2011 15:00:41 +0000
Subject: [PATCH] Possessing stuff now sends admin messages.

Possessing and then releasing something restores your original name. Works even if you possess several things one after another as well as if you release an object without having possessed it in the first place.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2699 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/mob/mob.dm     |  2 +-
 code/game/vials.dm          | 19 +++++++++++++++++++
 code/modules/admin/admin.dm |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/code/defines/mob/mob.dm b/code/defines/mob/mob.dm
index 5963403677..3e94edec2a 100644
--- a/code/defines/mob/mob.dm
+++ b/code/defines/mob/mob.dm
@@ -94,7 +94,7 @@
 	var/canmove = 1.0
 	var/eye_stat = null//Living, potentially Carbon
 
-
+	var/name_archive //For admin things like possession
 
 	var/timeofdeath = 0.0//Living
 	var/cpr_time = 1.0//Carbon
diff --git a/code/game/vials.dm b/code/game/vials.dm
index 5c298e0268..247777717a 100644
--- a/code/game/vials.dm
+++ b/code/game/vials.dm
@@ -277,6 +277,18 @@
 			usr << "It is forbidden to possess singularities."
 			return
 
+	var/turf/T = get_turf(O)
+
+	if(T)
+		log_admin("[key_name(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])")
+		message_admins("[key_name(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])", 1)
+	else
+		log_admin("[key_name(usr)] has possessed [O] ([O.type]) at an unknown location")
+		message_admins("[key_name(usr)] has possessed [O] ([O.type]) at an unknown location", 1)
+
+	if(!usr.control_object) //If you're not already possessing something...
+		usr.name_archive = usr.real_name
+
 	usr.loc = O
 	usr.real_name = O.name
 	usr.name = O.name
@@ -287,10 +299,17 @@
 	set name = "Release Obj"
 	set category = "Object"
 	//usr.loc = get_turf(usr)
+
+	if(usr.control_object && usr.name_archive) //if you have a name archived and if you are actually relassing an object
+		usr.real_name = usr.name_archive
+		usr.name = usr.real_name
+		usr.update_clothing() //So the name is updated properly
+
 	usr.loc = O.loc // Appear where the object you were controlling is -- TLE
 	usr.client.eye = usr
 	usr.control_object = null
 
+
 /proc/givetestverbs(mob/M as mob in world)
 	set desc = "Give this guy possess/release verbs"
 	set category = "Debug"
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index b3cfdc1c27..c24f87e0da 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -228,6 +228,7 @@
 					M << "\red<BIG><B>You have been banned by [usr.client.ckey].\nReason: [reason].</B></BIG>"
 					M << "\red This is a temporary ban, it will be removed in [mins] minutes."
 					feedback_inc("ban_tmp",1)
+					feedback_inc("ban_tmp_mins",mins)
 					if(config.banappeals)
 						M << "\red To try to resolve this matter head to [config.banappeals]"
 					else