From cdc42acc76a0822f464c3389f799c3c3679ee42f Mon Sep 17 00:00:00 2001
From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com>
Date: Sat, 1 Jan 2022 13:58:17 +0800
Subject: [PATCH] Chair overlays fix (#12879)

---
 .../structures/stool_bed_chair_nest/chairs.dm | 10 ++++-
 html/changelogs/wezzy_chairfix3.yml           | 41 +++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/wezzy_chairfix3.yml

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 76523e045fe..be3c40db27f 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -42,7 +42,10 @@
 		if(!furniture_cache[padding_cache_key])
 			var/image/I =  image(icon, "[base_icon]_padding_over")
 			if(material_alteration & MATERIAL_ALTERATION_COLOR)
-				I.color = padding_material.icon_colour
+				if(painted_colour)
+					I.color = painted_colour
+				else if(padding_material.icon_colour)
+					I.color = padding_material.icon_colour
 			I.layer = FLY_LAYER
 			furniture_cache[padding_cache_key] = I
 		add_overlay(furniture_cache[padding_cache_key])
@@ -62,7 +65,10 @@
 				var/image/I = image(icon, "[base_icon]_padding_armrest")
 				I.layer = FLY_LAYER
 				if(material_alteration & MATERIAL_ALTERATION_COLOR)
-					I.color = padding_material.icon_colour
+					if(painted_colour)
+						I.color = painted_colour
+					else if(padding_material.icon_colour)
+						I.color = padding_material.icon_colour
 				furniture_cache[cache_key] = I
 			add_overlay(furniture_cache[cache_key])
 
diff --git a/html/changelogs/wezzy_chairfix3.yml b/html/changelogs/wezzy_chairfix3.yml
new file mode 100644
index 00000000000..d3101b92f2e
--- /dev/null
+++ b/html/changelogs/wezzy_chairfix3.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Fixes chair buckle overlays being uncolored."