diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index be833aec08..426db6b7dd 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -114,6 +114,7 @@ if(!istype(src.loc, /turf)) user.drop_from_inventory(src) src.loc = get_turf(src) + playsound(src.loc, 'sound/effects/rustle5.ogg', 50, 1) to_chat(user, "You add padding to \the [src].") add_padding(padding_type) return 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 5d1322c3c3..ffef310fdf 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -132,6 +132,42 @@ /obj/structure/bed/chair/comfy/orange/Initialize(var/ml,var/newmaterial) . = ..(ml, MAT_STEEL, "orange") +/obj/structure/bed/chair/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) + . = ..(ml, MAT_STEEL, MAT_LEATHER) + +/obj/structure/bed/chair/rounded/red/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "carpet") + +/obj/structure/bed/chair/rounded/teal/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "teal") + +/obj/structure/bed/chair/rounded/black/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "black") + +/obj/structure/bed/chair/rounded/green/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "green") + +/obj/structure/bed/chair/rounded/purple/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "purple") + +/obj/structure/bed/chair/rounded/blue/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "blue") + +/obj/structure/bed/chair/rounded/beige/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "beige") + +/obj/structure/bed/chair/rounded/lime/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "lime") + +/obj/structure/bed/chair/rounded/yellow/Initialize(var/ml,var/newmaterial) + . = ..(ml, MAT_STEEL, "yellow") + /obj/structure/bed/chair/office anchored = 0 buckle_movable = 1 diff --git a/code/modules/materials/materials/metals/steel.dm b/code/modules/materials/materials/metals/steel.dm index 10560dec36..e871e03070 100644 --- a/code/modules/materials/materials/metals/steel.dm +++ b/code/modules/materials/materials/metals/steel.dm @@ -28,6 +28,18 @@ new /datum/stack_recipe("yellow comfy chair", /obj/structure/bed/chair/comfy/yellow, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), 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_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]"), new /datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), diff --git a/code/modules/materials/materials/organic/leather.dm b/code/modules/materials/materials/organic/leather.dm index f5fc8cb2f9..cb564bcbd6 100644 --- a/code/modules/materials/materials/organic/leather.dm +++ b/code/modules/materials/materials/organic/leather.dm @@ -1,6 +1,6 @@ /datum/material/leather name = MAT_LEATHER - display_name = "plainleather" + display_name = "plain leather" icon_colour = "#5C4831" stack_type = /obj/item/stack/material/leather stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) diff --git a/icons/obj/furniture.dmi b/icons/obj/furniture.dmi index 7e0badd1e8..f75fef6207 100644 Binary files a/icons/obj/furniture.dmi and b/icons/obj/furniture.dmi differ