Merge pull request #11868 from bgobandit/diditallforthelewdbe

Adds kitty mousey toys!

code/datums/supplypacks.dm

@@ -848,7 +848,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	name = "Cat Crate"
 	cost = 50 //Cats are worth as much as corgis.
 	containertype = /obj/structure/closet/critter/cat
-	contains = list(/obj/item/clothing/tie/petcollar)
+	contains = list(/obj/item/clothing/tie/petcollar,
+                    /obj/item/toy/cattoy)
 	containername = "cat crate"
 
 /datum/supply_packs/organic/pug

code/game/objects/items/toys.dm

@@ -17,6 +17,7 @@
  *		Toy big red button
  *		Beach ball
  *		Toy xeno
+ *      Kitty toys!
  */
 
 
@@ -1202,3 +1203,13 @@
 	else
 		user << "<span class='warning'>The string on [src] hasn't rewound all the way!</span>"
 		return
+
+// TOY MOUSEYS :3 :3 :3
+
+/obj/item/toy/cattoy
+	name = "toy mouse"
+	desc = "A colorful toy mouse!"
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "toy_mouse"
+	w_class = 2.0
+	var/cooldown = 0

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -20,6 +20,8 @@
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"
+	var/turns_since_scan = 0
+	var/mob/living/simple_animal/mouse/movement_target
 	gold_core_spawnable = 2
 
 //RUNTIME IS ALIVE! SQUEEEEEEEE~
@@ -30,11 +32,9 @@
 	icon_living = "cat"
 	icon_dead = "cat_dead"
 	gender = FEMALE
-	var/turns_since_scan = 0
-	var/mob/living/simple_animal/mouse/movement_target
 	gold_core_spawnable = 0
 
-/mob/living/simple_animal/pet/cat/Runtime/Life()
+/mob/living/simple_animal/pet/cat/Life()
 	//MICE!
 	if((src.loc) && isturf(src.loc))
 		if(!stat && !resting && !buckled)
@@ -45,6 +45,10 @@
 					movement_target = null
 					stop_automated_movement = 0
 					break
+			for(var/obj/item/toy/cattoy/T in view(1,src))
+				if (T.cooldown < (world.time - 400))
+					emote("me", 1, "bats \the [T] around with its paw!")
+					T.cooldown = world.time
 
 	..()