From 78708a3582f7a45fb9241220fb06c2a118963a1f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 28 Feb 2018 19:41:44 -0600 Subject: [PATCH] [MIRROR] Fix icon of black fancy table in editor (#5735) * Fix icon of black fancy table in editor * Fix icon of black fancy table in editor --- code/game/objects/structures/tables_racks.dm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 08844149f2..e2d270aa56 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -263,25 +263,18 @@ /obj/structure/table/wood/fancy name = "fancy table" desc = "A standard metal table frame covered with an amazingly fancy, patterned cloth." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/smooth_structures/fancy_table.dmi' icon_state = "fancy_table" frame = /obj/structure/table_frame framestack = /obj/item/stack/rods buildstack = /obj/item/stack/tile/carpet canSmoothWith = list(/obj/structure/table/wood/fancy, /obj/structure/table/wood/fancy/black) -/obj/structure/table/wood/fancy/New() - icon = 'icons/obj/smooth_structures/fancy_table.dmi' //so that the tables place correctly in the map editor - ..() - /obj/structure/table/wood/fancy/black + icon = 'icons/obj/smooth_structures/fancy_table_black.dmi' icon_state = "fancy_table_black" buildstack = /obj/item/stack/tile/carpet/black -/obj/structure/table/wood/fancy/black/New() - ..() - icon = 'icons/obj/smooth_structures/fancy_table_black.dmi' - /* * Reinforced tables */ @@ -341,7 +334,7 @@ /obj/structure/table/reinforced/brass/Destroy() change_construction_value(-2) return ..() - + /obj/structure/table/reinforced/brass/tablepush(mob/living/user, mob/living/pushed_mob) .= ..() playsound(src, 'sound/magic/clockwork/fellowship_armory.ogg', 50, TRUE)