From 514b6b954d7498c8aa8c92158d8c2d5ea1b229c3 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Fri, 4 Aug 2023 21:13:28 -0400 Subject: [PATCH 1/3] More adjustments Makes it so the mobs with vore_hostile will only be hostile when their capacity isn't full --- code/modules/ai/ai_holder_targeting_vr.dm | 5 +++++ .../simple_mob/subtypes/animal/alien animals/stardog.dm | 1 + 2 files changed, 6 insertions(+) diff --git a/code/modules/ai/ai_holder_targeting_vr.dm b/code/modules/ai/ai_holder_targeting_vr.dm index 7e9c5c937ed..0828e1b468b 100644 --- a/code/modules/ai/ai_holder_targeting_vr.dm +++ b/code/modules/ai/ai_holder_targeting_vr.dm @@ -21,6 +21,11 @@ /datum/ai_holder/simple_mob/vore/find_target(list/possible_targets, has_targets_list) if(!vore_hostile) return ..() + if(!isanimal(holder)) //Only simplemobs have the vars we need + return ..() + var/mob/living/simple_mob/H = holder + if(H.vore_fullness >= H.vore_capacity) //Don't beat people up if we're full + return ..() ai_log("find_target() : Entered.", AI_LOG_TRACE) . = list() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm index 20fa09a3712..41474bef5a3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm @@ -1333,6 +1333,7 @@ if(isobserver(AM)) return playsound(src, teleport_sound, vol = 100, vary = 1, preference = /datum/client_preference/eating_noises, volume_channel = VOLUME_CHANNEL_VORE) + playsound(target, teleport_sound, vol = 100, vary = 1, preference = /datum/client_preference/eating_noises, volume_channel = VOLUME_CHANNEL_VORE) if(isliving(AM)) var/mob/living/L = AM if(teleport_message && L.client) From 2b9bc910b6fde38a5e50f42882ed58b848854cc0 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Fri, 4 Aug 2023 21:21:44 -0400 Subject: [PATCH 2/3] 2121 --- .../mob/living/simple_mob/subtypes/vore/vore_hostile.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm index adaa040c43d..0d765501581 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm @@ -168,7 +168,7 @@ vore_ignores_undigestable = 0 vore_default_mode = DM_SELECT vore_icons = SA_ICON_LIVING - vore_stomach_name = "Stomach" + vore_stomach_name = "stomach" vore_default_item_mode = IM_DIGEST vore_pounce_chance = 75 vore_pounce_cooldown = 10 @@ -191,7 +191,7 @@ /mob/living/simple_mob/vore/vore_hostile/leaper/init_vore() ..() var/obj/belly/B = vore_selected - B.name = "interior" + B.name = "stomach" B.desc = "The flesh of the tall creature's stomach folds over you in doughy waves, squeezing you into the tightest shape it can manage with idle flexes churning down on you. Your limbs often find themselves lost between folds and tugged this way or that, held in a skin tight press that is not painful, but is hard to pull away from. You can see a strange, glittering pink and purple light glimmering through the flesh of the monster all around you, like your very own sea of stars. The walls rush in to fill all the space, squeezing you from head to toe no matter how you might wiggle, the weight of the semi-transparent interior flesh keeping you neatly secured deep inside while wringing the fight out of you." B.mode_flags = DM_FLAG_THICKBELLY | DM_FLAG_NUMBING B.belly_fullscreen = "yet_another_tumby" From 2f44c03e5e2e5d3911284b74e62e0efee1199d89 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Fri, 4 Aug 2023 21:33:30 -0400 Subject: [PATCH 3/3] stats c: --- .../living/simple_mob/subtypes/animal/alien animals/stardog.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm index 41474bef5a3..e7e0e9ecca7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm @@ -1317,6 +1317,7 @@ return L.stop_pulling() L.Weaken(3) + GLOB.prey_eaten_roundstat++ if(target.reciever) //We don't have to worry AM.unbuckle_all_mobs(TRUE) AM.forceMove(get_turf(target)) @@ -1376,6 +1377,7 @@ if(dog.client) to_chat(dog, "[I.thrower ? "\The [I.thrower]" : "Someone"] feeds \the [I] to you!") qdel(I) + GLOB.items_digested_roundstat++ /obj/effect/dog_teleporter/reciever name = "exit" @@ -1528,6 +1530,7 @@ how_much = how_much / 10 //Braindead mobs are worth less linked_mob.adjust_nutrition(how_much) H.mind?.vore_death = TRUE + GLOB.prey_digested_roundstat++ spawn(0) qdel(H) //glorp return