From 97f3361e6b75d043050b4d53f91bdc508f116947 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 27 Mar 2018 14:31:32 +0300 Subject: [PATCH 1/4] Fixes feathered tesh tail and removes an useless piece of code. -Feathered tesh tail now uses the proper dual color system now that it no longer comes with the default tail. -Removes completely redundant body hair code from robolimb icon generation. --- code/modules/organs/organ_icon.dm | 16 ++++------------ .../vore/appearance/sprite_accessories_vr.dm | 3 ++- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index 776ec1c012..c8d5f3c83d 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -51,14 +51,14 @@ var/global/list/limb_icon_cache = list() /obj/item/organ/external/head/get_icon() ..() - + //The overlays are not drawn on the mob, they are used for if the head is removed and becomes an item cut_overlays() - + //Every 'addon' below requires information from species if(!owner || !owner.species) return - + //Eye color/icon var/should_have_eyes = owner.should_have_organ(O_EYES) var/has_eye_color = owner.species.appearance_flags & HAS_EYE_COLOR @@ -78,7 +78,7 @@ var/global/list/limb_icon_cache = list() eyes_icon.Blend(rgb(owner.r_eyes, owner.g_eyes, owner.b_eyes), ICON_ADD) add_overlay(eyes_icon) mob_icon.Blend(eyes_icon, ICON_OVERLAY) - + //Lip color/icon if(owner.lip_style && (species && (species.appearance_flags & HAS_LIPS))) var/icon/lip_icon = new/icon('icons/mob/human_face.dmi', "lips_[owner.lip_style]_s") @@ -177,14 +177,6 @@ var/global/list/limb_icon_cache = list() overlays |= 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"]]" - - if(body_hair && islist(h_col) && h_col.len >= 3) - var/cache_key = "[body_hair]-[icon_name]-[h_col[1]][h_col[2]][h_col[3]]" - if(!limb_icon_cache[cache_key]) - var/icon/I = icon(species.get_icobase(owner), "[icon_name]_[body_hair]") - I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY) //VOREStation edit - limb_icon_cache[cache_key] = I - mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY) // VOREStation edit ends here dir = EAST diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index ecc8dc8ef3..1c8b9c8f12 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -976,7 +976,8 @@ /datum/sprite_accessory/tail/special/seromitailfeathered name = "seromi tail w/ feathers" desc = "" - icon_state = "seromitail_feathers_s" + icon_state = "seromitail_s" + extra_overlay = "seromitail_feathers_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY From 3bedfe11d5113a5c369665a7c1963c076263bc28 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 27 Mar 2018 14:33:06 +0300 Subject: [PATCH 2/4] byond beta back on its bullshit --- code/modules/organs/organ_icon.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index c8d5f3c83d..1fb86104e6 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -51,14 +51,14 @@ var/global/list/limb_icon_cache = list() /obj/item/organ/external/head/get_icon() ..() - + //The overlays are not drawn on the mob, they are used for if the head is removed and becomes an item cut_overlays() - + //Every 'addon' below requires information from species if(!owner || !owner.species) return - + //Eye color/icon var/should_have_eyes = owner.should_have_organ(O_EYES) var/has_eye_color = owner.species.appearance_flags & HAS_EYE_COLOR @@ -78,7 +78,7 @@ var/global/list/limb_icon_cache = list() eyes_icon.Blend(rgb(owner.r_eyes, owner.g_eyes, owner.b_eyes), ICON_ADD) add_overlay(eyes_icon) mob_icon.Blend(eyes_icon, ICON_OVERLAY) - + //Lip color/icon if(owner.lip_style && (species && (species.appearance_flags & HAS_LIPS))) var/icon/lip_icon = new/icon('icons/mob/human_face.dmi', "lips_[owner.lip_style]_s") From 6cf57cdaa7409cf395b4028cc62e0562063c9400 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 27 Mar 2018 14:52:38 +0300 Subject: [PATCH 3/4] Update organ_icon.dm --- code/modules/organs/organ_icon.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index 1fb86104e6..265a8fa4ae 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -177,6 +177,13 @@ var/global/list/limb_icon_cache = list() overlays |= 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"]]" + if(body_hair && islist(h_col) && h_col.len >= 3) + var/cache_key = "[body_hair]-[icon_name]-[h_col[1]][h_col[2]][h_col[3]]" + if(!limb_icon_cache[cache_key]) + var/icon/I = icon(species.get_icobase(owner), "[icon_name]_[body_hair]") + I.Blend(rgb(h_col[1],h_col[2],h_col[3]), ICON_MULTIPLY) //VOREStation edit + limb_icon_cache[cache_key] = I + mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY) // VOREStation edit ends here dir = EAST From 16f84efe7681def5b2755ae9a6321d29826f6036 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 27 Mar 2018 14:53:44 +0300 Subject: [PATCH 4/4] Update organ_icon.dm --- code/modules/organs/organ_icon.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index 265a8fa4ae..776ec1c012 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -177,6 +177,7 @@ var/global/list/limb_icon_cache = list() overlays |= 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"]]" + if(body_hair && islist(h_col) && h_col.len >= 3) var/cache_key = "[body_hair]-[icon_name]-[h_col[1]][h_col[2]][h_col[3]]" if(!limb_icon_cache[cache_key])