From caaebe4f36299f5f52c13112b068403fb1cf733b Mon Sep 17 00:00:00 2001
From: cadyn <35672377+cadyn@users.noreply.github.com>
Date: Fri, 11 Sep 2020 00:12:56 -0700
Subject: [PATCH] Fixes broken guns (#7635)
Broken guns now reveal names of parts needed instead of paths
---
code/modules/projectiles/broken.dm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/code/modules/projectiles/broken.dm b/code/modules/projectiles/broken.dm
index 9dd3107d6eb..a63f685ba11 100644
--- a/code/modules/projectiles/broken.dm
+++ b/code/modules/projectiles/broken.dm
@@ -32,8 +32,19 @@
if(do_after(user, 5 SECONDS))
to_chat(user, "\The [src] can possibly be restored with:")
for(var/resource in material_needs)
+ var/obj/item/res = resource
if(material_needs[resource] > 0)
- to_chat(user, "- [bicon(resource)] x [material_needs[resource]] [resource]")
+ var/res_name = ""
+ if(ispath(res,/obj/item/stack/material))
+ var/obj/item/stack/material/mat_stack = res
+ var/material/mat = get_material_by_name("[initial(mat_stack.default_type)]")
+ if(material_needs[resource]>1)
+ res_name = "[mat.use_name] [mat.sheet_plural_name]"
+ else
+ res_name = "[mat.use_name] [mat.sheet_singular_name]"
+ else
+ res_name = initial(res.name)
+ to_chat(user, "- x [material_needs[resource]] [res_name]")
/obj/item/weapon/broken_gun/proc/setup_gun(var/obj/item/weapon/gun/path)
if(ispath(path))