From 23b1bc9c3c7680968d6034dcd34a50ffa65020f2 Mon Sep 17 00:00:00 2001 From: Geeves Date: Thu, 5 Aug 2021 18:02:16 +0200 Subject: [PATCH] Empty Magazine Recycling (#12246) --- code/modules/projectiles/ammunition.dm | 4 ++++ html/changelogs/geeves-empty_magazine_recycling.yml | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 html/changelogs/geeves-empty_magazine_recycling.yml diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 7873c92b6d7..4dfeb506c93 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -166,6 +166,10 @@ new_state = ammo_states[idx] break icon_state = (new_state)? new_state : initial(icon_state) + if(!length(stored_ammo)) + recyclable = TRUE + else + recyclable = FALSE /obj/item/ammo_magazine/examine(mob/user) ..() diff --git a/html/changelogs/geeves-empty_magazine_recycling.yml b/html/changelogs/geeves-empty_magazine_recycling.yml new file mode 100644 index 00000000000..e06eb9d9be5 --- /dev/null +++ b/html/changelogs/geeves-empty_magazine_recycling.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Empty magazines can now be recycled in an autolathe." \ No newline at end of file