diff --git a/code/modules/mob/living/carbon/human/species/station/seromi.dm b/code/modules/mob/living/carbon/human/species/station/seromi.dm index 72f4f808d4..b43e81a2e3 100644 --- a/code/modules/mob/living/carbon/human/species/station/seromi.dm +++ b/code/modules/mob/living/carbon/human/species/station/seromi.dm @@ -23,7 +23,7 @@ flesh_color = "#5F7BB0" base_color = "#001144" tail = "seromitail" - tail_hair = "feathers" + //tail_hair = "feathers" reagent_tag = IS_TESHARI move_trail = /obj/effect/decal/cleanable/blood/tracks/paw diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index 776ec1c012..69f897fa58 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") @@ -159,12 +159,10 @@ var/global/list/limb_icon_cache = list() 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) + 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 + mob_icon.Blend(I, ICON_OVERLAY) + icon_cache_key += "[body_hair][rgb(h_col[1],h_col[2],h_col[3])]" if(model) icon_cache_key += "_model_[model]" @@ -179,12 +177,11 @@ var/global/list/limb_icon_cache = list() 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) + 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 + mob_icon.Blend(I, ICON_OVERLAY) + icon_cache_key += "[body_hair][rgb(h_col[1],h_col[2],h_col[3])]" + // VOREStation edit ends here dir = EAST diff --git a/code/modules/organs/subtypes/seromi.dm b/code/modules/organs/subtypes/seromi.dm index 0b11c2a4ba..05b7427cb8 100644 --- a/code/modules/organs/subtypes/seromi.dm +++ b/code/modules/organs/subtypes/seromi.dm @@ -1,8 +1,8 @@ /obj/item/organ/external/foot/seromi - body_hair = "feathers" + //body_hair = "feathers" /obj/item/organ/external/foot/right/seromi - body_hair = "feathers" + //body_hair = "feathers" /obj/item/organ/external/hand/seromi - body_hair = "feathers" + //body_hair = "feathers" /obj/item/organ/external/hand/right/seromi - body_hair = "feathers" + //body_hair = "feathers" diff --git a/nano/images/nanomap_z1.png b/nano/images/nanomap_z1.png index e960431353..c49c21c24b 100644 Binary files a/nano/images/nanomap_z1.png and b/nano/images/nanomap_z1.png differ diff --git a/nano/images/nanomap_z10.png b/nano/images/nanomap_z10.png deleted file mode 100644 index 87a1449af2..0000000000 Binary files a/nano/images/nanomap_z10.png and /dev/null differ diff --git a/nano/images/nanomap_z2.png b/nano/images/nanomap_z2.png deleted file mode 100644 index be3e07bb34..0000000000 Binary files a/nano/images/nanomap_z2.png and /dev/null differ diff --git a/nano/images/nanomap_z3.png b/nano/images/nanomap_z3.png index fd2909e74b..67588167e6 100644 Binary files a/nano/images/nanomap_z3.png and b/nano/images/nanomap_z3.png differ diff --git a/nano/images/nanomap_z4.png b/nano/images/nanomap_z4.png new file mode 100644 index 0000000000..c21f6f125e Binary files /dev/null and b/nano/images/nanomap_z4.png differ diff --git a/nano/images/nanomap_z5.png b/nano/images/nanomap_z5.png index 746f6bd7cd..ba598630d4 100644 Binary files a/nano/images/nanomap_z5.png and b/nano/images/nanomap_z5.png differ diff --git a/nano/images/nanomap_z6.png b/nano/images/nanomap_z6.png deleted file mode 100644 index d30bd61cfa..0000000000 Binary files a/nano/images/nanomap_z6.png and /dev/null differ diff --git a/nano/images/nanomap_z7.png b/nano/images/nanomap_z7.png deleted file mode 100644 index 169d3163b2..0000000000 Binary files a/nano/images/nanomap_z7.png and /dev/null differ diff --git a/nano/images/nanomap_z8.png b/nano/images/nanomap_z8.png deleted file mode 100644 index a07cfa6e7a..0000000000 Binary files a/nano/images/nanomap_z8.png and /dev/null differ diff --git a/nano/images/nanomap_z9.png b/nano/images/nanomap_z9.png deleted file mode 100644 index d5d5dadb68..0000000000 Binary files a/nano/images/nanomap_z9.png and /dev/null differ