From 61cf24f087f85f87d490d8cb0754fbfce1360bef Mon Sep 17 00:00:00 2001
From: Ren Erthilo <erthilo@gmail.com>
Date: Tue, 1 May 2012 02:59:20 +0100
Subject: [PATCH] Fixes custom item name.

---
 code/modules/customitems/item_defines.dm |  2 +-
 code/modules/mob/mob.dm                  | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 09a5e9e2523..67b1fcde752 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -82,7 +82,7 @@
 	desc = "It's a cool looking pen. Lots of colors!"
 
 /obj/item/weapon/pen/fluff/fancypen
-	name = "multicolor pen"
+	name = "fancy pen"
 	desc = "A fancy metal pen. It uses blue ink. An inscription on one side reads,\"L.L. - L.R.\""
 	icon = 'custom_items.dmi'
 	icon_state = "fancypen"
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index c0e5ba7dd00..066eb4ccbd4 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -501,6 +501,16 @@
 		del(M)
 		return
 
+
+
+	if(client && client.holder && (client.holder.state == 2))
+		client.admin_play()
+		return
+
+	M.key = client.key
+	M.Login()
+	return
+
 /mob/verb/cmd_rules()
 	set name = "Rules"
 	set category = "OOC"