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

Polaris Sync

Browse Source
This commit is contained in:
killer653
2017-11-04 13:37:13 -04:00
parent 225932aa5e 0b0846ec86
commit 11c195debb
97 changed files with 1307 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_icon.dm
+25 -4
View File
@@ -89,13 +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/hair_style = hair_styles_list[owner.h_style] // VOREStation edit
var/datum/sprite_accessory/hair/hair_style = hair_styles_list[owner.h_style]
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
var/icon/hair_s_add = new/icon("icon" = hair_style.icon_add, "icon_state" = "[hair_style.icon_state]_s")
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
hair_s.Blend(rgb(h_col[1], h_col[2], h_col[3]), ICON_MULTIPLY)
hair_s.Blend(hair_s_add, ICON_ADD)
overlays |= hair_s
return mob_icon
@@ -145,7 +145,13 @@ 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]")
<<<<<<< HEAD
I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY) //VOREStation edit
=======
var/icon/IA = icon(species.get_icobase_a(owner), "[icon_name]_[body_hair]")
I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY)
I.Blend(IA, ICON_ADD)
>>>>>>> PolarisSS13/master
limb_icon_cache[cache_key] = I
mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY)
@@ -178,10 +184,14 @@ var/global/list/limb_icon_cache = list()
if(nonsolid)
applying.MapColors("#4D4D4D","#969696","#1C1C1C", "#000000")
<<<<<<< HEAD
if(species && species.get_bodytype(owner) != "Human")
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(1) //VOREStation edit to make Prometheans not look like shit with mob coloring.
=======
applying.SetIntensity(0.7)
>>>>>>> PolarisSS13/master
else if(status & ORGAN_DEAD)
icon_cache_key += "_dead"
@@ -195,12 +205,23 @@ 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)
<<<<<<< HEAD
//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
=======
applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_MULTIPLY)
var/gender = "f"
if(owner && owner.gender == MALE)
gender = "m"
var/icon_a = new /icon(species.get_icobase_a(owner), "[icon_name][gendered_icon ? "_[gender]" : ""]")
applying.Blend(icon_a, ICON_ADD)
icon_cache_key += "_color_[s_col[1]]_[s_col[2]]_[s_col[3]]"
>>>>>>> PolarisSS13/master
// Translucency.
if(nonsolid) applying += rgb(,,,180) // SO INTUITIVE TY BYOND