diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index d6622e2591..c6e8ed6606 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -133,3 +133,8 @@ starts_with = list(pick(/mob/living/simple_animal/fennec, /mob/living/simple_animal/retaliate/fennix;0.5)) return ..() + +/obj/structure/largecrate/animal/tabiranth + name = "Spirit's Cat Carrier" + desc = "Contains kitten." + starts_with = list(/mob/living/simple_animal/cat/fluff/tabiranth) diff --git a/code/modules/mob/living/simple_animal/animals/cat.dm b/code/modules/mob/living/simple_animal/animals/cat.dm index ff3c982638..8877ea8959 100644 --- a/code/modules/mob/living/simple_animal/animals/cat.dm +++ b/code/modules/mob/living/simple_animal/animals/cat.dm @@ -173,6 +173,7 @@ icon_living = "kitten" icon_dead = "kitten_dead" gender = NEUTER + holder_type = /obj/item/weapon/holder/cat/kitten //VOREStation Edit // Leaving this here for now. /obj/item/weapon/holder/cat/fluff/bones @@ -196,3 +197,8 @@ /mob/living/simple_animal/cat/kitten/New() gender = pick(MALE, FEMALE) ..() + +// VOREStation Edit - Adds generic tactical kittens +/obj/item/weapon/holder/cat/kitten + icon_state = "kitten" + w_class = ITEMSIZE_SMALL diff --git a/code/modules/mob/living/simple_animal/animals/cat_vr.dm b/code/modules/mob/living/simple_animal/animals/cat_vr.dm index 9cb954f538..43d166af35 100644 --- a/code/modules/mob/living/simple_animal/animals/cat_vr.dm +++ b/code/modules/mob/living/simple_animal/animals/cat_vr.dm @@ -29,3 +29,38 @@ "Runtime purrs happily as you slowly slip away inside of her gut, your body's nutrients are then used to put a layer of padding on the now pudgy cat.", "The acids inside of Runtime's stomach, aided by the constant motions of the smooth walls surrounding you finally manage to melt you away into nothing more mush. She curls up on the floor, slowly kneading the air as her stomach moves its contents — including you — deeper into her digestive system.", "Your form begins to slowly soften and break apart, rounding out Runtime's swollen belly. The carnivorous cat rumbles and purrs happily at the feeling of such a filling meal.") + +// Ascian's Tactical Kitten +/obj/item/weapon/holder/cat/fluff/tabiranth + name = "Spirit" + desc = "A small, inquisitive feline, who constantly seems to investigate his surroundings." + gender = MALE + icon_state = "kitten" + w_class = ITEMSIZE_SMALL + +/mob/living/simple_animal/cat/fluff/tabiranth + name = "Spirit" + desc = "A small, inquisitive feline, who constantly seems to investigate his surroundings." + icon = 'icons/mob/custom_items_mob.dmi' + icon_state = "kitten" + item_state = "kitten" + icon_living = "kitten" + icon_dead = "kitten" //Teleports out + gender = MALE + holder_type = /obj/item/weapon/holder/cat/fluff/tabiranth + var/friend_name = "Ascian" + digestable = 0 + meat_amount = 0 + maxHealth = 50 + health = 50 + +//Emergency teleport - Until a spriter makes something better +/mob/living/simple_animal/cat/fluff/tabiranth/death(gibbed, deathmessage = "teleports away!") + overlays = list() + icon_state = "" + flick("kphaseout",src) + spawn(1 SECOND) + qdel(src) //Back from whence you came! + + . = ..(FALSE, deathmessage) + diff --git a/config/custom_items.txt b/config/custom_items.txt index 47258e40fb..dcb58809ed 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -825,6 +825,12 @@ character_name: Tony Bingham item_path: /obj/item/clothing/head/fluff/runac } +{ +ckey: tabiranth +character_name: Ascian +item_path: /obj/structure/largecrate/animal/tabiranth +} + # ######## U CKEYS # ######## V CKEYS { diff --git a/icons/mob/custom_items_mob.dmi b/icons/mob/custom_items_mob.dmi index e69de29bb2..44fa570e0d 100644 Binary files a/icons/mob/custom_items_mob.dmi and b/icons/mob/custom_items_mob.dmi differ