From b700a27063686eebee7f6aac90da6d4ee0b60289 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 13 Apr 2019 10:56:05 +1000 Subject: [PATCH 1/3] Fixes step code, again --- code/modules/vore/resizing/resize_vr.dm | 30 ------------------------- 1 file changed, 30 deletions(-) diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 1a1fe508c8b..c92121da918 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -155,21 +155,6 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 * @return false if normal code should continue, true to prevent normal code. */ /mob/living/proc/handle_micro_bump_helping(var/mob/living/tmob) - //Make sure we would be able to step there in the first place: - var/can_move_into = 1 - if(tmob.loc.density) - can_move_into = 0 - if(can_move_into) - for(var/atom/movable/A in tmob.loc) - if(A == src) - continue - if(!A.CanPass(src, tmob.loc)) - can_move_into = 0 - if(!can_move_into) break - - if(!can_move_into) - return FALSE - //Both small! Go ahead and go. if(src.get_effective_size() <= RESIZE_A_SMALLTINY && tmob.get_effective_size() <= RESIZE_A_SMALLTINY) return TRUE @@ -212,21 +197,6 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 /mob/living/proc/handle_micro_bump_other(var/mob/living/tmob) ASSERT(istype(tmob)) - //Can we even step on their tile normally? - var/can_move_into = 1 - if(tmob.loc.density) - can_move_into = 0 - if(can_move_into) - for(var/atom/movable/A in tmob.loc) - if(A == src) - continue - if(!A.CanPass(src, tmob.loc)) - can_move_into = 0 - if(!can_move_into) break - - if(!can_move_into) - return FALSE - //If they're flying, don't do any special interactions. if(ishuman(src)) var/mob/living/carbon/human/P = src From 7604c8550d2ae85311c980ea696c00d43c059c16 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 13 Apr 2019 12:30:47 +1000 Subject: [PATCH 2/3] Allows help-intent step with buckled mobs --- 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 f300f8a350d..a2e10d65c21 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -149,6 +149,10 @@ default behaviour is: tmob.forceMove(oldloc) now_pushing = 0 return + else if((tmob.mob_always_swap || (tmob.a_intent == I_HELP || tmob.restrained()) && (a_intent == I_HELP || src.restrained())) && canmove && can_swap && handle_micro_bump_helping(tmob)) + forceMove(tmob.loc) + now_pushing = 0 + return if(!can_move_mob(tmob, 0, 0)) now_pushing = 0 From 31ebde962c3273ba70d384c1ad940d6d3f05ab02 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 13 Apr 2019 13:58:12 +1000 Subject: [PATCH 3/3] Forgot vorestation edits --- code/modules/mob/living/living.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index a2e10d65c21..83438240c15 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -149,10 +149,12 @@ default behaviour is: tmob.forceMove(oldloc) now_pushing = 0 return + //VOREStation Edit - Begin else if((tmob.mob_always_swap || (tmob.a_intent == I_HELP || tmob.restrained()) && (a_intent == I_HELP || src.restrained())) && canmove && can_swap && handle_micro_bump_helping(tmob)) forceMove(tmob.loc) now_pushing = 0 return + //VOREStation Edit - End if(!can_move_mob(tmob, 0, 0)) now_pushing = 0