diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index d66706be787..31c002b431c 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -1440,6 +1440,38 @@ 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_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_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_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_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_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 45f1085471a..ca95dbe74ad 100644 --- a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm @@ -1015,3 +1015,20 @@ 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 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 0fd3cebe8ed..4978a487b7e 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm @@ -995,3 +995,100 @@ 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 fd3210dba4a..8bf235d1ca9 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm @@ -1434,3 +1434,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 94db4dee96f..d880caf498f 100644 --- a/code/modules/mob/new_player/sprite_accessories_wing_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_wing_vr.dm @@ -325,4 +325,44 @@ desc = "" icon = 'icons/mob/vore/wings_vr.dmi' icon_state = "feathered_kara" - ckeys_allowed = list("satinisle") \ No newline at end of file + 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 6d02bc14bf3..6172ddf26e5 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_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi index 67f87812fe2..99e2672f66d 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 42c18e18d6c..1cbc45d861c 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 d2bebc171a8..0fc87f63cba 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 5c6e3b6598a..0df750ab072 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/tails_vr.dmi b/icons/mob/vore/tails_vr.dmi index f5ab42e17de..eed404406fb 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 3eb91889e58..7499985ba4c 100644 Binary files a/icons/mob/vore/wings_vr.dmi and b/icons/mob/vore/wings_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index f5eea9f9e3e..2fbf4654fad 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4249,7 +4249,6 @@ #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" #include "maps\southern_cross\loadout\loadout_vr.dm" -#include "maps\stellar_delight\stellar_delight.dm" #include "maps\submaps\_helpers.dm" #include "maps\submaps\_readme.dm" #include "maps\submaps\admin_use_vr\event_autonomous_drone.dm" @@ -4260,5 +4259,6 @@ #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" +#include "maps\virgo_minitest\virgo_minitest.dm" #include "maps\~map_system\maps.dm" // END_INCLUDE