From 0806ca868b49591eb6afb28de2b2f887358db805 Mon Sep 17 00:00:00 2001
From: Leshana <Leshana@users.noreply.github.com>
Date: Sat, 17 Feb 2018 22:44:12 -0500
Subject: [PATCH] Fix same-size mobs walking on each other and being unable to
 bump doors.

* handle_micro_bump_helping was unconditionally returning TRUE, overriding normal bump behavior.  Fixed to only return TRUE when its size conditions are met.
* As a side effect of that bug, now_pushing was not being set back to zero.  Fixing the prior bug solved that, but as an extra precaution, moved now_pushing = 0 out of the proc so it will get set back no matter what.
---
 code/modules/mob/living/living.dm       |  4 +++-
 code/modules/vore/resizing/resize_vr.dm | 12 +++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 50b529768d6..93e729ebb0c 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -119,7 +119,9 @@ default behaviour is:
 					return
 
 				// In case of micros, we don't swap positions; instead occupying the same square!
-				if (handle_micro_bump_helping(tmob)) return
+				if (handle_micro_bump_helping(tmob))
+					now_pushing = 0
+					return
 				// TODO - Check if we need to do something about the slime.UpdateFeed() we are skipping below.
 				// VOREStation Edit - End
 
diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm
index 29e7d86fe16..4146c7160d6 100644
--- a/code/modules/vore/resizing/resize_vr.dm
+++ b/code/modules/vore/resizing/resize_vr.dm
@@ -134,25 +134,22 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
 /**
  * Handle bumping into someone with helping intent.
  * Called from /mob/living/Bump() in the 'brohugs all around' section.
- * @return false if normal code should continue, 1 to prevent normal code.
- * // TODO - can the now_pushing = 0 be moved up? What does it do anyway?
+ * @return false if normal code should continue, true to prevent normal code.
  */
 /mob/living/proc/handle_micro_bump_helping(var/mob/living/tmob)
 
 	//Both small! Go ahead and go.
 	if(src.get_effective_size() <= RESIZE_A_SMALLTINY && tmob.get_effective_size() <= RESIZE_A_SMALLTINY)
-		now_pushing = 0
-		return 1
+		return TRUE
 
 	//Worthy of doing messages at all
 	if(abs(get_effective_size() - tmob.get_effective_size()) >= 0.50)
-		now_pushing = 0
 
 		//Smaller person being stepped onto
 		if(get_effective_size() > tmob.get_effective_size() && ishuman(src))
 			var/mob/living/carbon/human/H = src
 			if(H.flying)
-				return 1 //Silently pass without a message.
+				return TRUE //Silently pass without a message.
 			if(isTaurTail(H.tail_style))
 				var/datum/sprite_accessory/tail/taur/tail = H.tail_style
 				to_chat(src,STEP_TEXT_OWNER(tail.msg_owner_help_run))
@@ -171,7 +168,8 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
 			else
 				to_chat(src,"You run between [tmob]'s legs.")
 				to_chat(tmob,"[src] runs between your legs.")
-	return 1
+		return TRUE
+	return FALSE
 
 /**
  * Handle bumping into someone without mutual help intent.