From 4ec77fdbf6feeca0299d574baff0acd4e842b151 Mon Sep 17 00:00:00 2001 From: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com> Date: Mon, 18 Jul 2022 20:51:36 -0300 Subject: [PATCH] Be polite! While on walk intent you won't bump, swap places or push other people now. (#68493) 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 eccf22a2ddb..7c9848c3317 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -81,6 +81,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)