diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index f183cd15c28..33b521153b0 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1403,16 +1403,16 @@ GLOBAL_LIST_EMPTY(roundstart_races) "You block [user]'s shove!", "You hear a swoosh!", COMBAT_MESSAGE_RANGE, user) to_chat(user, "Your shove at [target] was blocked!") return FALSE - if(attacker_style && attacker_style.disarm_act(user,target)) + if(attacker_style?.disarm_act(user,target)) return TRUE - if(user.resting || user.IsKnockdown()) + if(user.body_position != STANDING_UP) return FALSE if(user == target) return FALSE if(user.loc == target.loc) return FALSE - else - user.disarm(target) + user.disarm(target) + /datum/species/proc/spec_hitby(atom/movable/AM, mob/living/carbon/human/H) return