From 0f72c2c9322f0e3991ec12de7973f42bd75147ab Mon Sep 17 00:00:00 2001
From: Arthri <41360489+a@users.noreply.github.com>
Date: Sun, 9 Feb 2025 17:03:49 +0000
Subject: [PATCH 1/2] Allow decompilation of shrapnel, cardboard tubes, ammo
 boxes and magazines

---
 code/game/objects/items/weapons/grenades/frag.dm | 4 ++++
 code/game/objects/items/weapons/misc_items.dm    | 4 ++++
 code/modules/projectiles/ammunition.dm           | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/code/game/objects/items/weapons/grenades/frag.dm b/code/game/objects/items/weapons/grenades/frag.dm
index fdaa2ab050bf..d77a761f61e5 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 5097771d5491..03f298f75b08 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
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 69f6eab960c2..475ee2e51602 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -266,6 +266,12 @@
 		var/value = max(materials_per * num_ammo, 500) //Enforce a minimum of 500 units even if empty.
 		materials[M] = value
 
+/obj/item/ammo_box/decompile_act(obj/item/matter_decompiler/C, mob/user)
+	if(isdrone(user) && !length(stored_ammo))
+		qdel(src)
+		return TRUE
+	return FALSE
+
 //Behavior for magazines
 /obj/item/ammo_box/magazine/proc/ammo_count()
 	return length(stored_ammo)

From 3cd04eb54f54b025d5c681858bfa8a64db7e95e6 Mon Sep 17 00:00:00 2001
From: Arthri <41360489+a@users.noreply.github.com>
Date: Mon, 10 Feb 2025 16:32:31 +0000
Subject: [PATCH 2/2] Do not allow decompilation of magazines

---
 code/modules/projectiles/ammunition.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 475ee2e51602..69f6eab960c2 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -266,12 +266,6 @@
 		var/value = max(materials_per * num_ammo, 500) //Enforce a minimum of 500 units even if empty.
 		materials[M] = value
 
-/obj/item/ammo_box/decompile_act(obj/item/matter_decompiler/C, mob/user)
-	if(isdrone(user) && !length(stored_ammo))
-		qdel(src)
-		return TRUE
-	return FALSE
-
 //Behavior for magazines
 /obj/item/ammo_box/magazine/proc/ammo_count()
 	return length(stored_ammo)