mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Don't step on people who are riding you
This commit is contained in:
@@ -158,6 +158,10 @@ 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(mob/living/tmob)
|
||||
//Riding and being moved to us or something similar
|
||||
if(tmob in buckled_mobs)
|
||||
return TRUE
|
||||
|
||||
//Both small! Go ahead and go.
|
||||
if(get_effective_size() <= RESIZE_A_SMALLTINY && tmob.get_effective_size() <= RESIZE_A_SMALLTINY)
|
||||
return TRUE
|
||||
@@ -214,6 +218,10 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
|
||||
if(!canmove || buckled)
|
||||
return
|
||||
|
||||
//Riding and being moved to us or something similar
|
||||
if(tmob in buckled_mobs)
|
||||
return TRUE
|
||||
|
||||
//Test/set if human
|
||||
var/mob/living/carbon/human/pred = src
|
||||
if(!istype(pred))
|
||||
|
||||
Reference in New Issue
Block a user