From 147ca72f7cbef41577394ff178953b603fb21b6d Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Sun, 25 Jan 2015 15:08:17 -0500
Subject: [PATCH] Reorganizes custom item cat code

---
 code/modules/customitems/item_defines.dm      | 22 +++++++++++++------
 .../mob/living/simple_animal/friendly/cat.dm  |  8 -------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 9c1f589b2b..5267a80b99 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -1413,12 +1413,6 @@
 
 ////////////////////////////// Foxler - Erstatz Vryroxes /////////////////////////////////////////////////
 
-/obj/item/weapon/holder/cat/fluff/bones
-	name = "Bones"
-	desc = "It's Bones! Meow."
-	gender = MALE
-	icon_state = "cat3"
-
 //Use this subtype for spawning in the custom item.
 /obj/item/weapon/holder/cat/fluff/bones/custom_item
 
@@ -1427,6 +1421,12 @@
 		new/mob/living/simple_animal/cat/fluff/bones (src)
 	..()
 
+/obj/item/weapon/holder/cat/fluff/bones
+	name = "Bones"
+	desc = "It's Bones! Meow."
+	gender = MALE
+	icon_state = "cat3"
+
 /mob/living/simple_animal/cat/fluff/bones
 	name = "Bones"
 	desc = "That's Bones the cat. He's a laid back, black cat. Meow."
@@ -1435,4 +1435,12 @@
 	icon_living = "cat3"
 	icon_dead = "cat3_dead"
 	holder_type = /obj/item/weapon/holder/cat/fluff/bones
-	bff_name = "Erstatz Vryroxes"
+	var/bff_name = "Erstatz Vryroxes"
+
+/mob/living/simple_animal/cat/fluff/bones/handle_movement_target()
+	if (!bff)
+		for (var/mob/living/carbon/human/M in player_list)
+			if (M.real_name == bff_name)
+				bff = M
+				break
+	..()
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 01a44bce6d..67beb325de 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -83,16 +83,9 @@
 
 //Basic friend AI
 /mob/living/simple_animal/cat/fluff
-	var/bff_name
 	var/mob/living/carbon/human/bff
 
 /mob/living/simple_animal/cat/fluff/handle_movement_target()
-	if (!bff)
-		for (var/mob/living/carbon/human/M in player_list)
-			if (M.real_name == bff_name)
-				bff = M
-				break
-
 	if (bff)
 		var/follow_dist = 5
 		if (bff.stat >= DEAD || bff.health <= config.health_threshold_softcrit) //danger
@@ -167,7 +160,6 @@
 		return
 
 	bff = usr
-	bff_name = usr.real_name
 
 	set_dir(get_dir(src, bff))
 	say("Meow!")