Merge pull request #9961 from VOREStation/upstream-merge-7976

[MIRROR] Fixes Global and Fixes Eyes
This commit is contained in:
Novacat
2021-03-18 10:39:27 -04:00
committed by GitHub
4 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -334,7 +334,7 @@
if(!iscarbon(owner) || !owner.species)
return
var/icon/eyecon //VOREStation Edit -- holds eye icon to render over markings later.
var/icon/eyecon
//Eye color/icon
var/should_have_eyes = owner.should_have_organ(O_EYES)
@@ -373,7 +373,7 @@
for(var/M in markings)
var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"]
var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]")
mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) // VOREStation edit
mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode)
add_overlay(mark_s) //So when it's not on your body, it has icons
mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons
icon_cache_key += "[M][markings[M]["color"]]"