cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix minebots aggroing on owner (#29899)

Browse Source
This commit is contained in:
warriorstar-orion
2025-07-27 22:50:25 -04:00
committed by GitHub
parent 18573ef254
commit 9bdd2dc73f
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/ai/basic_mobs/basic_ai_behaviors/targeting.dm
+10
View File
@@ -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)