From c902e44320c3a15b1e08294ff47c1deec71fcb07 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 7 Apr 2021 15:53:44 +0200 Subject: [PATCH] [MIRROR] Fixes the borg hug module being able to harm and shove simple mobs (#4722) * Fixes the borg hug module being able to harm and shove simple mobs (#58175) * Fixes the borg hug module being able to harm and shove simple mobs Co-authored-by: Seth Scherer --- code/game/objects/items/robot/robot_items.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 77e8cd9b829..7aad3eb2c1c 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -72,7 +72,8 @@ if(M.health >= 0) if(isanimal(M)) var/list/modifiers = params2list(params) - M.attack_hand(user, modifiers) //This enables borgs to get the floating heart icon and mob emote from simple_animal's that have petbonus == true. + if (!user.combat_mode && !LAZYACCESS(modifiers, RIGHT_CLICK)) + M.attack_hand(user, modifiers) //This enables borgs to get the floating heart icon and mob emote from simple_animal's that have petbonus == true. return if(user.zone_selected == BODY_ZONE_HEAD) user.visible_message("[user] playfully boops [M] on the head!", \