From 2c7a9b307848fc1e319b04166b09d5d798143b83 Mon Sep 17 00:00:00 2001 From: Rerik007 <120549107+Rerik007@users.noreply.github.com> Date: Mon, 8 Jan 2024 19:25:20 +0300 Subject: [PATCH] Prevents pushing the person wh() is pulling you (#23746) --- code/modules/mob/living/living.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 4c53754a20dd..c5bc2f29f64f 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -101,7 +101,7 @@ to_chat(src, "[L] is restrained, you cannot push past.") return TRUE - if(pulledby == L && a_intent != INTENT_HELP) //prevents boosting the person pulling you, but you can still move through them on help intent + if(pulledby == L && (a_intent != INTENT_HELP || L.a_intent != INTENT_HELP)) //prevents boosting the person pulling you, but you can still move through them on help intent return TRUE if(L.pulling)