From 9bdd2dc73fbe9eb3f9debc2a570fcdbd728b6d42 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Sun, 27 Jul 2025 22:50:25 -0400 Subject: [PATCH] fix minebots aggroing on owner (#29899) --- .../ai/basic_mobs/basic_ai_behaviors/targeting.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/targeting.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/targeting.dm index d1dcedcc19a..ae3afa45386 100644 --- a/code/datums/ai/basic_mobs/basic_ai_behaviors/targeting.dm +++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/targeting.dm @@ -55,6 +55,8 @@ GLOBAL_LIST_INIT(target_interested_atoms, typecacheof(list( var/list/filtered_targets = list() for(var/atom/pot_target in potential_targets) + if(ismob(pot_target) && living_mob.faction_check_mob(pot_target)) + continue if(targeting_strategy.can_attack(living_mob, pot_target))//Can we attack it? filtered_targets += pot_target continue @@ -103,6 +105,8 @@ GLOBAL_LIST_INIT(target_interested_atoms, typecacheof(list( continue if(!strategy.can_attack(pawn, maybe_target)) continue + if(ismob(maybe_target) && pawn.faction_check_mob(maybe_target)) + continue valid_found = TRUE break if(!valid_found) @@ -133,8 +137,14 @@ GLOBAL_LIST_INIT(target_interested_atoms, typecacheof(list( continue if(!strategy.can_attack(pawn, maybe_target)) continue + if(ismob(maybe_target) && pawn.faction_check_mob(maybe_target)) + continue accepted_targets += maybe_target + if(!length(accepted_targets)) + finish_action(controller, succeeded = FALSE) + return + // Alright, we found something acceptable, let's use it yeah? var/atom/target = pick_final_target(controller, accepted_targets) controller.set_blackboard_key(target_key, target)