Fix stepping on folk laying down.

This commit is contained in:
TheGreatKitsune
2022-07-07 00:35:08 -05:00
parent a58ee0f0f7
commit 7d3f361d8e
2 changed files with 15 additions and 0 deletions
@@ -0,0 +1,14 @@
/mob/living/Crossed(var/atom/movable/AM)
..()
var/mob/living/target = AM
if(istype(target) && src.lying && target.loc && target.buckled != src)
// src.lying being true means that in theory this code shouldn't run at the same time as the existing code for this in Bump. Probably.
// And optionally, this could be gated behind another preference, to prevent stunlock being abused.
if((mob_always_swap || (a_intent == I_HELP || src.restrained()) && (target.a_intent == I_HELP || target.restrained())) && target.canmove && target.handle_micro_bump_helping(src))
return
else if(!(target.a_intent == I_HELP || target.restrained()) && target.handle_micro_bump_other(src))
if(src.step_mechanics_pref && target.step_mechanics_pref)
target.handle_micro_bump_other(src)
else
target.handle_micro_bump_other(src, 1)
return