From 6dde6ed06ca00020731659d084cd65a330de8146 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Thu, 29 Jul 2021 12:54:42 -0400 Subject: [PATCH] Prevents pushing a person that is pulling you (#16451) * Prevents pushing a person that is pulling you * Makes it true --- code/modules/mob/living/living.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 0e56570abee..bd0aad32dac 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -92,6 +92,9 @@ 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 + return TRUE + if(L.pulling) if(ismob(L.pulling)) var/mob/P = L.pulling