From b8cd5a85a15e124cee898e5b85c4498b2549593b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 16 Oct 2021 21:05:01 +0200 Subject: [PATCH] [MIRROR] Pets no longer enjoy being shoved around. [MDB IGNORE] (#8849) * Pets no longer enjoy being shoved around. (#62111) * Pets no longer enjoy being shoved around. Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/datums/elements/pet_bonus.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/elements/pet_bonus.dm b/code/datums/elements/pet_bonus.dm index f42a31a46c2..f6083feefac 100644 --- a/code/datums/elements/pet_bonus.dm +++ b/code/datums/elements/pet_bonus.dm @@ -26,10 +26,10 @@ . = ..() UnregisterSignal(target, COMSIG_ATOM_ATTACK_HAND) -/datum/element/pet_bonus/proc/on_attack_hand(mob/living/pet, mob/living/petter) +/datum/element/pet_bonus/proc/on_attack_hand(mob/living/pet, mob/living/petter, list/modifiers) SIGNAL_HANDLER - if(pet.stat != CONSCIOUS || petter.combat_mode) + if(pet.stat != CONSCIOUS || petter.combat_mode || LAZYACCESS(modifiers, RIGHT_CLICK)) return new /obj/effect/temp_visual/heart(pet.loc)