cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-16 01:25:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update update_icons.dm

Browse Source
This commit is contained in:
Novacat
2021-03-11 15:25:11 -05:00
committed by GitHub
parent bee9156f01
commit ae3b41a7b1
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/update_icons.dm
-4
View File
@@ -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)