Cats n Dogs

code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm

@@ -33,6 +33,9 @@ var/global/list/_cat_default_emotes = list(
 	tt_desc = "E Felis silvestris catus"
 	icon_state = "cat2"
 	item_state = "cat2"
+	icon_living = "cat2"
+	icon_dead = "cat2_dead"
+	icon_rest = "cat2_rest"
 
 	movement_cooldown = 0.5 SECONDS
 
@@ -127,6 +130,9 @@ var/global/list/_cat_default_emotes = list(
 	gender = FEMALE
 	icon_state = "cat"
 	item_state = "cat"
+	icon_living = "cat"
+	icon_dead = "cat_dead"
+	icon_rest = "cat_rest"
 	named = TRUE
 	holder_type = /obj/item/holder/cat/runtime
 
@@ -135,6 +141,9 @@ var/global/list/_cat_default_emotes = list(
 	desc = "D'aaawwww!"
 	icon_state = "kitten"
 	item_state = "kitten"
+	icon_living = "kitten"
+	icon_dead = "kitten_dead"
+	icon_rest = "kitten_rest"
 	gender = NEUTER
 
 /mob/living/simple_mob/animal/passive/cat/kitten/Initialize()
@@ -153,15 +162,41 @@ var/global/list/_cat_default_emotes = list(
 	gender = MALE
 	icon_state = "cat3"
 
+/obj/item/holder/cat/penny
+
 /mob/living/simple_mob/animal/passive/cat/bones
 	name = "Bones"
 	desc = "That's Bones the cat. He's a laid back, black cat. Meow."
 	gender = MALE
 	icon_state = "cat3"
 	item_state = "cat3"
+	icon_living = "cat3"
+	icon_dead = "cat3_dead"
+	icon_rest = "cat3_rest"
 	named = TRUE
 	holder_type = /obj/item/holder/cat/fluff/bones
 
+/mob/living/simple_mob/animal/passive/cat/penny
+	name = "Penny"
+	desc = "An important cat, straight from Central Command."
+	named = TRUE
+	icon_state = "penny"
+	item_state = "penny"
+	icon_living = "penny"
+	icon_dead = "penny_dead"
+	icon_rest = "penny_rest"
+
+/mob/living/simple_mob/animal/passive/cat/crusher
+	name = "Crusher"
+	desc = "A cream coloured, young, and cuddly cat, with a small tag on her collar that says \"Dr. Crusher\". She never lets an opportunity pass to receive some pets or prey on some unsuspecting mice."
+	named = TRUE
+	gender = FEMALE
+	icon_state = "crusher"
+	icon_state = "crusher"
+	icon_living = "crusher"
+	icon_dead = "crusher_dead"
+	icon_rest = "crusher_rest"
+
 /datum/say_list/cat
 	speak = list("Meow!","Esp!","Purr!","HSSSSS")
 	emote_hear = list("meows","mews")
@@ -199,4 +234,4 @@ var/global/list/_cat_default_emotes = list(
 	qdel(src)
 
 /obj/item/cat_box/black
-	cattype = /mob/living/simple_mob/animal/passive/cat/black
+	cattype = /mob/living/simple_mob/animal/passive/cat/black

code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm

@@ -64,15 +64,10 @@
 	return
 
 
-
-
 /obj/item/reagent_containers/food/snacks/meat/corgi
 	name = "corgi meat"
 	desc = "Tastes like... well, you know..."
 
-
-
-
 /datum/say_list/dog
 	speak = list("YAP", "Woof!", "Bark!", "AUUUUUU")
 	emote_hear = list("barks", "woofs", "yaps","pants")
@@ -114,6 +109,9 @@
 	real_name = "Ian"	//Intended to hold the name without altering it.
 	gender = MALE
 	desc = "It's a corgi."
+	icon_state = "ian"
+	icon_living = "ian"
+	icon_dead = "ian_dead"
 	var/turns_since_scan = 0
 	var/obj/movement_target
 
@@ -244,5 +242,27 @@
 	icon_living = "brittany"
 	icon_dead = "brittany_dead"
 
+/mob/living/simple_mob/animal/passive/dog/german
+	name = "german shepherd"
+	real_name = "german shepherd"
+	desc = "It's a german sherpherd."
+	icon_state = "german"
+	icon_living = "german"
+	icon_dead = "german_dead"
+
+/mob/living/simple_mob/animal/passive/dog/german/columbo
+	desc = "It's a german sherpherd. This one is wearing a security vest."
+	icon_state = "columbo"
+	icon_living = "columbo"
+	icon_dead = "columbo_dead"
+
+/mob/living/simple_mob/animal/passive/dog/pug
+	name = "pug"
+	real_name = "pug"
+	desc = "It's a pug."
+	icon_state = "pug"
+	icon_living = "pug"
+	icon_dead = "pug_dead"
+
 /decl/mob_organ_names/corgi
-	hit_zones = list("head", "body", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "tail", "heart") //You monster.
+	hit_zones = list("head", "body", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "tail", "heart") //You monster.