Skip to content

Commit

Permalink
Resprites Comfy Chairs (#27846)
Browse files Browse the repository at this point in the history
* New Comfy Chairs + Resprite

* Fixes back gap

* Adds gaps in chairs

* Updated Armrest
  • Loading branch information
Alecksohs authored Jan 10, 2025
1 parent 871cb54 commit 9779e47
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 15 deletions.
14 changes: 8 additions & 6 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
24 changes: 15 additions & 9 deletions code/game/objects/structures/stool_bed_chair_nest/chairs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/obj/chairs.dmi
Binary file not shown.

0 comments on commit 9779e47

Please sign in to comment.