diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index d8c6b33387..e1c4e314e9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -93,12 +93,26 @@ color = null applies_material_colour = 0 -// Leaving this in for the sake of compilation. /obj/structure/bed/chair/comfy + name = "comfy chair" desc = "It's a chair. It looks comfy." icon_state = "comfychair" base_icon = "comfychair" +/obj/structure/bed/chair/comfy/update_icon() + ..() + var/image/I = image(icon, "[base_icon]_over") + I.layer = ABOVE_MOB_LAYER + I.plane = MOB_PLANE + I.color = material.icon_colour + add_overlay(I) + if(padding_material) + I = image(icon, "[base_icon]_padding_over") + I.layer = ABOVE_MOB_LAYER + I.plane = MOB_PLANE + I.color = padding_material.icon_colour + add_overlay(I) + /obj/structure/bed/chair/comfy/brown/Initialize(var/ml,var/newmaterial) . = ..(ml, MAT_STEEL, MAT_LEATHER) @@ -132,40 +146,40 @@ /obj/structure/bed/chair/comfy/orange/Initialize(var/ml,var/newmaterial) . = ..(ml, MAT_STEEL, "orange") -/obj/structure/bed/chair/rounded +/obj/structure/bed/chair/comfy/rounded name = "rounded chair" desc = "It's a rounded chair. It looks comfy." icon_state = "roundedchair" base_icon = "roundedchair" -/obj/structure/bed/chair/rounded/brown/Initialize(var/ml,var/newmaterial) +/obj/structure/bed/chair/comfy/rounded/brown/Initialize(var/ml,var/newmaterial) . = ..(ml, MAT_STEEL, MAT_LEATHER) -/obj/structure/bed/chair/rounded/red/Initialize(var/ml,var/newmaterial) +/obj/structure/bed/chair/comfy/rounded/red/Initialize(var/ml,var/newmaterial) . = ..(ml, MAT_STEEL, "carpet") -/obj/structure/bed/chair/rounded/teal/Initialize(var/ml,var/newmaterial) +/obj/structure/bed/chair/comfy/rounded/teal/Initialize(var/ml,var/newmaterial) . = ..(ml, MAT_STEEL, "teal") -/obj/structure/bed/chair/rounded/black/Initialize(var/ml,var/newmaterial) +/obj/structure/bed/chair/comfy/rounded/black/Initialize(var/ml,var/newmaterial) . = ..(ml, MAT_STEEL, "black") -/obj/structure/bed/chair/rounded/green/Initialize(var/ml,var/newmaterial) +/obj/structure/bed/chair/comfy/rounded/green/Initialize(var/ml,var/newmaterial) . = ..(ml, MAT_STEEL, "green") -/obj/structure/bed/chair/rounded/purple/Initialize(var/ml,var/newmaterial) +/obj/structure/bed/chair/comfy/rounded/purple/Initialize(var/ml,var/newmaterial) . = ..(ml, MAT_STEEL, "purple") -/obj/structure/bed/chair/rounded/blue/Initialize(var/ml,var/newmaterial) +/obj/structure/bed/chair/comfy/rounded/blue/Initialize(var/ml,var/newmaterial) . = ..(ml, MAT_STEEL, "blue") -/obj/structure/bed/chair/rounded/beige/Initialize(var/ml,var/newmaterial) +/obj/structure/bed/chair/comfy/rounded/beige/Initialize(var/ml,var/newmaterial) . = ..(ml, MAT_STEEL, "beige") -/obj/structure/bed/chair/rounded/lime/Initialize(var/ml,var/newmaterial) +/obj/structure/bed/chair/comfy/rounded/lime/Initialize(var/ml,var/newmaterial) . = ..(ml, MAT_STEEL, "lime") -/obj/structure/bed/chair/rounded/yellow/Initialize(var/ml,var/newmaterial) +/obj/structure/bed/chair/comfy/rounded/yellow/Initialize(var/ml,var/newmaterial) . = ..(ml, MAT_STEEL, "yellow") /obj/structure/bed/chair/office @@ -588,4 +602,4 @@ icon_state = "sofaend_right" /obj/structure/bed/chair/sofa/orange/corner - icon_state = "sofacorner" \ No newline at end of file + icon_state = "sofacorner" diff --git a/code/modules/materials/materials/metals/steel.dm b/code/modules/materials/materials/metals/steel.dm index 96c6bc2fe5..1d60db1281 100644 --- a/code/modules/materials/materials/metals/steel.dm +++ b/code/modules/materials/materials/metals/steel.dm @@ -29,16 +29,16 @@ new /datum/stack_recipe("orange comfy chair", /obj/structure/bed/chair/comfy/orange, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), )), new /datum/stack_recipe_list("rounded chairs", list( - new /datum/stack_recipe("beige rounded chair", /obj/structure/bed/chair/rounded/beige, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("black rounded chair", /obj/structure/bed/chair/rounded/black, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("brown rounded chair", /obj/structure/bed/chair/rounded/brown, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("lime rounded chair", /obj/structure/bed/chair/rounded/lime, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("teal rounded chair", /obj/structure/bed/chair/rounded/teal, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("red rounded chair", /obj/structure/bed/chair/rounded/red, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("blue rounded chair", /obj/structure/bed/chair/rounded/blue, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("purple rounded chair", /obj/structure/bed/chair/rounded/purple, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("green rounded chair", /obj/structure/bed/chair/rounded/green, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("yellow rounded chair", /obj/structure/bed/chair/rounded/yellow, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("beige rounded chair", /obj/structure/bed/chair/comfy/rounded/beige, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("black rounded chair", /obj/structure/bed/chair/comfy/rounded/black, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("brown rounded chair", /obj/structure/bed/chair/comfy/rounded/brown, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("lime rounded chair", /obj/structure/bed/chair/comfy/rounded/lime, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("teal rounded chair", /obj/structure/bed/chair/comfy/rounded/teal, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("red rounded chair", /obj/structure/bed/chair/comfy/rounded/red, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("blue rounded chair", /obj/structure/bed/chair/comfy/rounded/blue, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("purple rounded chair", /obj/structure/bed/chair/comfy/rounded/purple, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("green rounded chair", /obj/structure/bed/chair/comfy/rounded/green, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), + new /datum/stack_recipe("yellow rounded chair", /obj/structure/bed/chair/comfy/rounded/yellow, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), )), new /datum/stack_recipe_list("airlock assemblies", list( new /datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), @@ -95,4 +95,4 @@ new /datum/stack_recipe("apc frame", /obj/item/frame/apc, 2, recycle_material = "[name]"), new /datum/stack_recipe("desk bell", /obj/item/deskbell, 1, on_floor = 1, supplied_material = "[name]"), new /datum/stack_recipe("tanning rack", /obj/structure/tanning_rack, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]") - ) \ No newline at end of file + )