From d86ef70028745292c93a19107880de9b996d42ce Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 20 May 2018 12:14:55 -0300 Subject: [PATCH] fixes #4202 (#4773) --- code/modules/tables/presets.dm | 9 ++++++--- code/modules/tables/rack.dm | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/tables/presets.dm b/code/modules/tables/presets.dm index a2a84182e15..7eebdcdd139 100644 --- a/code/modules/tables/presets.dm +++ b/code/modules/tables/presets.dm @@ -1,15 +1,17 @@ -/obj/structure/table //Exists for the purpose of neatness in the editor. Don't map this ever. - var/table_mat = DEFAULT_TABLE_MATERIAL +/obj/structure/table + var/table_mat var/table_reinf /obj/structure/table/Initialize() - material = get_material_by_name(table_mat) + if(table_mat) + material = get_material_by_name(table_mat) if(table_reinf) reinforced = get_material_by_name(table_reinf) . = ..() /obj/structure/table/standard icon_state = "plain_preview" + table_mat = DEFAULT_TABLE_MATERIAL /obj/structure/table/steel icon_state = "plain_preview" @@ -24,6 +26,7 @@ /obj/structure/table/reinforced icon_state = "reinf_preview" + table_mat = DEFAULT_TABLE_MATERIAL table_reinf = DEFAULT_WALL_MATERIAL /obj/structure/table/reinforced/steel diff --git a/code/modules/tables/rack.dm b/code/modules/tables/rack.dm index bd3ee6ce55f..f51a9ec8b30 100644 --- a/code/modules/tables/rack.dm +++ b/code/modules/tables/rack.dm @@ -6,6 +6,7 @@ can_plate = 0 can_reinforce = 0 flipped = -1 + table_mat = DEFAULT_TABLE_MATERIAL /obj/structure/table/rack/New() ..()