Most hostile mobs can no longer be trapped by closets, chairs, and aggro grabs (#91652)

This commit is contained in:
Jacquerel
2025-06-21 02:21:22 +01:00
committed by GitHub
parent 897909e7d0
commit e3dee6810e
114 changed files with 262 additions and 296 deletions
@@ -12,6 +12,7 @@
ai_movement = /datum/ai_movement/jps/bot
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/respond_to_summon,
/datum/ai_planning_subtree/salute_authority,
/datum/ai_planning_subtree/find_patrol_beacon,
@@ -14,6 +14,7 @@
BB_FRIENDLY_MESSAGE = "empathetically acknowledges your hardwork and tough circumstances",
)
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/respond_to_summon,
/datum/ai_planning_subtree/pet_planning/cleanbot,
/datum/ai_planning_subtree/cleaning_subtree,
@@ -37,7 +38,6 @@
BB_CLEANABLE_DRAWINGS = CLEANBOT_CLEAN_DRAWINGS,
BB_HUNTABLE_TRASH = CLEANBOT_CLEAN_TRASH,
)
ai_traits = PAUSE_DURING_DO_AFTER
/datum/ai_planning_subtree/pet_planning/cleanbot/SelectBehaviors(datum/ai_controller/basic_controller/bot/controller, seconds_per_tick)
var/mob/living/basic/bot/bot_pawn = controller.pawn
@@ -59,6 +59,7 @@
)
ai_movement = /datum/ai_movement/jps/bot
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/targeted_mob_ability/exenterate,
/datum/ai_planning_subtree/respond_to_summon,
@@ -6,6 +6,7 @@
BB_UNREACHABLE_LIST_COOLDOWN = 3 MINUTES,
)
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/respond_to_summon,
/datum/ai_planning_subtree/extinguishing_people,
/datum/ai_planning_subtree/extinguishing_turfs,
@@ -5,6 +5,7 @@
BB_ALWAYS_IGNORE_FACTION = TRUE,
)
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/respond_to_summon,
/datum/ai_planning_subtree/use_mob_ability/random_honk,
/datum/ai_planning_subtree/find_wanted_targets,
@@ -18,7 +19,6 @@
BB_PREVIOUS_BEACON_TARGET,
BB_BOT_SUMMON_TARGET,
)
ai_traits = PAUSE_DURING_DO_AFTER
/datum/ai_controller/basic_controller/bot/honkbot/TryPossessPawn(atom/new_pawn)
. = ..()
@@ -10,6 +10,7 @@
BB_WASH_FRUSTRATION = 0,
)
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/respond_to_summon,
/datum/ai_planning_subtree/handle_trash_talk,
/datum/ai_planning_subtree/wash_people,
@@ -1,6 +1,7 @@
#define BOT_PATIENT_PATH_LIMIT 20
/datum/ai_controller/basic_controller/bot/medbot
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/respond_to_summon,
/datum/ai_planning_subtree/handle_medbot_speech,
/datum/ai_planning_subtree/find_and_hunt_target/patients_in_crit,
@@ -15,7 +16,6 @@
BB_PREVIOUS_BEACON_TARGET,
BB_BOT_SUMMON_TARGET,
)
ai_traits = PAUSE_DURING_DO_AFTER
/datum/ai_movement/jps/bot/medbot
maximum_length = BOT_PATIENT_PATH_LIMIT
@@ -2,6 +2,7 @@
/datum/ai_controller/basic_controller/bot/repairbot
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/repairbot_speech,
/datum/ai_planning_subtree/mug_robot,
/datum/ai_planning_subtree/refill_materials,
@@ -25,7 +26,6 @@
BB_WELDER_TARGET,
BB_WINDOW_FRAMETARGET,
)
ai_traits = PAUSE_DURING_DO_AFTER
minimum_distance = 1
///subtree to refill our stacks
@@ -6,6 +6,7 @@
BB_VIBEBOT_BIRTHDAY_SONG = VIBEBOT_HAPPY_BIRTHDAY,
)
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/respond_to_summon,
/datum/ai_planning_subtree/find_party_friends,
/datum/ai_planning_subtree/find_patrol_beacon,
@@ -16,7 +17,6 @@
BB_VIBEBOT_PARTY_TARGET,
BB_BOT_SUMMON_TARGET,
)
ai_traits = PAUSE_DURING_DO_AFTER
/datum/ai_controller/basic_controller/bot/vibebot/TryPossessPawn(atom/new_pawn)
. = ..()