cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix same-size mobs walking on each other and being unable to bump doors.

Browse Source 
* 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.
This commit is contained in:
Leshana
2018-02-17 22:44:12 -05:00
parent 2d797006ca
commit 0806ca868b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/living.dm
View File

@@ -119,7 +119,9 @@ default behaviour is:
return return
// In case of micros, we don't swap positions; instead occupying the same square! // 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. // TODO - Check if we need to do something about the slime.UpdateFeed() we are skipping below.
// VOREStation Edit - End // VOREStation Edit - End

12
code/modules/vore/resizing/resize_vr.dm
View File

@@ -134,25 +134,22 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
/** /**
* Handle bumping into someone with helping intent. * Handle bumping into someone with helping intent.
* Called from /mob/living/Bump() in the 'brohugs all around' section. * Called from /mob/living/Bump() in the 'brohugs all around' section.
* @return false if normal code should continue, 1 to prevent normal code. * @return false if normal code should continue, true to prevent normal code.
* // TODO - can the now_pushing = 0 be moved up? What does it do anyway?
*/ */
/mob/living/proc/handle_micro_bump_helping(var/mob/living/tmob) /mob/living/proc/handle_micro_bump_helping(var/mob/living/tmob)
//Both small! Go ahead and go. //Both small! Go ahead and go.
if(src.get_effective_size() <= RESIZE_A_SMALLTINY && tmob.get_effective_size() <= RESIZE_A_SMALLTINY) if(src.get_effective_size() <= RESIZE_A_SMALLTINY && tmob.get_effective_size() <= RESIZE_A_SMALLTINY)
now_pushing = 0 return TRUE
return 1
//Worthy of doing messages at all //Worthy of doing messages at all
if(abs(get_effective_size() - tmob.get_effective_size()) >= 0.50) if(abs(get_effective_size() - tmob.get_effective_size()) >= 0.50)
now_pushing = 0
//Smaller person being stepped onto //Smaller person being stepped onto
if(get_effective_size() > tmob.get_effective_size() && ishuman(src)) if(get_effective_size() > tmob.get_effective_size() && ishuman(src))
var/mob/living/carbon/human/H = src var/mob/living/carbon/human/H = src
if(H.flying) if(H.flying)
return 1 //Silently pass without a message. return TRUE //Silently pass without a message.
if(isTaurTail(H.tail_style)) if(isTaurTail(H.tail_style))
var/datum/sprite_accessory/tail/taur/tail = H.tail_style var/datum/sprite_accessory/tail/taur/tail = H.tail_style
to_chat(src,STEP_TEXT_OWNER(tail.msg_owner_help_run)) 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 else
to_chat(src,"You run between [tmob]'s legs.") to_chat(src,"You run between [tmob]'s legs.")
to_chat(tmob,"[src] runs between your legs.") to_chat(tmob,"[src] runs between your legs.")
return 1 return TRUE
return FALSE
/** /**
* Handle bumping into someone without mutual help intent. * Handle bumping into someone without mutual help intent.