From d6a7d4ed04d89529760cac6300e00da5fc477838 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sun, 12 Jun 2016 17:49:25 -0400 Subject: [PATCH] Fixes resisting out of grabs when weakened --- code/modules/mob/living/living.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 9101092edaf..3d86a1c3f13 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -630,7 +630,9 @@ default behaviour is: resisting++ switch(G.state) if(GRAB_PASSIVE) - qdel(G) + if(!incapacitated(INCAPACITATION_KNOCKDOWN)) + visible_message("[src] has broken free of [G.assailant]'s grip!") + qdel(G) if(GRAB_AGGRESSIVE) //Not standing up makes it much harder to break, so it is easier to cuff someone who is down without forcing them into unconsciousness. //Otherwise, it's the same chance of breaking the grab as disarm.