From b472a861fa4e0acf9e5f54fbdaf0d747a3da1fd5 Mon Sep 17 00:00:00 2001 From: Arthri <41360489+Arthri@users.noreply.github.com> Date: Thu, 13 Feb 2025 06:25:12 +0800 Subject: [PATCH] Allow decompilation of shrapnel and cardboard tubes (#28306) * Allow decompilation of shrapnel, cardboard tubes, ammo boxes and magazines * Do not allow decompilation of magazines --------- Co-authored-by: Arthri <41360489+a@users.noreply.github.com> --- code/game/objects/items/weapons/grenades/frag.dm | 4 ++++ code/game/objects/items/weapons/misc_items.dm | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/code/game/objects/items/weapons/grenades/frag.dm b/code/game/objects/items/weapons/grenades/frag.dm index fdaa2ab050b..d77a761f61e 100644 --- a/code/game/objects/items/weapons/grenades/frag.dm +++ b/code/game/objects/items/weapons/grenades/frag.dm @@ -73,4 +73,8 @@ icon_state = pick("shrapnel1", "shrapnel2", "shrapnel3") scatter_atom() +/obj/item/shrapnel/decompile_act(obj/item/matter_decompiler/C, mob/user) + qdel(src) + return TRUE + #undef DEFAULT_SHRAPNEL_RANGE diff --git a/code/game/objects/items/weapons/misc_items.dm b/code/game/objects/items/weapons/misc_items.dm index 5097771d549..03f298f75b0 100644 --- a/code/game/objects/items/weapons/misc_items.dm +++ b/code/game/objects/items/weapons/misc_items.dm @@ -121,6 +121,10 @@ throw_speed = 4 throw_range = 5 +/obj/item/c_tube/decompile_act(obj/item/matter_decompiler/C, mob/user) + qdel(src) + return TRUE + /obj/item/fan