From 17677c6af45c0e6e6f1379a2c4c4a7ed9a73ded1 Mon Sep 17 00:00:00 2001 From: Watermelon914 <37270891+Watermelon914@users.noreply.github.com> Date: Tue, 21 Dec 2021 08:59:09 +0000 Subject: [PATCH] Fixed ashdrakes being pushed (#63373) Megafauna and such animals are not pushable if their move resist is greater than someone's move force. Them being shovable is an oversight. --- code/modules/mob/living/basic/basic_defense.dm | 2 ++ code/modules/mob/living/simple_animal/animal_defense.dm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/code/modules/mob/living/basic/basic_defense.dm b/code/modules/mob/living/basic/basic_defense.dm index 5c8e8ae4254..7296561029f 100644 --- a/code/modules/mob/living/basic/basic_defense.dm +++ b/code/modules/mob/living/basic/basic_defense.dm @@ -4,6 +4,8 @@ return TRUE if(LAZYACCESS(modifiers, RIGHT_CLICK)) + if(user.move_force < move_resist) + return user.do_attack_animation(src, ATTACK_EFFECT_DISARM) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) var/shove_dir = get_dir(user, src) diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm index 368ddc1ac3a..2b8a762ccd9 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -4,6 +4,8 @@ return TRUE if(LAZYACCESS(modifiers, RIGHT_CLICK)) + if(user.move_force < move_resist) + return user.do_attack_animation(src, ATTACK_EFFECT_DISARM) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) var/shove_dir = get_dir(user, src)