From f84bbf85b9dba99e83f05b5b7224c75302f62225 Mon Sep 17 00:00:00 2001 From: Adrer Date: Wed, 13 Sep 2023 22:06:01 +0200 Subject: [PATCH] C4 now properly explodes when an assembly is attached. (#22197) * Changes assemblyholder to assembly in C4 * Minor change when planting C4 with assembly * Update code/game/objects/items/weapons/explosives.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --------- Co-authored-by: Adrer Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --- code/game/objects/items/weapons/explosives.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 9f7dbcf64c1..2f4fe5f67c8 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -10,7 +10,7 @@ toolspeed = 1 var/atom/target = null var/image_overlay = null - var/obj/item/assembly_holder/nadeassembly = null + var/obj/item/assembly/nadeassembly = null var/assemblyattacher /obj/item/grenade/plastic/Initialize(mapload) @@ -23,8 +23,8 @@ return ..() /obj/item/grenade/plastic/attackby(obj/item/I, mob/user, params) - if(!nadeassembly && istype(I, /obj/item/assembly_holder)) - var/obj/item/assembly_holder/A = I + if(!nadeassembly && istype(I, /obj/item/assembly)) + var/obj/item/assembly/A = I if(!user.unEquip(I)) return ..() nadeassembly = A @@ -71,7 +71,7 @@ if(isobserver(AM)) to_chat(user, "Your hand just phases through [AM]!") return - to_chat(user, "You start planting [src]. The timer is set to [det_time]...") + to_chat(user, "You start planting [src].[isnull(nadeassembly) ? " The timer is set to [det_time]..." : ""]") if(do_after(user, 50 * toolspeed, target = AM)) if(!user.unEquip(src))