From 1ca3d7e79fdbc3ebdcc1a20f7f45b7d0ebad3e76 Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Fri, 11 Jul 2025 08:11:52 +0200 Subject: [PATCH] Pets no longer instantly resist out of your grip when picked up (#92059) ## About The Pull Request Closes #92034 ## Changelog :cl: fix: Pets no longer instantly resist out of your grip when picked up /:cl: --- code/datums/ai/basic_mobs/basic_subtrees/escape_captivity.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ai/basic_mobs/basic_subtrees/escape_captivity.dm b/code/datums/ai/basic_mobs/basic_subtrees/escape_captivity.dm index bf3c4dc01ea..9dfbfce94de 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/escape_captivity.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/escape_captivity.dm @@ -15,7 +15,7 @@ controller.queue_behavior(/datum/ai_behavior/resist) return SUBTREE_RETURN_FINISH_PLANNING - if (!isturf(living_pawn.loc) && !ismob(living_pawn.loc)) + if (!isturf(living_pawn.loc) && !ismob(living_pawn.loc) && !istype(living_pawn.loc, /obj/item/mob_holder)) var/atom/contained_in = living_pawn.loc var/attack_effective = FALSE if (!pacifist)