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 8d391f14ff..258617893f 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -189,6 +189,25 @@ /obj/structure/bed/chair/office/dark icon_state = "officechair_dark" +/obj/structure/bed/chair/sofa //Paradise port, feel free to add colors and the like if desired. + name = "sofa" + desc = "It's a couch. It looks comfy." + icon_state = "sofamiddle" + base_icon = "sofamiddle" + applies_material_colour = 0 + +/obj/structure/bed/chair/sofa/left + icon_state = "sofaend_left" + base_icon = "sofaend_left" + +/obj/structure/bed/chair/sofa/right + icon_state = "sofaend_right" + base_icon = "sofaend_right" + +/obj/structure/bed/chair/sofa/corner + icon_state = "sofacorner" + base_icon = "sofacorner" + // Chair types /obj/structure/bed/chair/wood name = "wooden chair" diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm index b9d06da51e..c42eb1f92c 100644 --- a/code/modules/materials/material_recipes.dm +++ b/code/modules/materials/material_recipes.dm @@ -46,6 +46,12 @@ new/datum/stack_recipe("purple comfy chair", /obj/structure/bed/chair/comfy/purp, 2, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("green comfy chair", /obj/structure/bed/chair/comfy/green, 2, one_per_turf = 1, on_floor = 1), \ )) + recipes += new/datum/stack_recipe_list("sofa", list( \ + new/datum/stack_recipe("left sofa end", /obj/structure/bed/chair/sofa/left, 2, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("middle sofa", /obj/structure/bed/chair/sofa, 2, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("right sofa end", /obj/structure/bed/chair/sofa/right, 2, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("corner sofa", /obj/structure/bed/chair/sofa/corner, 2, one_per_turf = 1, on_floor = 1), \ + )) recipes += new/datum/stack_recipe("table frame", /obj/structure/table, 1, time = 10, one_per_turf = 1, on_floor = 1) recipes += new/datum/stack_recipe("bench frame", /obj/structure/table/bench, 1, time = 10, one_per_turf = 1, on_floor = 1) recipes += new/datum/stack_recipe("rack", /obj/structure/table/rack, 1, time = 5, one_per_turf = 1, on_floor = 1) @@ -124,7 +130,7 @@ recipes += new/datum/stack_recipe("water-cooler", /obj/structure/reagent_dispensers/water_cooler, 4, time = 10, one_per_turf = 1, on_floor = 1) recipes += new/datum/stack_recipe("lampshade", /obj/item/weapon/lampshade, 1, time = 1) recipes += new/datum/stack_recipe("Feeder", /obj/machinery/feeder, 4, time = 20, one_per_turf = 1, on_floor = 1) - + /material/wood/generate_recipes() ..() recipes += new/datum/stack_recipe("oar", /obj/item/weapon/oar, 2, time = 30, supplied_material = "[name]") diff --git a/icons/obj/furniture_vr.dmi b/icons/obj/furniture_vr.dmi index 9e0bd1b3a5..73df22abac 100644 Binary files a/icons/obj/furniture_vr.dmi and b/icons/obj/furniture_vr.dmi differ