cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Voxxy clothing

Browse Source
This commit is contained in:
Heroman3003
2023-02-18 04:41:01 +10:00
committed by CHOMPStation2
parent ddedbf2a8c
commit 223af2747b
13 changed files with 1179 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -896,9 +896,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)

1063
code/modules/clothing/clothing.dm
View File

File diff suppressed because it is too large Load Diff

1
code/modules/clothing/clothing_vr.dm
View File

@@ -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)

5
code/modules/clothing/glasses/glasses_vr.dm
View File

@@ -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(

5
code/modules/mob/living/carbon/human/species/outsider/vox.dm
View File

@@ -50,7 +50,12 @@
siemens_coefficient = 0.2
flags = NO_SCAN | NO_DEFIB
<<<<<<< HEAD
appearance_flags = HAS_EYE_COLOR | HAS_HAIR_COLOR | HAS_SKIN_COLOR //CHOMP Edit
=======
spawn_flags = SPECIES_IS_WHITELISTED
appearance_flags = HAS_EYE_COLOR | HAS_HAIR_COLOR | HAS_SKIN_COLOR
>>>>>>> 9cc78d72cc... Merge pull request #14493 from Yatiyaya/Voxxy-Clothing
blood_color = "#9066BD"
flesh_color = "#808D11"

4
code/modules/mob/living/carbon/human/species/station/station_vr.dm
View File

@@ -413,7 +413,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
)

121
code/modules/mob/new_player/sprite_accessories.dm
View File

@@ -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)

13
code/modules/mob/new_player/sprite_accessories_extra.dm
View File

@@ -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"
@@ -618,6 +620,7 @@ shadekin_snoot
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"

48
code/modules/mob/new_player/sprite_accessories_extra_vr.dm
View File

@@ -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

BIN
icons/inventory/eyes/mob_vox.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
icons/inventory/suit/mob_vox.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 366 KiB

After

Width:  |  Height:  |  Size: 391 KiB

BIN
icons/mob/human_races/markings_vox.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
icons/mob/human_races/markings_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 71 KiB