From 271394dfd801baa51fa279c5c094bff5592de2eb Mon Sep 17 00:00:00 2001 From: tralezab <40974010+tralezab@users.noreply.github.com> Date: Wed, 5 May 2021 19:54:35 -0700 Subject: [PATCH] dogs now resist before fetching or harassing, to unbuckle from stuff if they need to (#58686) fixes #58656 (Pets can move while buckled in their beds) --- code/datums/ai/dog/dog_controller.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/datums/ai/dog/dog_controller.dm b/code/datums/ai/dog/dog_controller.dm index 8e3a81dae7f..14110dc1e5d 100644 --- a/code/datums/ai/dog/dog_controller.dm +++ b/code/datums/ai/dog/dog_controller.dm @@ -321,9 +321,13 @@ current_movement_target = pointed_movable blackboard[BB_FETCH_TARGET] = pointed_movable blackboard[BB_FETCH_DELIVER_TO] = pointing_friend + if(living_pawn.buckled) + current_behaviors += GET_AI_BEHAVIOR(/datum/ai_behavior/resist)//in case they are in bed or something current_behaviors += GET_AI_BEHAVIOR(/datum/ai_behavior/fetch) if(DOG_COMMAND_ATTACK) pawn.visible_message("[pawn] follows [pointing_friend]'s gesture towards [pointed_movable] and growls intensely!") current_movement_target = pointed_movable blackboard[BB_DOG_HARASS_TARGET] = pointed_movable + if(living_pawn.buckled) + current_behaviors += GET_AI_BEHAVIOR(/datum/ai_behavior/resist)//in case they are in bed or something current_behaviors += GET_AI_BEHAVIOR(/datum/ai_behavior/harass)