From ee8d2727360d4d2b84c9717c189b5f32a994a4e4 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 19 Jul 2022 02:05:40 +0200 Subject: [PATCH] [MIRROR] Be polite! While on walk intent you won't bump, swap places or push other people now. [MDB IGNORE] (#15043) * Be polite! While on walk intent you won't bump, swap places or push other people now. (#68493) Co-authored-by: Seth Scherer * Be polite! While on walk intent you won't bump, swap places or push other people now. Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com> Co-authored-by: Seth Scherer --- code/modules/mob/living/living.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 79c15b43c2c..4cd52ec2b57 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -86,6 +86,10 @@ //Called when we bump onto a mob /mob/living/proc/MobBump(mob/M) + //No bumping/swapping/pushing others if you are on walk intent + if(m_intent == MOVE_INTENT_WALK) + return TRUE + SEND_SIGNAL(src, COMSIG_LIVING_MOB_BUMP, M) //Even if we don't push/swap places, we "touched" them, so spread fire spreadFire(M)