cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 20:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fires nanites responsible for incorrect facial hair coloring. Hires human barber from the Bowl to dye everyone's beards

Browse Source
This commit is contained in:
Atermonera
2020-12-17 17:22:52 -05:00
committed by VirgoBot
parent a2ab304c3e
commit bee9156f01
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_icon.dm
+4
View File
@@ -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