From bee9156f0177422d393f3461e7e9fe356dd92b8c Mon Sep 17 00:00:00 2001 From: Atermonera Date: Thu, 17 Dec 2020 13:20:42 -0900 Subject: [PATCH 1/3] Fires nanites responsible for incorrect facial hair coloring. Hires human barber from the Bowl to dye everyone's beards --- code/modules/mob/living/carbon/human/update_icons.dm | 4 ++++ code/modules/organs/organ_icon.dm | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index f47566279ad..deeb3e9b1a7 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -427,7 +427,11 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() if(facial_hair_style && facial_hair_style.species_allowed && (src.species.get_bodytype(src) in facial_hair_style.species_allowed)) var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") if(facial_hair_style.do_colouration) +<<<<<<< HEAD facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_MULTIPLY) //VOREStation edit +======= + facial_s.Blend(rgb(r_facial, g_facial, b_facial), facial_hair_style.color_blend_mode) +>>>>>>> 928badc... Merge pull request #7788 from Atermonera/beard_color face_standing.Blend(facial_s, ICON_OVERLAY) diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index 86e71c4fc2e..b04f04eeba6 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -122,7 +122,11 @@ var/global/list/limb_icon_cache = list() if(facial_hair_style && facial_hair_style.species_allowed && (species.get_bodytype(owner) in facial_hair_style.species_allowed)) var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") if(facial_hair_style.do_colouration) +<<<<<<< HEAD facial_s.Blend(rgb(owner.r_facial, owner.g_facial, owner.b_facial), ICON_MULTIPLY) // VOREStation edit +======= + facial_s.Blend(rgb(owner.r_facial, owner.g_facial, owner.b_facial), facial_hair_style.color_blend_mode) +>>>>>>> 928badc... Merge pull request #7788 from Atermonera/beard_color res.add_overlay(facial_s) //Head hair From ae3b41a7b1ddf8bbffcacdcd3e2f3d1699b4898f Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 11 Mar 2021 15:25:11 -0500 Subject: [PATCH 2/3] Update update_icons.dm --- code/modules/mob/living/carbon/human/update_icons.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index deeb3e9b1a7..1460adcc1cb 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -427,11 +427,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() if(facial_hair_style && facial_hair_style.species_allowed && (src.species.get_bodytype(src) in facial_hair_style.species_allowed)) var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") if(facial_hair_style.do_colouration) -<<<<<<< HEAD - facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_MULTIPLY) //VOREStation edit -======= facial_s.Blend(rgb(r_facial, g_facial, b_facial), facial_hair_style.color_blend_mode) ->>>>>>> 928badc... Merge pull request #7788 from Atermonera/beard_color face_standing.Blend(facial_s, ICON_OVERLAY) From b865bf8f1253d4e0d003d7f16a64fc17a91bdde2 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 11 Mar 2021 15:25:27 -0500 Subject: [PATCH 3/3] Update organ_icon.dm --- code/modules/organs/organ_icon.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index b04f04eeba6..6239577b8d2 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -122,11 +122,7 @@ var/global/list/limb_icon_cache = list() if(facial_hair_style && facial_hair_style.species_allowed && (species.get_bodytype(owner) in facial_hair_style.species_allowed)) var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") if(facial_hair_style.do_colouration) -<<<<<<< HEAD - facial_s.Blend(rgb(owner.r_facial, owner.g_facial, owner.b_facial), ICON_MULTIPLY) // VOREStation edit -======= facial_s.Blend(rgb(owner.r_facial, owner.g_facial, owner.b_facial), facial_hair_style.color_blend_mode) ->>>>>>> 928badc... Merge pull request #7788 from Atermonera/beard_color res.add_overlay(facial_s) //Head hair