mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-29 23:17:28 +01:00
Update update_icons.dm (#19504)
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
This commit is contained in:
@@ -534,8 +534,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
|
||||
if(!species.has_glowing_eyes)
|
||||
return
|
||||
|
||||
//Our glowy eyes should be hidden if some equipment hides them.
|
||||
if(!should_have_organ(O_EYES) || (head && (head.flags_inv & BLOCKHAIR)) || (wear_mask && (wear_mask.flags_inv & BLOCKHAIR)))
|
||||
//Our glowy eyes should be hidden if some equipment hides them. | Added Promethean/dispersed eyes species support for Glowing Eyes.
|
||||
if((!should_have_organ(O_EYES) && !species.dispersed_eyes) || (head && (head.flags_inv & BLOCKHAIR)) || (wear_mask && (wear_mask.flags_inv & BLOCKHAIR)))
|
||||
return
|
||||
|
||||
//Get the head, we'll need it later.
|
||||
@@ -550,7 +550,9 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
|
||||
|
||||
var/icon/eyes_icon = new/icon(head_organ.eye_icon_location, head_organ.eye_icon)
|
||||
if(!findtext(head_organ.eye_icon, regex("-colored")))
|
||||
if(eyes)
|
||||
if(species.dispersed_eyes) // Set so all species who would lack eye organs due to dispersed eyes can still use Glowing Eyes.
|
||||
eyes_icon.Blend(rgb(r_eyes, g_eyes, b_eyes))
|
||||
else if(eyes)
|
||||
eyes_icon.Blend(rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3]), ICON_ADD)
|
||||
else
|
||||
eyes_icon.Blend(rgb(128,0,0), ICON_ADD)
|
||||
|
||||
Reference in New Issue
Block a user