From e07299df8bff7b8ff44b8938618d61be81707e6c Mon Sep 17 00:00:00 2001
From: Carpe Venenum <17379794+carpevenenum@users.noreply.github.com>
Date: Wed, 3 Mar 2021 14:48:12 +0300
Subject: [PATCH] Gradients now respect the hairstyle's blending mode (#11333)

---
 .../mob/living/carbon/human/update_icons.dm   |  4 +-
 html/changelogs/carpevenenum - gradients.yml  | 41 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/carpevenenum - gradients.yml

diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index b99cd93dd6e..14f00dd3bd8 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -404,7 +404,9 @@ There are several things that need to be remembered:
 						grad_s.Blend(rgb(r_grad, g_grad, b_grad), ICON_MULTIPLY)
 					hair_s.Blend(rgb(r_hair, g_hair, b_hair), hair_style.icon_blend_mode)
 					if(!isnull(grad_s))
-						hair_s.Blend(grad_s, ICON_OVERLAY)
+						var/icon/grad_s_final = new/icon("icon" = hair_style.icon, "icon_state" = hair_style.icon_state)
+						grad_s_final.Blend(grad_s, hair_style.icon_blend_mode)
+						hair_s.Blend(grad_s_final, ICON_OVERLAY)
 
 				face_standing.Blend(hair_s, ICON_OVERLAY)
 
diff --git a/html/changelogs/carpevenenum - gradients.yml b/html/changelogs/carpevenenum - gradients.yml
new file mode 100644
index 00000000000..43eb28e77f7
--- /dev/null
+++ b/html/changelogs/carpevenenum - gradients.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: Carpe Venenum
+
+# 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:
+  - tweak: "Hairstyle gradients now respect the original hairstyle's blending mode, meaning that they are now properly shaded."