diff --git a/modular_splurt/code/modules/resize/resizing.dm b/modular_splurt/code/modules/resize/resizing.dm index f10799ca77..9554d1db85 100644 --- a/modular_splurt/code/modules/resize/resizing.dm +++ b/modular_splurt/code/modules/resize/resizing.dm @@ -1,6 +1,7 @@ /mob/living/handle_micro_bump_other(mob/living/target) - // If the target has the preference off, stop the interaction. - if(target.client.prefs.stomppref == FALSE) + + // If the target is not in combat mode, if the target has the preference off, stop the interaction. + if(target.a_intent != INTENT_HARM && SEND_SIGNAL(target, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE) && target.client.prefs.stomppref == FALSE) return FALSE // Do the rest of the function normally.