From 71902fbc4770e4cd4ae33d96c31699389c1ee7c6 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 17 Jun 2021 15:47:28 -0400 Subject: [PATCH 1/2] Merge pull request #10667 from Heroman3003/hairfix Fixes promethean hair remaining transparent when transparency is disasbled --- .../mob/living/carbon/human/species/species_shapeshift_vr.dm | 3 ++- code/modules/mob/living/carbon/human/update_icons.dm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm b/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm index c5d2d72fff..6d09868707 100644 --- a/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm @@ -175,4 +175,5 @@ var/obj/item/organ/external/L = limb L.transparent = !L.transparent visible_message("\The [src]'s interal composition seems to change.") - update_icons_body() \ No newline at end of file + update_icons_body() + update_hair() \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 849623ee7b..2f7edad88f 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -472,7 +472,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() face_standing.Blend(hair_s, ICON_OVERLAY) - if(head_organ.nonsolid || head_organ.transparent) + if(head_organ.transparent) //VOREStation Edit: Prometheans are not ALWAYS transparent face_standing += rgb(,,,120) var/icon/ears_s = get_ears_overlay()