diff --git a/code/modules/ai/ai_holder_subtypes/simple_mob_ai.dm b/code/modules/ai/ai_holder_subtypes/simple_mob_ai.dm index 7b1fbcb9ba..c23a4d92e6 100644 --- a/code/modules/ai/ai_holder_subtypes/simple_mob_ai.dm +++ b/code/modules/ai/ai_holder_subtypes/simple_mob_ai.dm @@ -18,6 +18,7 @@ can_flee = TRUE violent_breakthrough = FALSE base_wander_delay = 8 //vorestation edit, to make pets slow. + belly_attack = FALSE //They already don't fight back, so this ensures that catgirls and similar are still edible when they are spawned as retaliate or aggressive by semi-random mob spawners. // Won't wander away as quickly, ideal for event-spawned mobs like carp or drones. /datum/ai_holder/simple_mob/event @@ -150,6 +151,9 @@ /datum/ai_holder/simple_mob/retaliate/chill base_wander_delay = 8 +/datum/ai_holder/simple_mob/retaliate/edible + belly_attack = FALSE + // Simple mobs that retaliate and support others in their faction who get attacked. /datum/ai_holder/simple_mob/retaliate/cooperative cooperative = TRUE diff --git a/code/modules/ai/ai_holder_targeting_vr.dm b/code/modules/ai/ai_holder_targeting_vr.dm index 55f72530a4..24541a19a8 100644 --- a/code/modules/ai/ai_holder_targeting_vr.dm +++ b/code/modules/ai/ai_holder_targeting_vr.dm @@ -10,6 +10,9 @@ forgive_resting = TRUE cooperative = FALSE +/datum/ai_holder/simple_mob/vore/edible + belly_attack = FALSE + /datum/ai_holder/simple_mob/vore/micro_hunter micro_hunt = TRUE micro_hunt_size = 0.8 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index 3a3e506ebe..a6ed0c43c1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -133,6 +133,7 @@ retaliate = TRUE speak_chance = 0.5 wander = TRUE + belly_attack = FALSE /mob/living/simple_mob/vore/alienanimals/catslug/Initialize() . = ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm index 345e09da91..f8d3608cbe 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm @@ -40,7 +40,7 @@ attacktext = list("nipped", "squeaked at") friendly = list("nuzzles", "nibbles", "leans on") - ai_holder_type = /datum/ai_holder/simple_mob/retaliate + ai_holder_type = /datum/ai_holder/simple_mob/retaliate/edible has_langs = list(LANGUAGE_ANIMAL) say_list_type = /datum/say_list/squirrel diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bat.dm index ff24fc61c6..6d6328dfef 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bat.dm @@ -20,7 +20,7 @@ attacktext = list("bites","scratches") say_list_type = /datum/say_list/bat - ai_holder_type = /datum/ai_holder/simple_mob/retaliate + ai_holder_type = /datum/ai_holder/simple_mob/retaliate/edible faction = "vampire" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/peasant.dm b/code/modules/mob/living/simple_mob/subtypes/vore/peasant.dm index 24d331a19f..1bd10e9ee1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/peasant.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/peasant.dm @@ -17,7 +17,7 @@ attacktext = list("punched","kicked") say_list_type = /datum/say_list/peasant - ai_holder_type = /datum/ai_holder/simple_mob/retaliate + ai_holder_type = /datum/ai_holder/simple_mob/retaliate/edible var/random_skin = 1 var/list/skins = list( diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm index 6490075057..3777878e74 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm @@ -33,7 +33,7 @@ mount_offset_x = 0 say_list_type = /datum/say_list/sheep - ai_holder_type = /datum/ai_holder/simple_mob/retaliate + ai_holder_type = /datum/ai_holder/simple_mob/retaliate/edible // var/harvestable_wool = TRUE //Relating to wool growth and shearing down below. // var/wool_growth = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/succubi.dm b/code/modules/mob/living/simple_mob/subtypes/vore/succubi.dm index 221c5b2278..3b5d4f986d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/succubi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/succubi.dm @@ -17,7 +17,7 @@ attacktext = list("swatted","bapped") say_list_type = /datum/say_list/succubus - ai_holder_type = /datum/ai_holder/simple_mob/retaliate + ai_holder_type = /datum/ai_holder/simple_mob/retaliate/edible var/random_skin = 1 var/list/skins = list( diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm index 6c75e611cc..3d48855a6d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm @@ -18,7 +18,7 @@ attacktext = list("bites","sucks","drinks from") say_list_type = /datum/say_list/count - ai_holder_type = /datum/ai_holder/simple_mob/vore + ai_holder_type = /datum/ai_holder/simple_mob/vore/edible var/random_skin = 1 var/list/skins = list( diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolfgirl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolfgirl.dm index 55ca77dae4..1f959d0d0c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolfgirl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolfgirl.dm @@ -38,6 +38,9 @@ vore_pounce_chance = 40 vore_icons = SA_ICON_LIVING +/datum/ai_holder/simple_mob/retaliate/cooperative/wolfgirl + belly_attack = FALSE + /datum/ai_holder/simple_mob/retaliate/cooperative/wolfgirl/on_hear_say(mob/living/speaker, message) if(!speaker.client) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm index 5b52406360..857ac77ee9 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm @@ -66,6 +66,7 @@ /datum/ai_holder/simple_mob/retaliate/wolftaur base_wander_delay = 8 + belly_attack = FALSE /mob/living/simple_mob/vore/wolftaur/init_vore() if(!voremob_loaded) //CHOMPAdd