From 256aaf7cc27b2b9d98047b52e519a07d2218fe14 Mon Sep 17 00:00:00 2001 From: dj-34 Date: Fri, 27 Oct 2023 12:45:09 +0500 Subject: [PATCH 1/5] Tweak: Recolor comfy chairs --- .../aesthetics/chairs/code/chairs.dm | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/modular_ss220/aesthetics/chairs/code/chairs.dm b/modular_ss220/aesthetics/chairs/code/chairs.dm index 92090157dd3a..48f53343b99b 100644 --- a/modular_ss220/aesthetics/chairs/code/chairs.dm +++ b/modular_ss220/aesthetics/chairs/code/chairs.dm @@ -10,6 +10,31 @@ /obj/structure/chair/comfy/shuttle icon = 'icons/obj/chairs.dmi' +// Recoloring comfy's +/obj/structure/chair/comfy/brown + color = rgb(70, 45, 30) + +/obj/structure/chair/comfy/beige + color = rgb(240, 240, 200) + +/obj/structure/chair/comfy/teal + color = rgb(115, 215, 215) + +/obj/structure/chair/comfy/black + color = rgb(60, 60, 55) + +/obj/structure/chair/comfy/lime + color = rgb(155, 190, 100) + +/obj/structure/chair/comfy/purp + color = rgb(100, 65, 120) + +/obj/structure/chair/comfy/blue + color = rgb(110, 165, 250) + +/obj/structure/chair/comfy/red + color = rgb(165, 65, 65) + /obj/structure/chair/office/dark icon = 'modular_ss220/aesthetics/chairs/icons/chairs.dmi' From be64825ca99c2a0a9acbb947156851baf28d7be5 Mon Sep 17 00:00:00 2001 From: dj-34 Date: Fri, 27 Oct 2023 13:02:49 +0500 Subject: [PATCH 2/5] Fix: Comfy corporate armrest --- modular_ss220/aesthetics/chairs/code/chairs.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modular_ss220/aesthetics/chairs/code/chairs.dm b/modular_ss220/aesthetics/chairs/code/chairs.dm index 48f53343b99b..23c25de0bd7f 100644 --- a/modular_ss220/aesthetics/chairs/code/chairs.dm +++ b/modular_ss220/aesthetics/chairs/code/chairs.dm @@ -7,6 +7,9 @@ /obj/structure/chair/comfy/corp icon = 'icons/obj/chairs.dmi' +/obj/structure/chair/comfy/corp/GetArmrest() + return mutable_appearance('icons/obj/chairs.dmi', "[icon_state]_armrest") + /obj/structure/chair/comfy/shuttle icon = 'icons/obj/chairs.dmi' From 8c90f966c6df98ddd077d3b6a6d1a5d19f38d438 Mon Sep 17 00:00:00 2001 From: dj-34 Date: Fri, 27 Oct 2023 13:27:03 +0500 Subject: [PATCH 3/5] =?UTF-8?q?=D0=92=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20?= =?UTF-8?q?=D1=86=D0=B2=D0=B5=D1=82=20=D0=BA=D0=BE=D1=80=D0=B8=D1=87=D0=BD?= =?UTF-8?q?=D0=B5=D0=B2=D0=BE=D0=BC=D1=83=20=D0=BA=D1=80=D0=B5=D1=81=D0=BB?= =?UTF-8?q?=D1=83=20(=D1=87=D1=82=D0=BE=D0=B1=20=D1=81=D0=BE=D0=B2=D0=BF?= =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D0=BB=20=D1=81=20=D1=86=D0=B2=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=BC=20=D0=B4=D0=B8=D0=B2=D0=B0=D0=BD=D0=B0),=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20blue=20=D1=86=D0=B2=D0=B5?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/aesthetics/chairs/code/chairs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_ss220/aesthetics/chairs/code/chairs.dm b/modular_ss220/aesthetics/chairs/code/chairs.dm index 23c25de0bd7f..45fcff4c252f 100644 --- a/modular_ss220/aesthetics/chairs/code/chairs.dm +++ b/modular_ss220/aesthetics/chairs/code/chairs.dm @@ -15,7 +15,7 @@ // Recoloring comfy's /obj/structure/chair/comfy/brown - color = rgb(70, 45, 30) + color = rgb(141, 70, 0) /obj/structure/chair/comfy/beige color = rgb(240, 240, 200) @@ -33,7 +33,7 @@ color = rgb(100, 65, 120) /obj/structure/chair/comfy/blue - color = rgb(110, 165, 250) + color = rgb(80, 125, 220) /obj/structure/chair/comfy/red color = rgb(165, 65, 65) From c6dd40dbff14f6594071f94c7966218c07466493 Mon Sep 17 00:00:00 2001 From: dj-34 Date: Fri, 27 Oct 2023 13:37:26 +0500 Subject: [PATCH 4/5] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20lime,=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20yellow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/aesthetics/chairs/code/chairs.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modular_ss220/aesthetics/chairs/code/chairs.dm b/modular_ss220/aesthetics/chairs/code/chairs.dm index 45fcff4c252f..8bd327ea27ca 100644 --- a/modular_ss220/aesthetics/chairs/code/chairs.dm +++ b/modular_ss220/aesthetics/chairs/code/chairs.dm @@ -27,7 +27,10 @@ color = rgb(60, 60, 55) /obj/structure/chair/comfy/lime - color = rgb(155, 190, 100) + color = rgb(185, 210, 115) + +/obj/structure/chair/comfy/yellow + color = rgb(225, 215, 125) /obj/structure/chair/comfy/purp color = rgb(100, 65, 120) From 2d4179cd3dfad543514686100315f687e7130c37 Mon Sep 17 00:00:00 2001 From: dj-34 Date: Fri, 27 Oct 2023 13:41:02 +0500 Subject: [PATCH 5/5] =?UTF-8?q?=D0=A0=D0=B5=D0=BE=D1=80=D0=B4=D0=B5=D1=80,?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B1=D1=8B=D0=BB=20=D0=BF=D1=80=D0=BE=20=D0=B7?= =?UTF-8?q?=D0=B5=D0=BB=D1=91=D0=BD=D1=8B=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aesthetics/chairs/code/chairs.dm | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/modular_ss220/aesthetics/chairs/code/chairs.dm b/modular_ss220/aesthetics/chairs/code/chairs.dm index 8bd327ea27ca..5371b411090b 100644 --- a/modular_ss220/aesthetics/chairs/code/chairs.dm +++ b/modular_ss220/aesthetics/chairs/code/chairs.dm @@ -14,32 +14,35 @@ icon = 'icons/obj/chairs.dmi' // Recoloring comfy's -/obj/structure/chair/comfy/brown - color = rgb(141, 70, 0) - /obj/structure/chair/comfy/beige color = rgb(240, 240, 200) -/obj/structure/chair/comfy/teal - color = rgb(115, 215, 215) - /obj/structure/chair/comfy/black color = rgb(60, 60, 55) +/obj/structure/chair/comfy/red + color = rgb(165, 65, 65) + +/obj/structure/chair/comfy/brown + color = rgb(141, 70, 0) + +/obj/structure/chair/comfy/green + color = rgb(80, 170, 85) + /obj/structure/chair/comfy/lime color = rgb(185, 210, 115) /obj/structure/chair/comfy/yellow color = rgb(225, 215, 125) -/obj/structure/chair/comfy/purp - color = rgb(100, 65, 120) - /obj/structure/chair/comfy/blue color = rgb(80, 125, 220) -/obj/structure/chair/comfy/red - color = rgb(165, 65, 65) +/obj/structure/chair/comfy/teal + color = rgb(115, 215, 215) + +/obj/structure/chair/comfy/purp + color = rgb(100, 65, 120) /obj/structure/chair/office/dark icon = 'modular_ss220/aesthetics/chairs/icons/chairs.dmi'