From 79108008985e03f3af057f4a1156a33f09f612f0 Mon Sep 17 00:00:00 2001 From: Morrow Date: Fri, 27 Oct 2023 09:51:08 -0400 Subject: [PATCH] makes executions less accidental --- code/modules/projectiles/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 723426b842..3840a029ad 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -1248,7 +1248,7 @@ and you're good to go. return TRUE //Nothing else to do here, time to cancel out. return TRUE -#define EXECUTION_CHECK (attacked_mob.stat == UNCONSCIOUS || attacked_mob.is_mob_restrained()) && ((user.a_intent == INTENT_GRAB)||(user.a_intent == INTENT_DISARM)) +#define EXECUTION_CHECK (attacked_mob.stat == UNCONSCIOUS || attacked_mob.is_mob_restrained()) && ((user.a_intent == INTENT_GRAB) || (user.a_intent == INTENT_DISARM)) && !(length(user.faction_group & attacked_mob.faction_group)) && ishuman(attacked_mob) /obj/item/weapon/gun/afterattack(atom/target, mob/user, proximity_flag, click_parameters) if(!proximity_flag)