cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jacquerel
2025-06-21 03:21:22 +02:00
committed by GitHub
parent 897909e7d0
commit e3dee6810e
114 changed files with 262 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/space_fauna/bear/bear_ai_subtree.dm
+1
View File
@@ -6,6 +6,7 @@
ai_movement = /datum/ai_movement/basic_avoidance
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/target_retaliate,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
code/modules/mob/living/basic/space_fauna/carp/carp_controllers.dm
+5 -2
View File
@@ -19,6 +19,7 @@
ai_movement = /datum/ai_movement/basic_avoidance
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/pet_planning,
/datum/ai_planning_subtree/simple_find_nearest_target_to_flee,
/datum/ai_planning_subtree/find_target_prioritize_traits,
@@ -42,6 +43,7 @@
BB_CARPS_FEAR_FISHERMAN = FALSE,
)
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/pet_planning,
/datum/ai_planning_subtree/simple_find_nearest_target_to_flee,
/datum/ai_planning_subtree/make_carp_rift/panic_teleport,
@@ -66,7 +68,7 @@
BB_TARGET_PRIORITY_TRAIT = TRAIT_SCARY_FISHERMAN,
BB_CARPS_FEAR_FISHERMAN = TRUE,
)
ai_traits = STOP_MOVING_WHEN_PULLED
ai_traits = PASSIVE_AI_FLAGS
planning_subtrees = list(
/datum/ai_planning_subtree/pet_planning,
/datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee,
@@ -85,6 +87,7 @@
*/
/datum/ai_controller/basic_controller/carp/ranged
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/pet_planning,
/datum/ai_planning_subtree/simple_find_nearest_target_to_flee,
/datum/ai_planning_subtree/find_target_prioritize_traits,
@@ -112,7 +115,7 @@
BB_CARPS_FEAR_FISHERMAN = TRUE,
BB_TARGET_ONLY_WITH_TRAITS = list(TRAIT_SCARY_FISHERMAN),
)
ai_traits = STOP_MOVING_WHEN_PULLED
ai_traits = PASSIVE_AI_FLAGS
planning_subtrees = list(
/datum/ai_planning_subtree/pet_planning,
/datum/ai_planning_subtree/simple_find_target/to_flee, // This should only find master fishermen because of the targeting strategy
code/modules/mob/living/basic/space_fauna/cat_surgeon.dm
+1
View File
@@ -71,6 +71,7 @@
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/target_retaliate,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/attack_obstacle_in_path,
code/modules/mob/living/basic/space_fauna/eyeball/eyeball_ai_subtree.dm
+1
View File
@@ -7,6 +7,7 @@
ai_movement = /datum/ai_movement/basic_avoidance
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/targeted_mob_ability/glare,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
code/modules/mob/living/basic/space_fauna/faithless.dm
+1
View File
@@ -63,6 +63,7 @@
ai_movement = /datum/ai_movement/basic_avoidance
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/attack_obstacle_in_path,
/datum/ai_planning_subtree/attack_obstacle_in_path/low_priority_target,
code/modules/mob/living/basic/space_fauna/garden_gnome.dm
+1
View File
@@ -131,6 +131,7 @@
ai_movement = /datum/ai_movement/basic_avoidance
idle_behavior = /datum/idle_behavior/idle_random_walk/less_walking
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/target_retaliate,
/datum/ai_planning_subtree/attack_obstacle_in_path,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
code/modules/mob/living/basic/space_fauna/ghost.dm
+1
View File
@@ -103,6 +103,7 @@
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/target_retaliate,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
)
code/modules/mob/living/basic/space_fauna/hivebot/hivebot_subtree.dm
+3
View File
@@ -14,6 +14,7 @@
/datum/ai_controller/basic_controller/hivebot/mechanic
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/basic_ranged_attack_subtree,
/datum/ai_planning_subtree/attack_obstacle_in_path,
@@ -23,6 +24,7 @@
/datum/ai_controller/basic_controller/hivebot/ranged
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/basic_ranged_attack_subtree/hivebot,
/datum/ai_planning_subtree/attack_obstacle_in_path,
@@ -31,6 +33,7 @@
/datum/ai_controller/basic_controller/hivebot/ranged/rapid
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/basic_ranged_attack_subtree/hivebot_rapid,
/datum/ai_planning_subtree/attack_obstacle_in_path,
code/modules/mob/living/basic/space_fauna/killer_tomato.dm
+1
View File
@@ -48,6 +48,7 @@
ai_movement = /datum/ai_movement/basic_avoidance
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/attack_obstacle_in_path,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
code/modules/mob/living/basic/space_fauna/lightgeist.dm
+1 -1
View File
@@ -81,7 +81,7 @@
BB_TARGETING_STRATEGY = /datum/targeting_strategy/lightgeist,
)
ai_traits = STOP_MOVING_WHEN_PULLED
ai_traits = PASSIVE_AI_FLAGS
ai_movement = /datum/ai_movement/basic_avoidance
idle_behavior = /datum/idle_behavior/idle_random_walk/less_walking
code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_heart_ai.dm
+1
View File
@@ -6,6 +6,7 @@
)
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/targeted_mob_ability/ground_spikes,
/datum/ai_planning_subtree/use_mob_ability/spine_traps,
code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm
+1
View File
@@ -61,6 +61,7 @@
ai_movement = /datum/ai_movement/basic_avoidance
idle_behavior = /datum/idle_behavior/idle_random_walk/less_walking
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/targeted_mob_ability/wizard_mimic,
/datum/ai_planning_subtree/use_mob_ability/wizard_summon_minions,
code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat_ai.dm
+1
View File
@@ -10,6 +10,7 @@
// we pretty much do cheesy things (make the station worse) and don't deal with peasants (crew) unless they start to get in the way
// summon the horde if we get into a fight and then let the horde take care of it while we skedaddle
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/target_retaliate/to_flee,
/datum/ai_planning_subtree/targeted_mob_ability/riot,
/datum/ai_planning_subtree/flee_target/from_flee_key,
code/modules/mob/living/basic/space_fauna/snake/banded_snake.dm
+1
View File
@@ -49,6 +49,7 @@
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
/datum/ai_planning_subtree/find_food,
code/modules/mob/living/basic/space_fauna/snake/snake.dm
+2 -1
View File
@@ -78,11 +78,12 @@
BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
)
ai_traits = STOP_MOVING_WHEN_PULLED
ai_traits = DEFAULT_AI_FLAGS | STOP_MOVING_WHEN_PULLED
ai_movement = /datum/ai_movement/basic_avoidance
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/target_retaliate,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
/datum/ai_planning_subtree/find_food,
code/modules/mob/living/basic/space_fauna/spaceman.dm
+1
View File
@@ -39,6 +39,7 @@
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/target_retaliate,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
)
code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spider_ai.dm
+3 -1
View File
@@ -4,11 +4,11 @@
BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
)
ai_traits = STOP_MOVING_WHEN_PULLED | PAUSE_DURING_DO_AFTER
ai_movement = /datum/ai_movement/basic_avoidance
idle_behavior = /datum/idle_behavior/idle_random_walk/less_walking
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/attack_obstacle_in_path,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
@@ -20,6 +20,7 @@
/// Giant spider which won't attack structures
/datum/ai_controller/basic_controller/giant_spider/weak
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
/datum/ai_planning_subtree/random_speech/insect,
@@ -50,6 +51,7 @@
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/pet_planning,
/datum/ai_planning_subtree/target_retaliate/to_flee,
/datum/ai_planning_subtree/flee_target/from_flee_key,
code/modules/mob/living/basic/space_fauna/spider/spiderlings/spiderling.dm
+2 -1
View File
@@ -66,12 +66,13 @@
BB_TIME_TO_GIVE_UP_ON_VENT_PATHING = 30 SECONDS,
)
ai_traits = STOP_MOVING_WHEN_PULLED
ai_traits = PASSIVE_AI_FLAGS
ai_movement = /datum/ai_movement/basic_avoidance
idle_behavior = /datum/idle_behavior/idle_random_walk/less_walking
// We understand that vents are nice little hidey holes through epigenetic inheritance, so we'll use them.
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/target_retaliate/to_flee,
/datum/ai_planning_subtree/flee_target/from_flee_key,
/datum/ai_planning_subtree/opportunistic_ventcrawler,
code/modules/mob/living/basic/space_fauna/spider/young_spider/young_spider.dm
+2 -1
View File
@@ -33,11 +33,12 @@
BB_BASIC_MOB_FLEE_DISTANCE = 6,
)
ai_traits = STOP_MOVING_WHEN_PULLED
ai_traits = PASSIVE_AI_FLAGS
ai_movement = /datum/ai_movement/basic_avoidance
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee,
/datum/ai_planning_subtree/flee_target,
/datum/ai_planning_subtree/target_retaliate,
code/modules/mob/living/basic/space_fauna/statue/mannequin.dm
+1
View File
@@ -84,6 +84,7 @@
ai_movement = /datum/ai_movement/jps //threat
idle_behavior = null
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity/pacifist,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/run_emote,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
code/modules/mob/living/basic/space_fauna/statue/statue.dm
+1
View File
@@ -136,6 +136,7 @@
ai_movement = /datum/ai_movement/basic_avoidance
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
/datum/ai_planning_subtree/find_and_hunt_target/look_for_light_fixtures,
code/modules/mob/living/basic/space_fauna/wumborian_fugu/wumborian_ai.dm
+1
View File
@@ -8,6 +8,7 @@
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/targeted_mob_ability/inflate,
/datum/ai_planning_subtree/flee_target,