cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +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/pets/cat/cat_ai.dm
+1
View File
@@ -10,6 +10,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/pacifist,
/datum/ai_planning_subtree/pet_planning,
/datum/ai_planning_subtree/reside_in_home,
/datum/ai_planning_subtree/flee_target/from_flee_key/cat_struggle,
code/modules/mob/living/basic/pets/fox.dm
+1
View File
@@ -69,6 +69,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/target_retaliate/to_flee,
/datum/ai_planning_subtree/flee_target/from_flee_key,
code/modules/mob/living/basic/pets/gondolas/gondola.dm
+1 -1
View File
@@ -73,7 +73,7 @@
BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
)
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/pets/parrot/parrot_ai/_parrot_controller.dm
+2 -1
View File
@@ -5,11 +5,12 @@
BB_HOARD_LOCATION_RANGE = 9,
)
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/parrot
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/parrot_as_in_repeat, // always get a witty oneliner in when you can
/datum/ai_planning_subtree/pet_planning,
/datum/ai_planning_subtree/target_retaliate,
code/modules/mob/living/basic/pets/parrot/parrot_ai/ghost_parrot_controller.dm
+1
View File
@@ -1,6 +1,7 @@
/// Used for ghost poly.
/datum/ai_controller/basic_controller/parrot/ghost
planning_subtrees = list(
/datum/ai_planning_subtree/escape_captivity,
/datum/ai_planning_subtree/parrot_as_in_repeat,
/datum/ai_planning_subtree/possess_humans,
/datum/ai_planning_subtree/hoard_items,
code/modules/mob/living/basic/pets/penguin/penguin_ai.dm
+2 -2
View File
@@ -5,7 +5,7 @@
BB_ONLY_FISH_WHILE_HUNGRY = TRUE,
)
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
@@ -67,7 +67,7 @@
BB_IGNORE_MOM_TYPES = list(/mob/living/basic/pet/penguin/baby),
)
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
code/modules/mob/living/basic/pets/pet_cult/pet_cult_ai.dm
+1 -1
View File
@@ -8,6 +8,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/befriend_cultists,
/datum/ai_planning_subtree/find_occupied_rune,
/datum/ai_planning_subtree/find_dead_cultist,
@@ -16,7 +17,6 @@
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
)
ai_traits = PAUSE_DURING_DO_AFTER
///if target gets pulled away, unset him
/datum/ai_controller/basic_controller/pet_cult/proc/delete_pull_target(datum/source, atom/movable/was_pulling)
code/modules/mob/living/basic/pets/sloth.dm
+1 -1
View File
@@ -90,7 +90,7 @@ GLOBAL_DATUM(cargo_sloth, /mob/living/basic/sloth)
BB_FLEE_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
)
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