From 2c05fa63d9a5df6e69a44f7fd17d4601e06271ee Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Mon, 6 Apr 2026 00:46:25 +0200 Subject: [PATCH] Red and black raptors no longer retaliate against their tamer's accidental attacks (#95625) --- .../targeting_strategies/basic_targeting_strategy.dm | 10 ++++++++++ .../basic/lavaland/raptor/raptor_ai_controller.dm | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/code/datums/ai/basic_mobs/targeting_strategies/basic_targeting_strategy.dm b/code/datums/ai/basic_mobs/targeting_strategies/basic_targeting_strategy.dm index 227b4f2fc28..be1d1484225 100644 --- a/code/datums/ai/basic_mobs/targeting_strategies/basic_targeting_strategy.dm +++ b/code/datums/ai/basic_mobs/targeting_strategies/basic_targeting_strategy.dm @@ -157,3 +157,13 @@ /datum/targeting_strategy/basic/exact_match check_factions_exactly = TRUE + +/datum/targeting_strategy/basic/exact_match/ignore_friends + +/datum/targeting_strategy/basic/exact_match/ignore_friends/can_attack(mob/living/living_mob, atom/the_target, vision_range) + . = ..() + if (!.) + return FALSE + if (living_mob.ai_controller.blackboard[BB_FRIENDS_LIST] && (the_target in living_mob.ai_controller.blackboard[BB_FRIENDS_LIST])) + return FALSE + return TRUE diff --git a/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_controller.dm b/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_controller.dm index 2f1353bfc79..bae8bd0d2cd 100644 --- a/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_controller.dm +++ b/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_controller.dm @@ -43,7 +43,7 @@ "wags their tail against", "playfully leans against" ), - BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/exact_match, + BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/exact_match/ignore_friends, BB_HUNT_TARGETING_STRATEGY = /datum/targeting_strategy/basic, BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic, BB_BABIES_PARTNER_TYPES = list(/mob/living/basic/raptor),