diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index a3deade91962..d3b9c46cfd3e 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -54,15 +54,17 @@ GLOBAL_LIST_INIT(metal_recipes, list( new /datum/stack_recipe_list("comfy chairs", list( new /datum/stack_recipe("corporate comfy chair", /obj/structure/chair/comfy/corp, 2, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("beige comfy chair", /obj/structure/chair/comfy/beige, 2, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("black comfy chair", /obj/structure/chair/comfy/black, 2, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("brown comfy chair", /obj/structure/chair/comfy/brown, 2, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("lime comfy chair", /obj/structure/chair/comfy/lime, 2, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("teal comfy chair", /obj/structure/chair/comfy/teal, 2, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("red comfy chair", /obj/structure/chair/comfy/red, 2, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("orange comfy chair", /obj/structure/chair/comfy/orange, 2, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("yellow comfy chair", /obj/structure/chair/comfy/yellow, 2, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("green comfy chair", /obj/structure/chair/comfy/green, 2, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("teal comfy chair", /obj/structure/chair/comfy/teal, 2, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("lime comfy chair", /obj/structure/chair/comfy/lime, 2, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("blue comfy chair", /obj/structure/chair/comfy/blue, 2, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("purple comfy chair", /obj/structure/chair/comfy/purp, 2, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("green comfy chair", /obj/structure/chair/comfy/green, 2, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("brown comfy chair", /obj/structure/chair/comfy/brown, 2, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("black comfy chair", /obj/structure/chair/comfy/black, 2, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("beige comfy chair", /obj/structure/chair/comfy/beige, 2, one_per_turf = TRUE, on_floor = TRUE), )), null, 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 ccffafa75700..f7fc087084b9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -210,31 +210,37 @@ cut_overlay(armrest) /obj/structure/chair/comfy/brown - color = rgb(141,70,0) + color = rgb(128,83,51) /obj/structure/chair/comfy/red - color = rgb(218,2,10) + color = rgb(204, 62, 66) /obj/structure/chair/comfy/teal - color = rgb(0,234,250) + color = rgb(64,186,174) /obj/structure/chair/comfy/black - color = rgb(60,60,60) + color = rgb(74,74,85) /obj/structure/chair/comfy/green - color = rgb(1,196,8) + color = rgb(78,188,81) /obj/structure/chair/comfy/purp - color = rgb(112,2,176) + color = rgb(138,80,180) /obj/structure/chair/comfy/blue - color = rgb(2,9,210) + color = rgb(70,90,190) /obj/structure/chair/comfy/beige - color = rgb(255,253,195) + color = rgb(174,169,147) /obj/structure/chair/comfy/lime - color = rgb(255,251,0) + color = rgb(160,251,66) + +/obj/structure/chair/comfy/yellow + color = rgb(216,187,70) + +/obj/structure/chair/comfy/orange + color = rgb(229,111,52) /obj/structure/chair/office anchored = FALSE diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index 7b2a970ac0d8..85f4cc2df1af 100644 Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ