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

Merge pull request #2382 from Verkister/hairrevolution

Browse Source 
It's time for hair color revolution!
This commit is contained in:
Spades
2017-10-30 13:56:11 -04:00
committed by GitHub
parent 2a170a499d d879d481d7
commit fa38bec798
4 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_icon.dm
+3 -1
View File
@@ -89,11 +89,13 @@ var/global/list/limb_icon_cache = list()
overlays |= facial_s
if(owner.h_style && !(owner.head && (owner.head.flags_inv & BLOCKHEADHAIR)))
var/datum/sprite_accessory/hair_style = hair_styles_list[owner.h_style]
var/datum/sprite_accessory/hair/hair_style = hair_styles_list[owner.h_style] // VOREStation edit
if(hair_style && (species.get_bodytype(owner) in hair_style.species_allowed))
var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
var/icon/hair_s_add = new/icon("icon" = hair_style.icon_add, "icon_state" = "[hair_style.icon_state]_s") // VOREStation edit
if(hair_style.do_colouration && islist(h_col) && h_col.len >= 3)
hair_s.Blend(rgb(h_col[1], h_col[2], h_col[3]), ICON_MULTIPLY) // VOREStation edit
hair_s.Blend(hair_s_add, ICON_ADD) // VOREStation edit
overlays |= hair_s
return mob_icon