Merge pull request #4234 from Novacat/nova-heterochromia

Tactical Kittens

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)
 		)

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

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)
+

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.
 */

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/item/weapon/grenade/spawnergrenade/spirit
+}
+
 # ######## U CKEYS
 # ######## V CKEYS
 {