diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 196796fc8a..9be079fd82 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -840,9 +840,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O /* VOREStation Removal - No markings whitelist, let people mix/match for(var/M in usable_markings) var/datum/sprite_accessory/S = usable_markings[M] + var/datum/species/spec = GLOB.all_species[pref.species] if(!S.species_allowed.len) continue - else if(!(pref.species in S.species_allowed)) + else if(!(pref.species in S.species_allowed) && !(pref.custom_base in S.species_allowed) && !(spec.base_species in S.species_allowed)) usable_markings -= M */ //VOREStation Removal End var/new_marking = tgui_input_list(user, "Choose a body marking:", "Character Preference", usable_markings) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index de99f04803..d347881b40 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -214,7 +214,8 @@ throwforce = 2 slot_flags = SLOT_EARS sprite_sheets = list( - SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi') + SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/hands/mob_vox.dmi') /obj/item/clothing/ears/attack_hand(mob/user as mob) if (!user) return @@ -1056,4 +1057,4 @@ for(var/mob/living/M in contents) M.forceMove(get_turf(src)) return ..() -//Vorestation edit end \ No newline at end of file +//Vorestation edit end diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm index fe3f99c947..b56e84921e 100644 --- a/code/modules/clothing/clothing_vr.dm +++ b/code/modules/clothing/clothing_vr.dm @@ -100,6 +100,7 @@ /obj/item/clothing/ears sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi', + SPECIES_VOX = 'icons/inventory/ears/mob_vox.dmi', SPECIES_WEREBEAST = 'icons/inventory/ears/mob_vr_werebeast.dmi') /obj/item/clothing/relaymove(var/mob/living/user,var/direction) diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm index 880547db4b..b573fbee34 100644 --- a/code/modules/clothing/glasses/glasses_vr.dm +++ b/code/modules/clothing/glasses/glasses_vr.dm @@ -122,6 +122,7 @@ item_state = "tajblind" prescription = 1 body_parts_covered = EYES + sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi') /obj/item/clothing/glasses/hud/health/tajblind name = "lightweight veil" @@ -131,6 +132,7 @@ icon_state = "tajblind_med" item_state = "tajblind_med" body_parts_covered = EYES + sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi') /obj/item/clothing/glasses/sunglasses/sechud/tajblind name = "sleek veil" @@ -141,6 +143,7 @@ item_state = "tajblind_sec" prescription = 1 body_parts_covered = EYES + sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi') /obj/item/clothing/glasses/meson/prescription/tajblind name = "industrial veil" @@ -151,6 +154,7 @@ item_state = "tajblind_meson" off_state = "tajblind" body_parts_covered = EYES + sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi') /obj/item/clothing/glasses/material/prescription/tajblind name = "mining veil" @@ -161,6 +165,7 @@ item_state = "tajblind_meson" off_state = "tajblind" body_parts_covered = EYES + sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi') /obj/item/clothing/glasses sprite_sheets = list( diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm index e9dfc67f57..a23d3fd109 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm @@ -50,7 +50,7 @@ flags = NO_SCAN | NO_DEFIB spawn_flags = SPECIES_IS_WHITELISTED - appearance_flags = HAS_EYE_COLOR | HAS_HAIR_COLOR + appearance_flags = HAS_EYE_COLOR | HAS_HAIR_COLOR | HAS_SKIN_COLOR blood_color = "#9066BD" flesh_color = "#808D11" @@ -110,4 +110,4 @@ H.internal = H.r_hand H.internal = locate(/obj/item/weapon/tank) in H.contents if(istype(H.internal,/obj/item/weapon/tank) && H.internals) - H.internals.icon_state = "internal1" \ No newline at end of file + H.internals.icon_state = "internal1" diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 8c7eed018a..20b5b0bf5d 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -383,7 +383,11 @@ min_age = 18 inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair) //Get ya quills done did icobase = 'icons/mob/human_races/r_vox_old.dmi' + tail = "voxtail" + tail_animation = 'icons/mob/species/vox/tail.dmi' deform = 'icons/mob/human_races/r_def_vox_old.dmi' + color_mult = 1 + descriptors = list( /datum/mob_descriptor/vox_markings = 0 ) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index a64def1f49..aae978f405 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -29,7 +29,7 @@ var/gender = NEUTER // Restrict some styles to specific species. Set to null to perform no checking. - var/list/species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN) + var/list/species_allowed = list() // Whether or not the accessory can be affected by colouration var/do_colouration = 1 @@ -2093,10 +2093,12 @@ shaved //Empty list is unrestricted. Should only restrict the ones that make NO SENSE on other species, //like Tajaran inner-ear coloring overlay stuff. species_allowed = list() + //This lets all races use color_blend_mode = ICON_ADD var/genetic = TRUE + var/organ_override = FALSE var/body_parts = list() //A list of bodyparts this covers, in organ_tag defines //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 @@ -2266,19 +2268,19 @@ shaved name = "Color Bands (Face)" icon_state = "bandsface" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_TAJ,SPECIES_UNATHI) + //species_allowed = list(SPECIES_TAJ,SPECIES_UNATHI) //Removing Polaris whitelits /datum/sprite_accessory/marking/bandsface_human name = "Color Bands (Face)" icon_state = "bandshumanface" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_HUMAN,SPECIES_HUMAN_VATBORN,SPECIES_SKRELL) + //species_allowed = list(SPECIES_HUMAN,SPECIES_HUMAN_VATBORN,SPECIES_SKRELL) //Removing Polaris whitelits /datum/sprite_accessory/marking/tiger_stripes name = "Tiger Stripes" icon_state = "tiger" body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN) - species_allowed = list(SPECIES_TAJ) //There's a tattoo for non-cats + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits //There's a tattoo for non-cats /datum/sprite_accessory/marking/tigerhead name = "Tiger Stripes (Head, Minor)" @@ -2289,7 +2291,7 @@ shaved name = "Tiger Stripes (Head, Major)" icon_state = "tigerface" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_TAJ) //There's a tattoo for non-cats + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits //There's a tattoo for non-cats /datum/sprite_accessory/marking/backstripe name = "Back Stripe" @@ -2385,7 +2387,7 @@ shaved name = "Full Face Paint" icon_state = "fullface" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_HUMAN,SPECIES_HUMAN_VATBORN,SPECIES_SKRELL) + //species_allowed = list(SPECIES_HUMAN,SPECIES_HUMAN_VATBORN,SPECIES_SKRELL) //Removing Polaris whitelits /datum/sprite_accessory/marking/lips name = "Lips" @@ -2807,55 +2809,55 @@ shaved name = "Socks Coloration (Taj)" icon_state = "taj_pawsocks" 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) - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits /datum/sprite_accessory/marking/una_paw_socks name = "Socks Coloration (Una)" icon_state = "una_pawsocks" 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) - species_allowed = list(SPECIES_UNATHI) + //species_allowed = list(SPECIES_UNATHI) //Removing Polaris whitelits /datum/sprite_accessory/marking/paw_socks name = "Socks Coloration (Generic)" icon_state = "pawsocks" 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) - species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI) + //species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI) //Removing Polaris whitelits /datum/sprite_accessory/marking/paw_socks_belly name = "Socks,Belly Coloration (Generic)" icon_state = "pawsocksbelly" 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) - species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI) + //species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI) //Removing Polaris whitelits /datum/sprite_accessory/marking/belly_hands_feet name = "Hands,Feet,Belly Color (Minor)" icon_state = "bellyhandsfeetsmall" 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) - species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI) + //species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI) //Removing Polaris whitelits /datum/sprite_accessory/marking/hands_feet_belly_full name = "Hands,Feet,Belly Color (Major)" icon_state = "bellyhandsfeet" 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) - species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI) + //SPECIES_TAJ, SPECIES_UNATHI) //Removing Polaris whitelits /datum/sprite_accessory/marking/hands_feet_belly_full_female name = "Hands,Feet,Belly Color (Major, Female)" icon_state = "bellyhandsfeet_female" 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) - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits /datum/sprite_accessory/marking/patches name = "Color Patches" icon_state = "patches" 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_TORSO,BP_GROIN) - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits /datum/sprite_accessory/marking/patchesface name = "Color Patches (Face)" icon_state = "patchesface" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits //Taj specific stuff @@ -2863,74 +2865,74 @@ shaved name = "Belly Fur (Taj)" icon_state = "taj_belly" body_parts = list(BP_TORSO) - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits /datum/sprite_accessory/marking/taj_bellyfull name = "Belly Fur Wide (Taj)" icon_state = "taj_bellyfull" body_parts = list(BP_TORSO) - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits /datum/sprite_accessory/marking/taj_earsout name = "Outer Ear (Taj)" icon_state = "taj_earsout" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits /datum/sprite_accessory/marking/taj_earsin name = "Inner Ear (Taj)" icon_state = "taj_earsin" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits /datum/sprite_accessory/marking/taj_nose name = "Nose Color (Taj)" icon_state = "taj_nose" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits /datum/sprite_accessory/marking/taj_crest name = "Chest Fur Crest (Taj)" icon_state = "taj_crest" body_parts = list(BP_TORSO) - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits /datum/sprite_accessory/marking/taj_muzzle name = "Muzzle Color (Taj)" icon_state = "taj_muzzle" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits /datum/sprite_accessory/marking/taj_face name = "Cheeks Color (Taj)" icon_state = "taj_face" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits /datum/sprite_accessory/marking/taj_all name = "All Taj Head (Taj)" icon_state = "taj_all" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits //Una specific stuff /datum/sprite_accessory/marking/una_face name = "Face Color (Una)" icon_state = "una_face" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_UNATHI) + //species_allowed = list(SPECIES_UNATHI) //Removing Polaris whitelits /datum/sprite_accessory/marking/una_facelow name = "Face Color Low (Una)" icon_state = "una_facelow" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_UNATHI) + //species_allowed = list(SPECIES_UNATHI) //Removing Polaris whitelits /datum/sprite_accessory/marking/una_scutes name = "Scutes (Una)" icon_state = "una_scutes" body_parts = list(BP_TORSO) - species_allowed = list(SPECIES_UNATHI) + //species_allowed = list(SPECIES_UNATHI) //Removing Polaris whitelits //Tesh stuff. @@ -2952,41 +2954,41 @@ shaved name = "Leaves (Diona)" icon_state = "diona_leaves" 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_TORSO, BP_GROIN, BP_HEAD) - species_allowed = list(SPECIES_DIONA) + //species_allowed = list(SPECIES_DIONA) //Removing Polaris whitelits /datum/sprite_accessory/marking/diona_thorns name = "Thorns (Diona)" icon_state = "diona_thorns" body_parts =list(BP_TORSO, BP_HEAD) - species_allowed = list(SPECIES_DIONA) + //species_allowed = list(SPECIES_DIONA) //Removing Polaris whitelits do_colouration = 0 /datum/sprite_accessory/marking/diona_flowers name = "Flowers (Diona)" icon_state = "diona_flowers" body_parts =list(BP_TORSO, BP_HEAD) - species_allowed = list(SPECIES_DIONA) + //species_allowed = list(SPECIES_DIONA) //Removing Polaris whitelits do_colouration = 0 /datum/sprite_accessory/marking/diona_moss name = "Moss (Diona)" icon_state = "diona_moss" body_parts =list(BP_TORSO) - species_allowed = list(SPECIES_DIONA) + //species_allowed = list(SPECIES_DIONA) //Removing Polaris whitelits do_colouration = 0 /datum/sprite_accessory/marking/diona_mushroom name = "Mushroom (Diona)" icon_state = "diona_mushroom" body_parts =list(BP_HEAD) - species_allowed = list(SPECIES_DIONA) + //species_allowed = list(SPECIES_DIONA) //Removing Polaris whitelits do_colouration = 0 /datum/sprite_accessory/marking/diona_antennae name = "Antennae (Diona)" icon_state = "diona_antennae" body_parts =list(BP_HEAD) - species_allowed = list(SPECIES_DIONA) + //species_allowed = list(SPECIES_DIONA) //Removing Polaris whitelits do_colouration = 0 //Skrell stuff. @@ -2995,7 +2997,7 @@ shaved name = "Countershading (Skrell)" icon_state = "skr_shade" body_parts = list(BP_TORSO, BP_GROIN, BP_HEAD) - species_allowed = list(SPECIES_SKRELL) + //species_allowed = list(SPECIES_SKRELL) //Removing Polaris whitelits /datum/sprite_accessory/marking/skrell/stripes name = "Poison Dart Stripes (Skrell)" @@ -3009,7 +3011,7 @@ shaved icon_state = "aug_backports" genetic = FALSE body_parts = list(BP_TORSO) - species_allowed = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_TAJ,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI,SPECIES_ZADDAT) + species_allowed = list() //Removing Polaris whitelits /datum/sprite_accessory/marking/aug/diode name = "Augment (Backports Diode, Back)" @@ -3047,7 +3049,7 @@ shaved name = "Augment (Lower Jaw, Head)" icon_state = "aug_lowerjaw" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_HUMAN_VATBORN,SPECIES_ZADDAT) + species_allowed = list() //Removing Polaris whitelits /datum/sprite_accessory/marking/aug/scalpports name = "Augment (Scalp Ports)" @@ -3489,27 +3491,64 @@ shaved /datum/sprite_accessory/skin/human name = "Default human skin" icon_state = "default" - species_allowed = list(SPECIES_HUMAN,SPECIES_HUMAN_VATBORN) + //species_allowed = list(SPECIES_HUMAN,SPECIES_HUMAN_VATBORN) //Removing Polaris whitelits /datum/sprite_accessory/skin/human_tatt01 name = "Tatt01 human skin" icon_state = "tatt1" - species_allowed = list(SPECIES_HUMAN,SPECIES_HUMAN_VATBORN) + //species_allowed = list(SPECIES_HUMAN,SPECIES_HUMAN_VATBORN) //Removing Polaris whitelits /datum/sprite_accessory/skin/tajaran name = "Default tajaran skin" icon_state = "default" icon = 'icons/mob/human_races/r_tajaran.dmi' - species_allowed = list(SPECIES_TAJ) + //species_allowed = list(SPECIES_TAJ) //Removing Polaris whitelits /datum/sprite_accessory/skin/unathi name = "Default Unathi skin" icon_state = "default" icon = 'icons/mob/human_races/r_lizard.dmi' - species_allowed = list(SPECIES_UNATHI) + //species_allowed = list(SPECIES_UNATHI) //Removing Polaris whitelits /datum/sprite_accessory/skin/skrell name = "Default skrell skin" icon_state = "default" icon = 'icons/mob/human_races/r_skrell.dmi' - species_allowed = list(SPECIES_SKRELL) + //species_allowed = list(SPECIES_SKRELL) //Removing Polaris whitelits + +//Vox Exclusives +/datum/sprite_accessory/marking/vox + name = "Vox Beak" + icon = 'icons/mob/human_races/markings_vox.dmi' + icon_state = "vox_beak" + species_allowed = list(SPECIES_VOX) + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vox/voxtalons + name = "Vox scales" + icon_state = "vox_talons" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_R_ARM,BP_L_ARM,BP_R_HAND,BP_L_HAND,BP_R_LEG,BP_L_LEG,BP_R_FOOT,BP_L_FOOT) + +/datum/sprite_accessory/marking/vox/voxclaws + name = "Vox Claws" + icon_state = "Voxclaws" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND) + +/datum/sprite_accessory/marking/vox/vox_alt + name = "Vox Alternate" + icon_state = "bay_vox" + 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_TORSO,BP_GROIN,BP_HEAD) + +/datum/sprite_accessory/marking/vox/vox_alt_eyes + name = "Alternate Vox Eyes" + icon_state = "bay_vox_eyes" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vox/voxscales + name = "Alternate Vox scales" + icon_state = "Voxscales" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_R_ARM,BP_L_ARM,BP_R_HAND,BP_L_HAND,BP_R_LEG,BP_L_LEG,BP_R_FOOT,BP_L_FOOT) diff --git a/code/modules/mob/new_player/sprite_accessories_extra.dm b/code/modules/mob/new_player/sprite_accessories_extra.dm index 0e8b603a7f..3569d1badd 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra.dm @@ -1,7 +1,7 @@ /datum/sprite_accessory/marking/vr icon = 'icons/mob/human_races/markings_alt.dmi' - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list() /datum/sprite_accessory/marking/vr/vulp_belly name = "belly fur (Vulp)" @@ -68,14 +68,14 @@ 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") + //species_allowed = list("Sergal") //Removing Polaris whitelits /datum/sprite_accessory/marking/vr/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") + //species_allowed = list("Sergal") //Removing Polaris whitelits /datum/sprite_accessory/marking/vr/monoeye name = "Monoeye" @@ -337,6 +337,7 @@ icon_state = "tesh-feathers" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr/harpy_feathers name = "Rapala leg Feather" @@ -406,13 +407,13 @@ name = "Anime Eyes Outer" icon_state = "animeeyesouter" body_parts = list(BP_HEAD) - +/* /datum/sprite_accessory/marking/vr/panda_eye_marks name = "Panda Eye Markings" icon_state = "eyes_panda" body_parts = list(BP_HEAD) species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) - +*/ /datum/sprite_accessory/marking/vr/catwomantorso name = "Catwoman chest stripes" icon_state = "catwomanchest" @@ -442,6 +443,7 @@ icon_state = "teshi_sf" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND,BP_TORSO) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr/spirit_lights name = "Ward - Spirit FBP Lights" @@ -564,7 +566,7 @@ shadekin_snoot icon_state = "dnose" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) - + /datum/sprite_accessory/marking/vr/vulp_skull name = "Vulpkanin Skull Face" icon_state = "vulp_skull" @@ -612,13 +614,14 @@ shadekin_snoot icon_state = "chest_fluff" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_TORSO) - + /datum/sprite_accessory/marking/vr/tesh_skull name = "Teshari Skull Face" icon_state = "teshari_skull" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) - + species_allowed = list(SPECIES_TESHARI) + /datum/sprite_accessory/marking/vr/shoulder_fluff name = "Shoulder Fluff" icon_state = "shoulder_markings" 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 e3ee23efe4..942f49087d 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm @@ -2,9 +2,8 @@ //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/organ_override = FALSE color_blend_mode = ICON_ADD - 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 + species_allowed = list() //This lets all races use /datum/sprite_accessory/marking/vr_vulp_belly name = "belly fur (Vulp)" @@ -82,7 +81,7 @@ 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") + //species_allowed = list("Sergal") //Removing Polaris whitelits /datum/sprite_accessory/marking/vr_sergal_full_female name = "Sergal Markings (Female)" @@ -90,7 +89,7 @@ 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") + //("Sergal") /datum/sprite_accessory/marking/vr_monoeye name = "Monoeye" @@ -402,6 +401,7 @@ icon_state = "tesh-feathers" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr_harpy_feathers name = "Rapala leg Feather" @@ -489,7 +489,7 @@ icon = 'icons/mob/human_races/markings_vr.dmi' icon_state = "eyes_panda" body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits /datum/sprite_accessory/marking/vr_catwomantorso name = "Catwoman chest stripes" @@ -525,6 +525,7 @@ icon_state = "teshi_sf" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND,BP_TORSO) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr_spirit_lights name = "Ward - Spirit FBP Lights" @@ -681,19 +682,6 @@ body_parts = list(BP_L_FOOT,BP_R_FOOT) //CitRP stuff -/datum/sprite_accessory/marking/vr_vox_alt - name = "Vox Alternate" - icon = 'icons/mob/human_races/markings_vr.dmi' - icon_state = "bay_vox" - 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_TORSO,BP_GROIN,BP_HEAD) - species_allowed = list(SPECIES_VOX) - -/datum/sprite_accessory/marking/vr_vox_alt_eyes - name = "Alternate Vox Eyes" - icon = 'icons/mob/human_races/markings_vr.dmi' - icon_state = "bay_vox_eyes" - body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_VOX) /datum/sprite_accessory/marking/vr_c_beast_body name = "Cyber Body" @@ -769,27 +757,6 @@ body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD) species_allowed = list(SPECIES_TESHARI) -/datum/sprite_accessory/marking/vr_voxscales - name = "Vox Scales" - icon = 'icons/mob/human_races/markings_vr.dmi' - icon_state = "Voxscales" - 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_HEAD) - -/datum/sprite_accessory/marking/vr_voxclaws - name = "Vox Claws" - icon = 'icons/mob/human_races/markings_vr.dmi' - icon_state = "Voxclaws" - color_blend_mode = ICON_MULTIPLY - body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND) - -/datum/sprite_accessory/marking/vr_voxbeak - name = "Vox Beak" - icon = 'icons/mob/human_races/markings_vr.dmi' - icon_state = "Voxscales" - color_blend_mode = ICON_MULTIPLY - body_parts = list(BP_HEAD) - /datum/sprite_accessory/marking/vr_unathihood name = "Cobra Hood" icon = 'icons/mob/human_races/markings_vr.dmi' @@ -901,6 +868,7 @@ icon_state = "tesh-beak" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr_tesh_beak_alt name = "Teshari beak, rounded" @@ -908,6 +876,7 @@ icon_state = "tesh-beak-alt" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr_generic_hooves name = "Generic Hooves" @@ -917,4 +886,3 @@ body_parts = list(BP_L_FOOT,BP_R_FOOT) hide_body_parts = list(BP_L_FOOT,BP_R_FOOT) organ_override = TRUE - diff --git a/icons/inventory/eyes/mob_vox.dmi b/icons/inventory/eyes/mob_vox.dmi index 4a22391b11..f6cfbf5b2e 100644 Binary files a/icons/inventory/eyes/mob_vox.dmi and b/icons/inventory/eyes/mob_vox.dmi differ diff --git a/icons/inventory/suit/mob_vox.dmi b/icons/inventory/suit/mob_vox.dmi index 0702ce5337..afb8a2a200 100644 Binary files a/icons/inventory/suit/mob_vox.dmi and b/icons/inventory/suit/mob_vox.dmi differ diff --git a/icons/mob/human_races/markings_vox.dmi b/icons/mob/human_races/markings_vox.dmi new file mode 100644 index 0000000000..e60cb65e38 Binary files /dev/null and b/icons/mob/human_races/markings_vox.dmi differ diff --git a/icons/mob/human_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi index 0b2bc13a73..0b92c0db20 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_vox_old.dmi b/icons/mob/human_races/r_vox_old.dmi index f212822aaf..cf0c3e88f8 100644 Binary files a/icons/mob/human_races/r_vox_old.dmi and b/icons/mob/human_races/r_vox_old.dmi differ diff --git a/icons/mob/species/vox/tail.dmi b/icons/mob/species/vox/tail.dmi new file mode 100644 index 0000000000..c0d181051a Binary files /dev/null and b/icons/mob/species/vox/tail.dmi differ