From 41656e4ed85530a60b4176bc40dc388c5cfedde8 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 17 Mar 2018 15:15:30 -0400 Subject: [PATCH] Probably fixes missing wings --- code/modules/mob/living/carbon/human/update_icons.dm | 7 ++++--- code/modules/mob/living/carbon/human/update_icons_vr.dm | 6 +----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 7ccfbec7d6a..0db94400c5b 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -944,13 +944,14 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() if(QDESTROYING(src)) return - remove_layer(SUIT_LAYER) + remove_layer(WING_LAYER) var/image/vr_wing_image = get_wing_image() if(vr_wing_image) - vr_wing_image = BODY_LAYER+WING_LAYER + vr_wing_image.layer = BODY_LAYER+WING_LAYER overlays_standing[WING_LAYER] = vr_wing_image - apply_layer(WING_LAYER) + + apply_layer(WING_LAYER) // VOREStation Edit end /mob/living/carbon/human/update_modifier_visuals() diff --git a/code/modules/mob/living/carbon/human/update_icons_vr.dm b/code/modules/mob/living/carbon/human/update_icons_vr.dm index f30a407f799..436f76d7740 100644 --- a/code/modules/mob/living/carbon/human/update_icons_vr.dm +++ b/code/modules/mob/living/carbon/human/update_icons_vr.dm @@ -60,11 +60,7 @@ var/icon/wing_s = new/icon("icon" = wing_style.icon, "icon_state" = flapping && wing_style.ani_state ? wing_style.ani_state : wing_style.icon_state) if(wing_style.do_colouration) wing_s.Blend(rgb(src.r_wing, src.g_wing, src.b_wing), wing_style.color_blend_mode) - return image(wing_s) - else - return image(wing_s) - return null - + return image(wing_s) // TODO - Move this to where it should go ~Leshana /mob/proc/stop_flying()