From 40a8a93550dc52c6d7d56dbb271dd8aa1a8063ee Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 10 Sep 2018 11:57:28 -0400 Subject: [PATCH 1/3] Tactical Kittens - Adds Ascian's Kitten flavor item - Changes normal kitten's inventory size, tactical kittens for everyone! https://forum.vore-station.net/viewtopic.php?f=27&t=1425 Ascian's kitten sprites are very placeholder right now, in the future I will probably try to get a unique sprite. --- .../crates_lockers/largecrate_vr.dm | 5 +++ .../mob/living/simple_animal/animals/cat.dm | 6 +++ .../living/simple_animal/animals/cat_vr.dm | 35 ++++++++++++++++++ config/custom_items.txt | 6 +++ icons/mob/custom_items_mob.dmi | Bin 0 -> 6164 bytes 5 files changed, 52 insertions(+) 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..44fa570e0d0ac56cb7c377cc73e60eb1288c30c4 100644 GIT binary patch literal 6164 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 O08KS*)#}HVVgCgz8MV&< literal 0 HcmV?d00001 From f212d109a4b457aec3ac044a846b6fe47c4152d5 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 10 Sep 2018 15:53:42 -0400 Subject: [PATCH 2/3] Medical hardsuit bugfix Dylovene having a different internal name irks me --- code/modules/clothing/spacesuits/rig/modules/utility_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/rig/modules/utility_vr.dm b/code/modules/clothing/spacesuits/rig/modules/utility_vr.dm index 21fe6fb9cf..6c5bc743df 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility_vr.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility_vr.dm @@ -109,7 +109,7 @@ charges = list( list("inaprovaline", "inaprovaline", 0, 20), - list("dylovene", "dylovene", 0, 20), + list("anti_toxin", "anti_toxin", 0, 20), list("paracetamol", "paracetamol", 0, 20), list("dexalin", "dexalin", 0, 20) ) From dbb362820f1b4dfc55006b2a79aaeb4ba6ee1fed Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 27 Sep 2018 18:40:12 -0400 Subject: [PATCH 3/3] Changes to use spawner grenade --- .../game/objects/structures/crates_lockers/largecrate_vr.dm | 5 ----- code/modules/vore/fluffstuff/custom_boxes_vr.dm | 6 ++++++ config/custom_items.txt | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index c6e8ed6606..d6622e2591 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -133,8 +133,3 @@ 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/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index 3aec6baf83..82de70bdac 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -226,6 +226,12 @@ /obj/item/clothing/accessory/medal/bronze_heart, /obj/item/clothing/gloves/ring/seal/signet/fluff/vietsi) +// Tabiranth: Ascian +/obj/item/weapon/grenade/spawnergrenade/spirit + name = "spirit's pet carrier" + desc = "Contains kitten." + spawner_type = /mob/living/simple_animal/cat/fluff/tabiranth + deliveryamt = 1 /* Swimsuits, for general use, to avoid arriving to work with your swimsuit. */ diff --git a/config/custom_items.txt b/config/custom_items.txt index dcb58809ed..8ae35d6da3 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -828,7 +828,7 @@ item_path: /obj/item/clothing/head/fluff/runac { ckey: tabiranth character_name: Ascian -item_path: /obj/structure/largecrate/animal/tabiranth +item_path: /obj/item/weapon/grenade/spawnergrenade/spirit } # ######## U CKEYS