Merge pull request #1193 from Fox-McCloud/mobs-pets-stuffs

Simple Animal Refactor+Update+Fixes and Pet Collars

code/game/objects/items/random_items.dm

@@ -301,12 +301,12 @@
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 		if(istype(W, /obj/item/weapon/crowbar))
-			var/mob/living/simple_animal/cat/Cat1 = new(loc)
+			var/mob/living/simple_animal/pet/cat/Cat1 = new(loc)
 			Cat1.apply_damage(250)//,TOX)
 			Cat1.name = "Schrodinger's Cat"
 			Cat1.desc = "It seems it's been dead for a while."
 
-			var/mob/living/simple_animal/cat/Cat2 = new(loc)
+			var/mob/living/simple_animal/pet/cat/Cat2 = new(loc)
 			Cat2.name = "Schrodinger's Cat"
 			Cat2.desc = "It's was alive the whole time!"
 			sleep(2)

code/game/objects/items/weapons/grenades.dm

@@ -389,7 +389,7 @@
 /obj/item/weapon/grenade/clusterbuster/fluffy
 	name = "Fluffy Love Bomb"
 	desc = "Exactly as snuggly as it sounds."
-	payload = /mob/living/simple_animal/corgi/puppy
+	payload = /mob/living/simple_animal/pet/corgi/puppy
 
 /obj/item/weapon/grenade/clusterbuster/prime()
 	var/numspawned = rand(4,8)