diff --git a/code/game/objects/effects/semirandom_mobs_vr.dm b/code/game/objects/effects/semirandom_mobs_vr.dm index a60d003c0c..556a2f7106 100644 --- a/code/game/objects/effects/semirandom_mobs_vr.dm +++ b/code/game/objects/effects/semirandom_mobs_vr.dm @@ -752,6 +752,7 @@ var/global/list/semirandom_mob_spawner_decisions = list() list(/mob/living/simple_mob/vore/aggressive/rat) = 100, list(/mob/living/simple_mob/vore/bee) = 100, list(/mob/living/simple_mob/vore/catgirl) = 100, + list(/mob/living/simple_mob/vore/wolftaur) = 100, list(/mob/living/simple_mob/vore/cookiegirl) = 100, list(/mob/living/simple_mob/vore/fennec) = 100, list(/mob/living/simple_mob/vore/fennix) = 50, diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/catgirl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/catgirl.dm index ac65c8b8bc..96c3143123 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/catgirl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/catgirl.dm @@ -35,6 +35,8 @@ "catgirlbrown" ) + faction = "catgirl" + /mob/living/simple_mob/vore/catgirl/New() ..() if(random_skin) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm index df106b4e1d..6e4440a148 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm @@ -21,6 +21,8 @@ say_list_type = /datum/say_list/cookiegirl ai_holder_type = /datum/ai_holder/simple_mob/passive/cookiegirl + faction = "cookiegirl" + // Activate Noms! /mob/living/simple_mob/vore/cookiegirl vore_active = 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm b/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm index fbd0f938af..912ae09a09 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm @@ -24,6 +24,7 @@ default_pixel_x = -16 pixel_x = -16 pixel_y = 0 + faction = "lamia" // Vore tags vore_active = 1 @@ -150,7 +151,7 @@ icon_living = "albino_bra" icon_rest = "albino_bra_rest" icon_dead = "albino_bra_dead" - + /mob/living/simple_mob/vore/lamia/albino/shirt desc = "Combination snake-human. This one is albino. They're wearing a shirt." icon_state = "albino_shirt" @@ -173,7 +174,7 @@ icon_living = "cobra_bra" icon_rest = "cobra_bra_rest" icon_dead = "cobra_bra_dead" - + /mob/living/simple_mob/vore/lamia/cobra/shirt desc = "Combination snake-human. This one looks like a cobra. They're wearing a shirt." icon_state = "cobra_shirt" @@ -196,7 +197,7 @@ icon_living = "copper_bra" icon_rest = "copper_bra_rest" icon_dead = "copper_bra_dead" - + /mob/living/simple_mob/vore/lamia/copper/shirt desc = "Combination snake-human. This one is copper. They're wearing a shirt." icon_state = "copper_shirt" @@ -219,7 +220,7 @@ icon_living = "green_bra" icon_rest = "green_bra_rest" icon_dead = "green_bra_dead" - + /mob/living/simple_mob/vore/lamia/green/shirt desc = "Combination snake-human. This one is green. They're wearing a shirt." icon_state = "green_shirt" @@ -242,7 +243,7 @@ icon_living = "zebra_bra" icon_rest = "zebra_bra_rest" icon_dead = "zebra_bra_dead" - + /mob/living/simple_mob/vore/lamia/zebra/shirt desc = "Combination snake-human. This one has a zebra pattern. They're wearing a shirt." icon_state = "zebra_shirt" @@ -281,7 +282,7 @@ GLOBAL_LIST_INIT(valid_random_lamias, list( icon_living = initial(new_attrs.icon_living) icon_rest = initial(new_attrs.icon_rest) icon_dead = initial(new_attrs.icon_dead) - + vore_default_mode = initial(new_attrs.vore_default_mode) vore_digest_chance = initial(new_attrs.vore_digest_chance) vore_pounce_chance = initial(new_attrs.vore_pounce_chance) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm new file mode 100644 index 0000000000..beb9c36afe --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm @@ -0,0 +1,127 @@ +/mob/living/simple_mob/vore/wolftaur + name = "wolftaur" + desc = "A large creature with a humanoid upperbody and more feral formed lower body, with four legs and two arms." + + icon_state = "wolftaurwhite" + icon = 'icons/mob/vore64x32.dmi' + + harm_intent_damage = 5 + melee_damage_lower = 2 + melee_damage_upper = 5 + + response_help = "heavily pets" + response_disarm = "shoves" + response_harm = "bites" + + attacktext = list("kicked","bit") + + say_list_type = /datum/say_list/wolftaur + ai_holder_type = /datum/ai_holder/simple_mob/retaliate/wolftaur + + var/random_skin = 1 + var/list/skins = list( + "wolftaurwhite", + "wolftaurwhitec", + "wolftaurbrown", + "wolftaurbrownc", + "wolftaurblack", + "wolftaurblackc", + "wolftaurwood", + "wolftaurwoodc", + "wolftaurdark" + ) + + old_x = -16 + old_y = 0 + default_pixel_x = -16 + pixel_x = -16 + pixel_y = 0 + faction = "wolftaur" + +/mob/living/simple_mob/vore/wolftaur/New() + ..() + if(random_skin) + icon_living = pick(skins) + icon_rest = "[icon_living]_rest" + icon_dead = "[icon_living]-dead" + update_icon() + var/oursize = rand(100, 140) / 100 + resize(oursize) + +// Activate Noms! +/mob/living/simple_mob/vore/wolftaur + vore_active = 1 + vore_bump_chance = 10 + vore_pounce_chance = 50 + vore_standing_too = 1 + vore_ignores_undigestable = 0 // Catgirls just want to eat yoouuu + vore_default_mode = DM_DIGEST // Chance that catgirls just wanna bellycuddle yoouuuu! + vore_digest_chance = 25 // But squirming might make them gurgle... + vore_icons = SA_ICON_LIVING | SA_ICON_REST + +/datum/say_list/wolftaur + speak = list("Grrr.","Huff","What do you want?","Hmm.","One thing after another.","Where's the food?") + emote_hear = list("grumbles","barks","sighs") + emote_see = list("shakes her head","stomps","stretches","rolls her eyes") + +/datum/ai_holder/simple_mob/retaliate/wolftaur + base_wander_delay = 8 + +/mob/living/simple_mob/vore/wolftaur/init_vore() + ..() + var/obj/belly/B = vore_selected + B.name = "stomach" + B.desc = "After a gruelling compressive traversal down through the taur's gullet, you briefly get deposited in an oppressively tight stomach at it's humanoid waist. However, the wolf has little interest in keeping you here, instead treating you as a mere snack, an orifice opens beneath you and you're soon dragged deeper into her depths. Soon you're splashing into an active, waiting caustic slurry, and the world around you drops as though you're trapped in a hammock. The taur's underbelly sags with your weight, and you feel a heavy pat from the woman outside settling in to make the most of her meal." + B.mode_flags = DM_FLAG_THICKBELLY + B.belly_fullscreen = "yet_another_tumby" + B.digest_brute = 2 + B.digest_burn = 2 + B.digest_oxy = 1 + B.digestchance = 100 + B.absorbchance = 0 + B.escapechance = 5 + B.selective_preference = DM_DIGEST + B.escape_stun = 5 + +/mob/living/simple_mob/vore/wolftaur/clown + name = "wolftaur" + desc = "What the hell is this outfit!?" + icon_state = "wolftaurclown" + random_skin = 0 + +/mob/living/simple_mob/vore/wolftaur/white + icon_state = "wolftaurwhite" + random_skin = 0 + +/mob/living/simple_mob/vore/wolftaur/whiteclothed + icon_state = "wolftaurwhitec" + random_skin = 0 + +/mob/living/simple_mob/vore/wolftaur/brown + icon_state = "wolftaurbrown" + random_skin = 0 + +/mob/living/simple_mob/vore/wolftaur/brownclothed + icon_state = "wolftaurbrownc" + random_skin = 0 + +/mob/living/simple_mob/vore/wolftaur/black + icon_state = "wolftaurblack" + random_skin = 0 + +/mob/living/simple_mob/vore/wolftaur/blackclothed + icon_state = "wolftaurblackc" + random_skin = 0 + +/mob/living/simple_mob/vore/wolftaur/red + icon_state = "wolftaurwood" + random_skin = 0 + +/mob/living/simple_mob/vore/wolftaur/redclothed + icon_state = "wolftaurwoodc" + random_skin = 0 + +/mob/living/simple_mob/vore/wolftaur/dark + icon_state = "wolftaurdark" + random_skin = 0 + diff --git a/icons/mob/vore64x32.dmi b/icons/mob/vore64x32.dmi index 62fe533917..93115c62cc 100644 Binary files a/icons/mob/vore64x32.dmi and b/icons/mob/vore64x32.dmi differ diff --git a/vorestation.dme b/vorestation.dme index f5eea9f9e3..d45f0f0880 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1644,6 +1644,7 @@ #include "code\game\turfs\simulated\floor_types_eris.dm" #include "code\game\turfs\simulated\floor_types_vr.dm" #include "code\game\turfs\simulated\lava.dm" +#include "code\game\turfs\simulated\underwater.dm" #include "code\game\turfs\simulated\wall_attacks.dm" #include "code\game\turfs\simulated\wall_icon.dm" #include "code\game\turfs\simulated\wall_types.dm" @@ -3252,6 +3253,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\vore\weretiger.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\wolf.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\wolfgirl.dm" +#include "code\modules\mob\living\simple_mob\subtypes\vore\wolftaur.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\xeno_vore.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\zz_vore_overrides.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\_defines.dm"