Fix Sofa Armrest Colors (#19037)

* Fixed sofa armrests being the wrong colour.

code/__DEFINES/color.dm

@@ -102,6 +102,7 @@
 #define COLOR_SNOW             "#9CADAD"
 #define COLOR_LING_HIVEMIND    "#583012"
 #define COLOR_LINOLEUM         "#4E4D41"
+#define COLOR_LEATHER          "#5C4831"
 
 #define COLOR_TOOLS            "#eac041"
 

code/__DEFINES/layers.dm

@@ -106,6 +106,7 @@
 	#define MECH_DECAL_LAYER 4.09
 	//ABOVE_HUMAN
 	#define ABOVE_HUMAN_LAYER 4.10
+	#define ABOVE_ABOVE_HUMAN_LAYER 4.101
 	#define VEHICLE_LOAD_LAYER 4.11
 	#define CAMERA_LAYER 4.12
 	//BLOB

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -29,12 +29,12 @@
 	generate_overlay_cache(material, CACHE_TYPE_OVER, ABOVE_HUMAN_LAYER) // Generate overlay for backrest
 	// Padding overlay.
 	if(padding_material)
-		generate_overlay_cache(padding_material, CACHE_TYPE_PADDING_OVER, ABOVE_HUMAN_LAYER, TRUE) // Generate padding overlay for backrest
+		generate_overlay_cache(padding_material, CACHE_TYPE_PADDING_OVER, ABOVE_ABOVE_HUMAN_LAYER, TRUE) // Generate padding overlay for backrest
 
 	if(buckled)
 		generate_overlay_cache(material, CACHE_TYPE_ARMREST, ABOVE_HUMAN_LAYER) // Generate armrests
 		if(padding_material)
-			generate_overlay_cache(padding_material, CACHE_TYPE_PADDING_ARMREST, ABOVE_HUMAN_LAYER, TRUE) // Generate padding overlay for armrest
+			generate_overlay_cache(padding_material, CACHE_TYPE_PADDING_ARMREST, ABOVE_ABOVE_HUMAN_LAYER, TRUE) // Generate padding overlay for armrest
 
 /obj/structure/bed/stool/chair/set_dir()
 	. = ..()

code/modules/materials/materials.dm

@@ -916,7 +916,7 @@
 
 /material/leather
 	name = MATERIAL_LEATHER
-	icon_colour = "#5C4831"
+	icon_colour = COLOR_LEATHER
 	stack_type = /obj/item/stack/material/leather
 	stack_origin_tech = list(TECH_MATERIAL = 2)
 	flags = MATERIAL_PADDING
@@ -1040,7 +1040,7 @@
 	stack_origin_tech = list(TECH_MATERIAL = 2)
 	stack_type = /obj/item/stack/material/animalhide
 	door_icon_base = "wood"
-	icon_colour = "#5C4831"
+	icon_colour = COLOR_LEATHER
 	ignition_point = T0C+232
 	melting_point = T0C+300
 	flags = MATERIAL_PADDING

code/modules/mob/living/carbon/human/species/station/golem.dm

@@ -805,7 +805,7 @@ var/global/list/golem_types = list(
 
 	meat_type = /obj/item/reagent_containers/food/snacks/meat
 
-	blood_color = "#5C4831"
+	blood_color = COLOR_LEATHER
 	flesh_color = "#FFC896"
 
 	death_message = "collapses into a pile of flesh!"

html/changelogs/geeves-sofa_armrest_fix.yml

@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed sofa armrests being the wrong colour."