From fcd855ea7008be515f1aeab297d807ae0cb66ba6 Mon Sep 17 00:00:00 2001 From: Floyd Date: Thu, 25 Jul 2019 00:21:18 +0200 Subject: [PATCH] fixes --- code/datums/components/material_container.dm | 2 +- code/game/mecha/mech_fabricator.dm | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 45fcf8e03b9..4db6612a84a 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -341,7 +341,7 @@ if(!istype(I)) return FALSE var/material_amount = 0 - for(var/MAT in I.materials) + for(var/MAT in materials) material_amount += I.materials[MAT] return material_amount diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 34c399c1c7c..bad714cc785 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -104,7 +104,8 @@ var/i = 0 var/output for(var/c in D.materials) - output += "[i?" | ":null][get_resource_cost_w_coeff(D, c)] [material2name(c)]" + var/datum/material/M = c + output += "[i?" | ":null][get_resource_cost_w_coeff(D, M)] [M.name]" i++ return output @@ -399,9 +400,9 @@ ..() /obj/machinery/mecha_part_fabricator/proc/AfterMaterialInsert(type_inserted, id_inserted, amount_inserted) - var/stack_name = material2name(id_inserted) - add_overlay("fab-load-[stack_name]") - addtimer(CALLBACK(src, /atom/proc/cut_overlay, "fab-load-[stack_name]"), 10) + var/datum/material/M = id_inserted + add_overlay("fab-load-[M.name]") + addtimer(CALLBACK(src, /atom/proc/cut_overlay, "fab-load-[M.name]"), 10) updateUsrDialog() /obj/machinery/mecha_part_fabricator/attackby(obj/item/W, mob/user, params) @@ -413,8 +414,6 @@ return ..() -/obj/machinery/mecha_part_fabricator/proc/material2name(ID) - return copytext(ID,2) /obj/machinery/mecha_part_fabricator/proc/is_insertion_ready(mob/user) if(panel_open)