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

[WITTY_COMMENT_HERE]

Browse Source
This commit is contained in:
killer653
2017-11-04 21:56:02 -04:00
parent 95f2ca3a0c
commit 22b7867052
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_icon.dm
+9 -5
View File
@@ -145,7 +145,7 @@ var/global/list/limb_icon_cache = list()
var/cache_key = "[body_hair]-[icon_name]-[h_col[1]][h_col[2]][h_col[3]]"
if(!limb_icon_cache[cache_key])
var/icon/I = icon(species.get_icobase(owner), "[icon_name]_[body_hair]")
I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_ADD)
I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY) //VOREStation edit
limb_icon_cache[cache_key] = I
mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY)
@@ -179,9 +179,9 @@ var/global/list/limb_icon_cache = list()
if(nonsolid)
applying.MapColors("#4D4D4D","#969696","#1C1C1C", "#000000")
if(species && species.get_bodytype(owner) != "Human")
applying.SetIntensity(1.5) // Unathi, Taj and Skrell have -very- dark base icons.
applying.SetIntensity(1) // Unathi, Taj and Skrell have -very- dark base icons. VOREStation edit fixes this and brings the number back to 1
else
applying.SetIntensity(0.7)
applying.SetIntensity(1) //VOREStation edit to make Prometheans not look like shit with mob coloring.
else if(status & ORGAN_DEAD)
icon_cache_key += "_dead"
@@ -195,8 +195,12 @@ var/global/list/limb_icon_cache = list()
applying.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT)
icon_cache_key += "_tone_[s_tone]"
else if(s_col && s_col.len >= 3)
applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_ADD)
icon_cache_key += "_color_[s_col[1]]_[s_col[2]]_[s_col[3]]"
//VOREStation Edit - Support for species.color_mult
if(species && species.color_mult)
applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_MULTIPLY)
else
applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_ADD)
//VOREStation Edit End
// Translucency.
if(nonsolid) applying += rgb(,,,180) // SO INTUITIVE TY BYOND