From a98cab69ce6f19a710ecc4a24974ee39766ad2a8 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 1 Mar 2021 23:29:36 +0100 Subject: [PATCH] [MIRROR] Hulks can shove on combat mode like non-hulks (#3747) * Hulks can shove on combat mode like non-hulks (#57275) * Hulks can shove on combat mode like non-hulks Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com> --- code/datums/mutations/hulk.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 138ab931656..ae92c92dc97 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -27,12 +27,12 @@ RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) RegisterSignal(owner, COMSIG_MOB_CLICKON, .proc/check_swing) -/datum/mutation/human/hulk/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity) +/datum/mutation/human/hulk/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity, modifiers) SIGNAL_HANDLER if(!proximity) return - if(!source.combat_mode) + if(!source.combat_mode || LAZYACCESS(modifiers, RIGHT_CLICK)) return if(target.attack_hulk(owner)) if(world.time > (last_scream + scream_delay))