From ac37eeb42169c8a2f0fb792406f7a11812ba80ae Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Wed, 14 Sep 2022 19:42:55 -0400 Subject: [PATCH] Fixes custom material examine runtime (#69873) * Fixes custom material examine runtime, and also fixes the exact same problem showing up in GAGS' setting custom material amounts. --- code/game/atoms.dm | 4 +++- code/game/objects/structures/tables_racks.dm | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index f5270743c64..20b938d37cb 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -694,9 +694,11 @@ if(custom_materials) var/list/materials_list = list() - for(var/datum/material/current_material as anything in custom_materials) + for(var/custom_material in custom_materials) + var/datum/material/current_material = GET_MATERIAL_REF(custom_material) materials_list += "[current_material.name]" . += "It is made out of [english_list(materials_list)]." + if(reagents) if(reagents.flags & TRANSPARENT) . += "It contains:" diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 2d39902cadd..98317ba3b7f 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -334,7 +334,8 @@ /obj/structure/table/greyscale/set_custom_materials(list/materials, multiplier) . = ..() var/list/materials_list = list() - for(var/datum/material/current_material as anything in custom_materials) + for(var/custom_material in custom_materials) + var/datum/material/current_material = GET_MATERIAL_REF(custom_material) materials_list += "[current_material.name]" desc = "A square [(materials_list.len > 1) ? "amalgamation" : "piece"] of [english_list(materials_list)] on four legs. It can not move."