From 514b6b954d7498c8aa8c92158d8c2d5ea1b229c3 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Fri, 4 Aug 2023 21:13:28 -0400 Subject: [PATCH] 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 7e9c5c937e..0828e1b468 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 20fa09a371..41474bef5a 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)