From 3111e1f3289b9274c8a23ffc8677094c6f27420c Mon Sep 17 00:00:00 2001 From: Adrer Date: Thu, 19 Jan 2023 21:35:17 +0100 Subject: [PATCH] Assemblies containing an igniter do not prime grenade when used in hand (#20242) * Assmblies containing an igniter do not prime grenade on attack_self * Check if ignited in assembly in attack_self Co-authored-by: adrermail@gmail.com --- code/modules/assembly/igniter.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 49962f3b8e5..509d30e35b6 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -56,5 +56,6 @@ /obj/item/assembly/igniter/attack_self(mob/user) - activate() + if(!istype(loc, /obj/item/assembly_holder)) + activate() add_fingerprint(user)