diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 8225a8a258e..e6a53568403 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -421,19 +421,22 @@ var/list/holder_mob_icon_cache = list() icon_state = "kitten" icon_state_dead = "cat_kitten_dead" item_state = "kitten" + /obj/item/holder/cat/penny name = "Penny" desc = "An important cat, straight from Central Command." icon_state = "penny" icon_state_dead = "penny_dead" item_state = "penny" + /obj/item/holder/cat/crusher name = "Crusher" desc = "The Medbay's newest mascot. Lovely." - icon_state = "styx" - icon_state_dead = "styx_dead" - item_state = "styx" + icon_state = "crusher" + icon_state_dead = "crusher_dead" + item_state = "crusher" slot_flags = SLOT_HEAD + /obj/item/holder/carp/baby name = "baby space carp" desc = "Awfully cute! Looks friendly!" diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index b6e89767379..e4419fa27c3 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -332,17 +332,17 @@ icon_rest = "penny_rest" holder_type = /obj/item/holder/cat/penny -/mob/living/simple_animal/cat/crusher // Goodbye Runtime, make way for the new girl in town. +/mob/living/simple_animal/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 = "styx" - icon_state = "styx" - icon_living = "styx" - icon_dead = "styx_dead" - icon_rest = "styx_rest" - can_nap = 1 + icon_state = "crusher" + icon_state = "crusher" + icon_living = "crusher" + icon_dead = "crusher_dead" + icon_rest = "crusher_rest" + can_nap = TRUE holder_type = /obj/item/holder/cat/crusher /mob/living/simple_animal/cat/crusher/examine(mob/user) diff --git a/icons/mob/npc/pets.dmi b/icons/mob/npc/pets.dmi index 0ad73499b7f..b88b65f2cad 100644 Binary files a/icons/mob/npc/pets.dmi and b/icons/mob/npc/pets.dmi differ