From c620bc93e9229388e8ffcac32580147fbdf9b2d1 Mon Sep 17 00:00:00 2001
From: Incoming5643 <incomingnumbers@gmail.com>
Date: Fri, 26 Feb 2016 18:42:54 -0500
Subject: [PATCH] Cleanup pull

Requests heeded.
Holodeck loophole somewhat hamfistedly fixed.
Bonus: One stealth homestuck reference removed.
---
 code/modules/mob/living/simple_animal/friendly/cat.dm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 9fece1d7e46..6fd58b097da 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -54,7 +54,7 @@
 //RUNTIME IS ALIVE! SQUEEEEEEEE~
 /mob/living/simple_animal/pet/cat/Runtime
 	name = "Runtime"
-	desc = "GCAT"
+	desc = "Tends to show up in the strangest of places."
 	icon_state = "cat"
 	icon_living = "cat"
 	icon_dead = "cat_dead"
@@ -65,6 +65,8 @@
 	var/memory_saved = 0
 
 /mob/living/simple_animal/pet/cat/Runtime/New()
+	if(lives > 9)
+		desc += " Looks like a cat with [lives] lives left."
 	Read_Memory()
 	..()
 
@@ -96,7 +98,7 @@
 
 	for(var/cat_type in family)
 		if(family[cat_type] > 0)
-			for(var/i = 0, i < family[cat_type], i++)
+			for(var/i in 1 to family[cat_type])
 				new cat_type(loc)
 
 /mob/living/simple_animal/pet/cat/Runtime/proc/Write_Memory(dead)
@@ -105,7 +107,7 @@
 		S["lives"] 				<< lives - 1
 	family = list()
 	for(var/mob/living/simple_animal/pet/cat/C in mob_list)
-		if(istype(C,type) || C.stat)
+		if(istype(C,type) || C.stat || !C.butcher_results) //That last one is a work around for hologram cats
 			continue
 		if(C.type in family)
 			family[C.type] += 1