cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 09:03:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix lips drawing over masks

Browse Source
This commit is contained in:
mochi
2020-08-03 17:47:57 +02:00
parent 12c031760a
commit cb97acd2da
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+2 -1
View File
@@ -1465,12 +1465,13 @@
var/obj/item/organ/internal/eyes/eyes = get_int_organ(/obj/item/organ/internal/eyes)
var/obj/item/organ/internal/cyberimp/eyes/eye_implant = get_int_organ(/obj/item/organ/internal/cyberimp/eyes)
if(istype(dna.species) && dna.species.eyes)
var/icon/eyes_icon = new /icon('icons/mob/human_face.dmi', dna.species.eyes)
var/icon/eyes_icon
if(eye_implant) //Eye implants override native DNA eye colo(u)r
eyes_icon = eye_implant.generate_icon()
else if(eyes)
eyes_icon = eyes.generate_icon()
else //Error 404: Eyes not found!
eyes_icon = new('icons/mob/human_face.dmi', dna.species.eyes)
eyes_icon.Blend("#800000", ICON_ADD)
return eyes_icon
code/modules/mob/living/carbon/human/update_icons.dm
+5 -5
View File
@@ -273,11 +273,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
overlays_standing[UNDERWEAR_LAYER] = mutable_appearance(underwear_standing, layer = -UNDERWEAR_LAYER)
apply_overlay(UNDERWEAR_LAYER)
if(lip_style && (LIPS in dna.species.species_traits))
var/mutable_appearance/lips = mutable_appearance('icons/mob/human_face.dmi', "lips_[lip_style]_s")
lips.color = lip_color
standing += lips
overlays_standing[BODY_LAYER] = standing
apply_overlay(BODY_LAYER)
//tail
@@ -1307,6 +1302,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
else
. += "#000000"
if(lip_color && (LIPS in dna.species.species_traits))
. += "[lip_color]"
else
. += "#000000"
for(var/organ_tag in dna.species.has_limbs)
var/obj/item/organ/external/part = bodyparts_by_name[organ_tag]
if(isnull(part))
code/modules/surgery/organs/organ_icon.dm
+4 -1
View File
@@ -107,7 +107,10 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
add_overlay(eyes_icon)
if(owner.lip_style && (LIPS in dna.species.species_traits))
add_overlay(mutable_appearance('icons/mob/human_face.dmi', "lips_[owner.lip_style]_s")) //Hefty icon not necessary.
var/icon/lips_icon = new('icons/mob/human_face.dmi', "lips_[owner.lip_style]_s")
lips_icon.Blend(owner.lip_color, ICON_MULTIPLY)
mob_icon.Blend(lips_icon, ICON_OVERLAY)
add_overlay(lips_icon)
var/head_marking = owner.m_styles["head"]
if(head_marking)