diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 9a0d89eb583..8225a8a258e 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -421,14 +421,19 @@ 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" + 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 8de63709457..b6e89767379 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -331,3 +331,21 @@ icon_dead = "penny_dead" 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. + 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 + holder_type = /obj/item/holder/cat/crusher + +/mob/living/simple_animal/cat/crusher/examine(mob/user) + ..() + if(stat == DEAD) + to_chat(user, "Crusher's dead. How could this have happened? She counted on you!") diff --git a/html/changelogs/KingOfThePing - 13789.yml b/html/changelogs/KingOfThePing - 13789.yml new file mode 100644 index 00000000000..770fb89f7e1 --- /dev/null +++ b/html/changelogs/KingOfThePing - 13789.yml @@ -0,0 +1,6 @@ +author: KingOfThePing, RyverStyx + +delete-after: True + +changes: + - rscadd: "Added the new Medbay pet Crusher's sprites and code." diff --git a/icons/mob/npc/pets.dmi b/icons/mob/npc/pets.dmi index 8e5ae8332f5..0ad73499b7f 100644 Binary files a/icons/mob/npc/pets.dmi and b/icons/mob/npc/pets.dmi differ diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 260ac61affe..edbce5df01a 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -268,7 +268,7 @@ "az" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/hologram/holopad, -/mob/living/simple_animal/cat/fluff/Runtime, +/mob/living/simple_animal/cat/crusher, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "aA" = (