diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index d66706be78..feef4aef9b 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -1440,6 +1440,43 @@ species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER +//its bird time mfers - Nevrean Hairs + +/datum/sprite_accessory/hair/feather_fan + name = "feather fan (nev)" + icon = 'icons/mob/human_face_alt.dmi' + icon_add = 'icons/mob/human_face_alt_add.dmi' + icon_state = "feather_fan" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/feather_plume_down + name = "feather plume down (nev)" + icon = 'icons/mob/human_face_alt.dmi' + icon_add = 'icons/mob/human_face_alt_add.dmi' + icon_state = "feather_plume_down" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/feather_plume_up + name = "feather plume up (nev)" + icon = 'icons/mob/human_face_alt.dmi' + icon_add = 'icons/mob/human_face_alt_add.dmi' + icon_state = "feather_plume_up" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/feather_plume_small + name = "feather plume small (nev)" + icon = 'icons/mob/human_face_alt.dmi' + icon_add = 'icons/mob/human_face_alt_add.dmi' + icon_state = "feather_plume_small" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/feather_halfmoon + name = "feather halfmoon (nev)" + icon = 'icons/mob/human_face_alt.dmi' + icon_add = 'icons/mob/human_face_alt_add.dmi' + icon_state = "feather_halfmoon" + flags = HAIR_TIEABLE + /* shaved name = "Shaved" diff --git a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm index 7ef41e0601..045df21a12 100644 --- a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm @@ -1023,3 +1023,28 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY extra_overlay = "shark_fin_alt" + +/datum/sprite_accessory/ears/feather_horns + name = "feather horns (dual-color)" + icon = 'icons/mob/vore/ears_32x64.dmi' + icon_state = "feather_horns" + extra_overlay = "feather_horns-fluff" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/ears/party_plume + name = "nevrean party parrot plume(tri-color)" + icon = 'icons/mob/vore/ears_32x64.dmi' + icon_state = "party_plume" + extra_overlay = "party_plume-1" + extra_overlay2 = "party_plume-2" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/ears/feather_fan_ears //why yes I did abuse my abilities to make a sprite that is specifically compatible with one hair for my OC, why do you ask? - Tank + name = "feather fan avian ears" + icon = 'icons/mob/vore/ears_vr.dmi' + icon_state = "feather_fan_ears" + extra_overlay = "feather_fan_ears-outer" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY diff --git a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm index 55c912aaf8..4978a487b7 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm @@ -994,3 +994,101 @@ icon_state = "teshi_heterochromia_l" body_parts = list(BP_HEAD) species_allowed = list(SPECIES_TESHARI) + +/datum/sprite_accessory/marking/vr/nevrean_beak //that's right, its bird rework time + name = "nevrean beak" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "nevrean_beak" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/parrot_beak + name = "parrot beak (nev)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "parrot_beak" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/thin_beak //kiwis and hummingbirds + name = "thin beak (nev)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "thin_beak" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/finch_beak + name = "finch beak (nev)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "finch_beak" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/pelican_beak + name = "pelican beak (nev)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "pelican_beak" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/pelican_beak_pouch //recolor the pouch + name = "pelican beak pouch (nev)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "pelican_beak_pouch" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/toucan_beak + name = "toucan beak (nev)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "toucan_beak" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/toucan_beak_tip //recolor the tip + name = "toucan beak tip (nev)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "toucan_beak_tip" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/raptor_beak_small + name = "bird of prey beak, small (nev)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "raptor_beak_small" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/raptor_beak_large + name = "bird of prey beak, large (nev)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "raptor_beak_large" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/nev_heartface + name = "heart face (nev)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "heartface" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/nev_fullhead + name = "full head recolor (nev)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "full_head_nev" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/nev_tophead + name = "top of the head recolor (nev)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "top_head_nev" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/nev_cheeks //the face ones + name = "bird face cheeks (nev)" + icon = 'icons/mob/human_races/markings_vr.dmi' + icon_state = "cheeks_nev" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) diff --git a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm index 95fbf0a377..a22f9e129c 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm @@ -16,7 +16,7 @@ species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW, SPECIES_ALTEVIAN) //This lets all races use var/list/lower_layer_dirs = list(SOUTH) - var/icon_loaf = null //CHOMPEdit + var/icon_loaf = null // Species-unique tails @@ -246,49 +246,50 @@ color_blend_mode = ICON_MULTIPLY extra_overlay = "eboop_mark" -/*/datum/sprite_accessory/tail/molenar_kitsune //CHOMP Remove +/* // Chomp REMOVE START +/datum/sprite_accessory/tail/molenar_kitsune name = "quintail kitsune tails (Molenar)" desc = "" icon_state = "molenar-kitsune" ckeys_allowed = list("molenar") -/datum/sprite_accessory/tail/miria_fluffdragon //CHOMP Remove +/datum/sprite_accessory/tail/miria_fluffdragon name = "fluffdragon tail (Miria Masters)" desc = "" icon_state = "miria-fluffdragontail" ckeys_allowed = list("miriamasters") -/datum/sprite_accessory/tail/miria_kitsune //CHOMP Remove +/datum/sprite_accessory/tail/miria_kitsune name = "Black kitsune tails (Miria Masters)" desc = "" icon_state = "miria-kitsunetail" ckeys_allowed = list("miriamasters") -/datum/sprite_accessory/tail/molenar_deathclaw //CHOMP Remove +/datum/sprite_accessory/tail/molenar_deathclaw name = "deathclaw bits (Molenar)" desc = "" icon_state = "molenar-deathclaw" ckeys_allowed = list("molenar","silvertalismen","jertheace") -/datum/sprite_accessory/tail/runac //CHOMP Remove +/datum/sprite_accessory/tail/runac name = "fennecsune tails (Runac)" desc = "" icon_state = "runac" ckeys_allowed = list("rebcom1807") -/datum/sprite_accessory/tail/reika //Leaving this since it was too hard to split the wings from the tail. //CHOMP Remove +/datum/sprite_accessory/tail/reika //Leaving this since it was too hard to split the wings from the tail. name = "fox tail (+ beewings) (Reika)" desc = "" icon_state = "reika" ckeys_allowed = list("rikaru19xjenkins") -/datum/sprite_accessory/tail/rosey //CHOMP Remove +/datum/sprite_accessory/tail/rosey name = "tritail kitsune tails (Rosey)" desc = "" icon_state = "rosey_three" ckeys_allowed = list("joey4298") -/datum/sprite_accessory/tail/rosey2 //CHOMP Remove +/datum/sprite_accessory/tail/rosey2 name = "pentatail kitsune tails (Rosey)" //I predict seven tails next. ~CK desc = "" icon_state = "rosey_five" @@ -296,31 +297,32 @@ color_blend_mode = ICON_MULTIPLY ckeys_allowed = list("joey4298") -/datum/sprite_accessory/tail/scree //CHOMP Remove +/datum/sprite_accessory/tail/scree name = "green taj tail (Scree)" desc = "" icon_state = "scree" ckeys_allowed = list("scree") -/datum/sprite_accessory/tail/aronai //CHOMP Remove +/datum/sprite_accessory/tail/aronai name = "aronai tail (Aronai)" desc = "" icon_state = "aronai" ckeys_allowed = list("arokha") -/datum/sprite_accessory/tail/cabletail //CHOMP Remove +/datum/sprite_accessory/tail/cabletail name = "cabletail" desc = "cabletail" icon_state = "cabletail" ckeys_allowed = list("tucker0666") -/datum/sprite_accessory/tail/featherfluff_tail //CHOMP Remove +/datum/sprite_accessory/tail/featherfluff_tail name = "featherfluff_tail" desc = "" icon_state = "featherfluff_tail" ckeys_allowed = list("tucker0666") -*/ //CHOMP Remove end -/datum/sprite_accessory/tail/ketrai_wag //CHOMP Remove +*/ //Chomp REMOVE END + +/datum/sprite_accessory/tail/ketrai_wag name = "fennix tail (vwag)" desc = "" icon_state = "ketraitail" @@ -366,12 +368,14 @@ extra_overlay = "raccoon-stripes" extra_overlay_w = "raccoon-stripes_w" -/*/datum/sprite_accessory/tail/holly //CHOMP Remove +/* // Chomp REMOVE START +/datum/sprite_accessory/tail/holly name = "tigress tail (Holly)" desc = "" icon_state = "tigresstail" ckeys_allowed = list("hoodoo") -*/ //CHOMP Remove end +*/ // Chomp REMOVE END + /datum/sprite_accessory/tail/satyr name = "goat legs, colorable" desc = "" @@ -1188,7 +1192,8 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY -/*/datum/sprite_accessory/tail/peacocktail_red //this is ckey locked for now, but prettiebyrd wants these tails to be unlocked at a later date //CHOMP Remove and now it'll never be unlocked +/* // Chomp REMOVE START +/datum/sprite_accessory/tail/peacocktail_red //this is ckey locked for now, but prettiebyrd wants these tails to be unlocked at a later date name = "Peacock tail (vwag)" desc = "" icon = 'icons/mob/vore/tails_vr.dmi' @@ -1205,7 +1210,8 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY ckeys_allowed = list("prettiebyrd") -*/ //CHOMP Remove end +*/ // Chomp REMOVE END + /datum/sprite_accessory/tail/altevian name = "Altevian Tail" icon = 'icons/mob/vore/tails_vr.dmi' @@ -1230,12 +1236,14 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY -/*/datum/sprite_accessory/tail/perrin_tentacles //CHOMP Remove +/* // Chomp REMOVE START +/datum/sprite_accessory/tail/perrin_tentacles name = "octopus tentacles" desc = "" icon_state = "perrintentacles" ckeys_allowed = list("codeme", "siennaathens") -*/ +*/ // Chomp REMOVE END + /datum/sprite_accessory/tail/teshbeethorax name = "Teshari bee thorax" desc = "" @@ -1340,7 +1348,7 @@ hide_body_parts = list(BP_L_LEG, BP_L_FOOT, BP_R_LEG, BP_R_FOOT) //Exclude pelvis just in case. clip_mask_icon = 'icons/mob/vore/taurs_vr.dmi' clip_mask_state = "taur_clip_mask_def" //Used to clip off the lower part of suits & uniforms. - + /datum/sprite_accessory/tail/blade_like_tail name = "Blade-like Tail" icon = 'icons/mob/vore/tails_vr.dmi' @@ -1356,13 +1364,14 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY -/*/datum/sprite_accessory/tail/kara //SatinIsle fluff item //CHOMP Remove +/* //Chomp REMOVE START +/datum/sprite_accessory/tail/kara //SatinIsle fluff item name = "Pterokara Tail" icon = 'icons/mob/vore/tails_vr.dmi' icon_state = "kara_tail" ckeys_allowed = list("satinisle") -*/ - +*/ // Chomp REMOVE END + //LONG TAILS ARE NOT TAUR BUTTS >:O /datum/sprite_accessory/tail/longtail name = "You should not see this..." @@ -1406,7 +1415,7 @@ clip_mask_icon = 'icons/mob/vore/taurs_vr.dmi' clip_mask_state = "taur_clip_mask_def" //Used to clip off the lower part of suits & uniforms. extra_overlay = "horse" //I can't believe this works. - + /datum/sprite_accessory/tail/turkey //Would have been a really good thing for Thanksgiving probably but I'm not going to wait that long. name = "turkey" desc = "" @@ -1435,3 +1444,18 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY extra_overlay = "sharktail_tipmarkings" + +/datum/sprite_accessory/tail/narrow_tail + name = "feathered narrow tail, colorable" + desc = "" + icon_state = "narrowtail" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/narrow_tail2 + name = "feathered narrow tail, 2 colors" + desc = "" + icon_state = "narrowtail_2color" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "narrowtail_2color-1" diff --git a/code/modules/mob/new_player/sprite_accessories_wing_vr.dm b/code/modules/mob/new_player/sprite_accessories_wing_vr.dm index ec02933893..3179829285 100644 --- a/code/modules/mob/new_player/sprite_accessories_wing_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_wing_vr.dm @@ -327,3 +327,43 @@ icon_state = "feathered_kara" ckeys_allowed = list("satinisle") */ + +/datum/sprite_accessory/wing/winglets //smol wingarms at the elbow + name = "feathered winglets" + desc = "" + icon_state = "winglets" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/wing/wingarms_speckles + name = "wingarms, speckled" + desc = "" + icon_state = "wingarms_speckles" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "wingarms_speckles-speckles" + +/datum/sprite_accessory/wing/wingarms_2tone + name = "wingarms, 2 colors" + desc = "" + icon_state = "wingarms_2tone" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "wingarms_2tone-1" + +/datum/sprite_accessory/wing/feather2_speckles + name = "large feathered wings, speckled" + desc = "" + icon_state = "feather2_speckles" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "feather2_speckles-speckles" + +/datum/sprite_accessory/wing/feather2_tricolor + name = "large feathered wings, tricolor" + desc = "" + icon_state = "feather2_tricolor" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "feather2_tricolor-1" + extra_overlay2 = "feather2_tricolor-2" diff --git a/icons/mob/human_face_alt.dmi b/icons/mob/human_face_alt.dmi index 6d02bc14bf..6172ddf26e 100644 Binary files a/icons/mob/human_face_alt.dmi and b/icons/mob/human_face_alt.dmi differ diff --git a/icons/mob/human_face_alt_add.dmi b/icons/mob/human_face_alt_add.dmi index 9007a281f5..b585079d73 100644 Binary files a/icons/mob/human_face_alt_add.dmi and b/icons/mob/human_face_alt_add.dmi differ diff --git a/icons/mob/human_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi index 67f87812fe..99e2672f66 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/human_races/r_def_nevrean.dmi b/icons/mob/human_races/r_def_nevrean.dmi index 42c18e18d6..1cbc45d861 100644 Binary files a/icons/mob/human_races/r_def_nevrean.dmi and b/icons/mob/human_races/r_def_nevrean.dmi differ diff --git a/icons/mob/human_races/r_nevrean.dmi b/icons/mob/human_races/r_nevrean.dmi index d2bebc171a..0fc87f63cb 100644 Binary files a/icons/mob/human_races/r_nevrean.dmi and b/icons/mob/human_races/r_nevrean.dmi differ diff --git a/icons/mob/vore/ears_32x64.dmi b/icons/mob/vore/ears_32x64.dmi index 4f5b7bd185..c03d561203 100644 Binary files a/icons/mob/vore/ears_32x64.dmi and b/icons/mob/vore/ears_32x64.dmi differ diff --git a/icons/mob/vore/ears_vr.dmi b/icons/mob/vore/ears_vr.dmi index bd621ffe2d..a147659d24 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 f5ab42e17d..eed404406f 100644 Binary files a/icons/mob/vore/tails_vr.dmi and b/icons/mob/vore/tails_vr.dmi differ diff --git a/icons/mob/vore/wings_vr.dmi b/icons/mob/vore/wings_vr.dmi index 3eb91889e5..7499985ba4 100644 Binary files a/icons/mob/vore/wings_vr.dmi and b/icons/mob/vore/wings_vr.dmi differ