cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 07:28:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5021 from Heroman3003/steppy-steppy-on-the-meow

Browse Source 
Fixes step code, again
This commit is contained in:
Novacat
2019-04-13 00:08:40 -04:00
committed by GitHub
parent 66c0c49d62 31ebde962c
commit 82978caaeb
2 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/resizing/resize_vr.dm
-30
View File
@@ -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