uh oh (#22892)

Author: SapphicOverload

code/_onclick/other_mobs.dm

@@ -28,7 +28,7 @@
 	if(proximity && istype(G) && G.Touch(A, 1, modifiers))
 		return
 
-	if(SEND_SIGNAL(src, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, A, modifiers) & COMPONENT_NO_ATTACK_HAND)
+	if(SEND_SIGNAL(src, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, A, proximity, modifiers) & COMPONENT_NO_ATTACK_HAND)
 		return
 
 	var/override = 0
@@ -37,7 +37,7 @@
 	if(override)
 		return
 
-	SEND_SIGNAL(src, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, A, modifiers)
+	SEND_SIGNAL(src, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, A, proximity, modifiers)
 	if(modifiers[RIGHT_CLICK])
 		var/secondary_result = A.attack_hand_secondary(src, modifiers)
 		if(secondary_result == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN || secondary_result == SECONDARY_ATTACK_CONTINUE_CHAIN)

code/datums/components/riding.dm

@@ -277,7 +277,7 @@
 	var/slowdown = AM.dna.check_mutation(STRONG) ? 0 : HUMAN_CARRY_SLOWDOWN
 	AM.add_movespeed_modifier(MOVESPEED_ID_HUMAN_CARRYING, multiplicative_slowdown = slowdown)
 
-/datum/component/riding/human/proc/on_host_unarmed_melee(atom/target, modifiers)
+/datum/component/riding/human/proc/on_host_unarmed_melee(atom/target, proximity, modifiers)
 	var/mob/living/carbon/human/AM = parent
 	if(modifiers && modifiers[RIGHT_CLICK] && (target in AM.buckled_mobs))
 		force_dismount(target)

code/game/objects/items/powerfist.dm

@@ -85,8 +85,8 @@
 /obj/item/clothing/gloves/powerfist/attack(mob/living/target, mob/living/user)
 	power_punch(user, target)
 
-/obj/item/clothing/gloves/powerfist/proc/power_punch(mob/living/user, atom/movable/target)
-	if(!user || !user.combat_mode || (!isliving(target) && !target.uses_integrity) || isitem(target))
+/obj/item/clothing/gloves/powerfist/proc/power_punch(mob/living/user, atom/movable/target, proximity)
+	if(proximity || !user || !user.combat_mode || (!isliving(target) && !target.uses_integrity) || isitem(target))
 		return
 	if(!tank)
 		to_chat(user, span_warning("\The [src] can't operate without a source of gas!"))