From 0fad01fec3102f17777ea042fa0f6f9728927e83 Mon Sep 17 00:00:00 2001 From: Charlie <69320440+hal9000PR@users.noreply.github.com> Date: Sun, 9 Jan 2022 19:04:53 +0000 Subject: [PATCH] Prevents grabbing things that you cannot pull (#17306) --- code/modules/mob/living/living_defense.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index ee7476b140c..73f3da863ee 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -261,9 +261,11 @@ /mob/living/proc/grabbedby(mob/living/carbon/user, supress_message = FALSE) if(user == src || anchored) - return 0 + return FALSE if(!(status_flags & CANPUSH)) - return 0 + return FALSE + if(user.pull_force < move_force) + return FALSE for(var/obj/item/grab/G in grabbed_by) if(G.assailant == user)