Merge pull request #15413 from SatinIsle/edible_mobs

Edible retaliate mobs
This commit is contained in:
Heroman3003
2023-09-24 06:47:16 +10:00
committed by GitHub
11 changed files with 18 additions and 6 deletions
@@ -131,6 +131,7 @@
retaliate = TRUE
speak_chance = 0.5
wander = TRUE
belly_attack = FALSE
/mob/living/simple_mob/vore/alienanimals/catslug/Initialize()
. = ..()
@@ -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
@@ -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"
@@ -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(
@@ -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
@@ -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(
@@ -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(
@@ -30,6 +30,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)
@@ -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()
..()