From 6d5fc55299412b5084877c770182d6d3946fa748 Mon Sep 17 00:00:00 2001 From: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Date: Fri, 22 Aug 2025 11:23:16 -0400 Subject: [PATCH] Shuts up mobs that aren't near anyone (#30186) * Shuts up mobs that aren't near anyone * Hivebots too --- code/datums/ai/basic_mobs/basic_subtrees/random_speech.dm | 5 ++++- code/modules/mob/living/basic/hostile/hivebot_ai.dm | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/code/datums/ai/basic_mobs/basic_subtrees/random_speech.dm b/code/datums/ai/basic_mobs/basic_subtrees/random_speech.dm index faaf5d458db..85d0a71b588 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/random_speech.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/random_speech.dm @@ -28,7 +28,10 @@ /datum/ai_planning_subtree/random_speech/select_behaviors(datum/ai_controller/controller, seconds_per_tick) if(!SPT_PROB(speech_chance, seconds_per_tick)) return - speak(controller) + for(var/mob/living/listener in hearers(11, controller.pawn)) + if(listener.client && listener.stat != DEAD) + speak(controller) + return /// Actually perform an action /datum/ai_planning_subtree/random_speech/proc/speak(datum/ai_controller/controller) diff --git a/code/modules/mob/living/basic/hostile/hivebot_ai.dm b/code/modules/mob/living/basic/hostile/hivebot_ai.dm index e66e357c1a4..92c04081f81 100644 --- a/code/modules/mob/living/basic/hostile/hivebot_ai.dm +++ b/code/modules/mob/living/basic/hostile/hivebot_ai.dm @@ -43,9 +43,11 @@ if(!SPT_PROB(relay_chance, seconds_per_tick)) return - if(controller.blackboard_key_exists(BB_HIVE_PARTNER)) - controller.queue_behavior(/datum/ai_behavior/relay_message, BB_HIVE_PARTNER) - return SUBTREE_RETURN_FINISH_PLANNING + for(var/mob/living/listener in hearers(11, controller.pawn)) + if(listener.client && listener.stat != DEAD) + if(controller.blackboard_key_exists(BB_HIVE_PARTNER)) + controller.queue_behavior(/datum/ai_behavior/relay_message, BB_HIVE_PARTNER) + return SUBTREE_RETURN_FINISH_PLANNING controller.queue_behavior(/datum/ai_behavior/find_and_set/hive_partner, BB_HIVE_PARTNER, /mob/living/basic/hivebot) /datum/ai_behavior/find_and_set/hive_partner