From 7d3f361d8e214f0cae9e73ba80cbf178f770156a Mon Sep 17 00:00:00 2001 From: TheGreatKitsune Date: Thu, 7 Jul 2022 00:35:08 -0500 Subject: [PATCH] Fix stepping on folk laying down. --- modular_chomp/code/modules/vore/resizing/resize.dm | 14 ++++++++++++++ vorestation.dme | 1 + 2 files changed, 15 insertions(+) create mode 100644 modular_chomp/code/modules/vore/resizing/resize.dm diff --git a/modular_chomp/code/modules/vore/resizing/resize.dm b/modular_chomp/code/modules/vore/resizing/resize.dm new file mode 100644 index 0000000000..47abdc30b3 --- /dev/null +++ b/modular_chomp/code/modules/vore/resizing/resize.dm @@ -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 diff --git a/vorestation.dme b/vorestation.dme index e5d66de0b2..13d229a9d8 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4510,4 +4510,5 @@ #include "modular_chomp\code\modules\power\cells\esoteric_cells.dm" #include "modular_chomp\code\modules\power\cells\power_cells.dm" #include "modular_chomp\code\modules\research\designs\power_cells.dm" +#include "modular_chomp\code\modules\vore\resizing\resize.dm" // END_INCLUDE