From f58a3c742bdff8affc266ab45ede9780ccbd4025 Mon Sep 17 00:00:00 2001 From: Casey Date: Mon, 22 Nov 2021 23:22:46 -0500 Subject: [PATCH] Merge pull request #11881 from Heroman3003/grenadefix2 Fixes infinite detonators being attachable to grenades --- code/game/objects/items/weapons/grenades/chem_grenade.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 744cc130e2..1a19b98910 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -55,7 +55,7 @@ C.throw_mode_on() /obj/item/weapon/grenade/chem_grenade/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/device/assembly_holder) && (!stage || stage==1) && path != 2) + if(istype(W,/obj/item/device/assembly_holder) && (!stage || stage==1) && !detonator && path != 2) var/obj/item/device/assembly_holder/det = W if(istype(det.a_left,det.a_right.type) || (!isigniter(det.a_left) && !isigniter(det.a_right))) to_chat(user, "Assembly must contain one igniter.") @@ -314,4 +314,3 @@ beakers += B1 beakers += B2 - \ No newline at end of file