diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 7f4878ce612..99ef75159f7 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -377,72 +377,87 @@ //VOREStation Body Markings and Overrides //Reminder: BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD + +/datum/sprite_accessory/marking //Override for base markings + var/color_blend_mode = ICON_ADD + /datum/sprite_accessory/marking/vr icon = 'icons/mob/human_races/markings_vr.dmi' vulp_belly name = "belly fur (Vulp)" icon_state = "vulp_belly" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_TORSO) vulp_fullbelly name = "full belly fur (Vulp)" icon_state = "vulp_fullbelly" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_TORSO) vulp_crest name = "belly crest (Vulp)" icon_state = "vulp_crest" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_TORSO) vulp_nose name = "nose (Vulp)" icon_state = "vulp_nose" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) vulp_face name = "face (Vulp)" icon_state = "vulp_face" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) vulp_earsface name = "ears and face (Vulp)" icon_state = "vulp_earsface" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) vulp_all name = "all head highlights (Vulp)" icon_state = "vulp_all" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) sergal_full name = "Sergal Markings" icon_state = "sergal_full" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) species_allowed = list("Sergal") sergal_full_female name = "Sergal Markings (Female)" icon_state = "sergal_full_female" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) species_allowed = list("Sergal") - gender = FEMALE monoeye name = "Monoeye" icon_state = "monoeye" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) nevrean_female name = "Female Nevrean beak" icon_state = "nevrean_f" body_parts = list(BP_HEAD) + color_blend_mode = ICON_MULTIPLY gender = FEMALE nevrean_male name = "Male Nevrean beak" icon_state = "nevrean_m" body_parts = list(BP_HEAD) + color_blend_mode = ICON_MULTIPLY gender = MALE spots @@ -453,6 +468,7 @@ shaggy_mane name = "Shaggy mane/feathers" icon_state = "shaggy" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_TORSO) jagged_teeth @@ -478,120 +494,143 @@ otie_face name = "Otie face" icon_state = "otieface" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) otie_nose name = "Otie nose" icon_state = "otie_nose" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) backstripes name = "Back stripes" icon_state = "otiestripes" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_TORSO,BP_HEAD) belly_butt name = "Belly and butt" icon_state = "bellyandbutt" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_GROIN,BP_TORSO) fingers_toes name = "Fingers and toes" icon_state = "fingerstoes" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND) otie_socks name = "Fingerless socks" icon_state = "otiesocks" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND) corvid_beak name = "Corvid beak" icon_state = "corvidbeak" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) corvid_belly name = "Corvid belly" icon_state = "corvidbelly" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_GROIN,BP_TORSO,BP_HEAD) cow_body name = "Cow markings" icon_state = "cowbody" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) cow_nose name = "Cow nose" icon_state = "cownose" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) zmask name = "Eye mask" icon_state = "zmask" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) zbody name = "Thick jagged stripes" icon_state = "zbody" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_LEG,BP_R_LEG,BP_GROIN,BP_TORSO) znose name = "Jagged snout" icon_state = "znose" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) zorren_belly_male name = "Zorren Male Torso" icon_state = "zorren_belly" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_TORSO,BP_GROIN) zorren_belly_female name = "Zorren Female Torso" icon_state = "zorren_belly_female" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_TORSO,BP_GROIN) zorren_back_patch name = "Zorren Back Patch" icon_state = "zorren_backpatch" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_TORSO) zorren_face_male name = "Zorren Male Face" icon_state = "zorren_face" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) gender = MALE zorren_face_female name = "Zorren Female Face" icon_state = "zorren_face_female" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) gender = FEMALE zorren_muzzle_male name = "Zorren Male Muzzle" icon_state = "zorren_muzzle" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) gender = MALE zorren_muzzle_female name = "Zorren Female Muzzle" icon_state = "zorren_muzzle_female" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) gender = FEMALE zorren_socks name = "Zorren Socks" icon_state = "zorren_socks" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND) zorren_longsocks name = "Zorren Longsocks" icon_state = "zorren_longsocks" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND) tesh_feathers name = "Teshari Feathers" icon_state = "tesh-feathers" + color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND) alurane diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index fc734e0e813..caacbdd1736 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -73,7 +73,7 @@ var/global/list/limb_icon_cache = list() for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], ICON_ADD) + mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) // VOREStation edit 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"]]" @@ -132,7 +132,7 @@ var/global/list/limb_icon_cache = list() for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], ICON_ADD) + mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) // VOREStation edit 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"]]" diff --git a/code/modules/organs/subtypes/standard_vr.dm b/code/modules/organs/subtypes/standard_vr.dm index 6ba220c6eb8..a0573fed0ce 100644 --- a/code/modules/organs/subtypes/standard_vr.dm +++ b/code/modules/organs/subtypes/standard_vr.dm @@ -10,7 +10,7 @@ for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], ICON_ADD) + mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) 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"]]" diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index 2e374e80e96..745c05cfd35 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -125,6 +125,7 @@ name = "Sergal ears, colorable" icon_state = "serg_plain_s" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/mousehc name = "mouse, colorable" @@ -144,6 +145,7 @@ desc = "" icon_state = "wolf" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY extra_overlay = "wolfinner" /datum/sprite_accessory/ears/bearhc @@ -151,12 +153,14 @@ desc = "" icon_state = "bear" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/squirrelhc name = "squirrel, colorable" desc = "" icon_state = "squirrel" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/kittyhc name = "kitty, colorable" @@ -170,6 +174,7 @@ desc = "" icon_state = "bunny" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/antlers name = "antlers" @@ -181,6 +186,7 @@ desc = "" icon_state = "otie" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/cow name = "cow, horns" @@ -192,24 +198,28 @@ desc = "" icon_state = "cow-c" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/zears name = "jagged ears" desc = "" icon_state = "zears" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/elfs name = "elven ears" desc = "" icon_state = "elfs" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/sleek name = "sleek ears" desc = "" icon_state = "sleek" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY // Special snowflake ears go below here. @@ -439,38 +449,36 @@ desc = "" icon_state = "squirrel" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/kitty name = "kitty, colorable, downwards" desc = "" icon_state = "kittydown" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/kittyup name = "kitty, colorable, upwards" desc = "" icon_state = "kittyup" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/tiger_white - name = "tiger, colorable, white stripes" + name = "tiger, colorable" desc = "" icon_state = "tiger" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY extra_overlay = "tigerinnerwhite" -/datum/sprite_accessory/tail/tiger_black - name = "tiger, colorable, black stripes" - desc = "" - icon_state = "tiger" - do_colouration = 1 - extra_overlay = "tigerinnerblack" - /datum/sprite_accessory/tail/stripey name = "stripey taj, colorable" desc = "" icon_state = "stripeytail" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY extra_overlay = "stripeytail_mark" /datum/sprite_accessory/tail/stripeytail_brown @@ -494,12 +502,14 @@ desc = "" icon_state = "bear" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/dragon name = "dragon, colorable" desc = "" icon_state = "dragon" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/wolf_grey name = "wolf, grey" @@ -526,6 +536,7 @@ desc = "" icon_state = "wolf" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY extra_overlay = "wolfinner" /datum/sprite_accessory/tail/mouse_pink @@ -676,6 +687,7 @@ desc = "" icon_state = "ringtail" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY extra_overlay = "ringtail_mark" /datum/sprite_accessory/tail/holly @@ -697,6 +709,7 @@ icon_state = "curltail" ani_state = "curltail_w" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY extra_overlay = "curltail_mark" extra_overlay_w = "curltail_mark_w" @@ -706,6 +719,7 @@ icon_state = "straighttail" ani_state = "straighttail_w" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/tiger_new name = "tiger tail (vwag)" @@ -713,6 +727,7 @@ icon_state = "tigertail" ani_state = "tigertail_w" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY extra_overlay = "tigertail_mark" extra_overlay_w = "tigertail_mark_w" @@ -722,6 +737,7 @@ icon_state = "vulptail" ani_state = "vulptail_w" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY extra_overlay = "vulptail_mark" extra_overlay_w = "vulptail_mark_w" @@ -731,12 +747,14 @@ icon_state = "otie" ani_state = "otie_w" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/ztail name = "jagged flufftail" desc = "" icon_state = "ztail" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/shock //Leaving this since it was too hard to split the wings from the tail. name = "pharoah hound tail (Shock Diamond)" @@ -749,12 +767,14 @@ desc = "" icon_state = "snaketail" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/sergaltaildc name = "sergal, dual-color" desc = "" icon_state = "sergal" do_colouration = 1 + color_blend_mode = ICON_MULTIPLY extra_overlay = "sergal_mark" //For all species tails. Includes haircolored tails. diff --git a/icons/mob/human_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi index 8d9adb6e2b6..5646c39ec49 100644 Binary files a/icons/mob/human_races/markings_vr.dmi and b/icons/mob/human_races/markings_vr.dmi differ diff --git a/icons/mob/vore/ears_vr.dmi b/icons/mob/vore/ears_vr.dmi index 3061ee7ed30..360e31d3e37 100644 Binary files a/icons/mob/vore/ears_vr.dmi and b/icons/mob/vore/ears_vr.dmi differ diff --git a/icons/mob/vore/tails_vr.dmi b/icons/mob/vore/tails_vr.dmi index 50537abb228..00d4f2f63b6 100644 Binary files a/icons/mob/vore/tails_vr.dmi and b/icons/mob/vore/tails_vr.dmi differ