cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bunch'a fixes and changes

Browse Source
This commit is contained in:
Bangus
2023-02-08 17:20:59 -05:00
parent ea52d85e20
commit 083d9ba2f6
15 changed files with 194 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/03_body.dm
-2
View File
@@ -827,14 +827,12 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else if(href_list["marking_style"])
var/list/usable_markings = pref.body_markings.Copy() ^ body_marking_styles_list.Copy()
/* VOREStation Removal - No markings whitelist, let people mix/match
for(var/M in usable_markings)
var/datum/sprite_accessory/S = usable_markings[M]
if(!S.species_allowed.len)
continue
else if(!(pref.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)
if(new_marking && CanUseTopic(user))
pref.body_markings[new_marking] = "#000000" //New markings start black
code/modules/clothing/clothing.dm
+3 -2
View File
@@ -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
//Vorestation edit end
code/modules/clothing/clothing_vr.dm
+1
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)
code/modules/clothing/glasses/glasses_vr.dm
+5
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(
code/modules/mob/living/carbon/human/species/outsider/vox.dm
+2 -2
View File
@@ -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"
H.internals.icon_state = "internal1"
code/modules/mob/living/carbon/human/species/station/station_vr.dm
+4
View File
@@ -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
)
code/modules/mob/new_player/sprite_accessories.dm
+156 -115
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,13 +2093,54 @@ 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
//Vox Exclusives
/datum/sprite_accessory/marking/vox
icon = 'icons/mob/human_races/markings_vox.dmi'
species_allowed = list(SPECIES_VOX)
/datum/sprite_accessory/marking/vox/voxbeak
name = "Vox Beak (Normal)"
icon_state = "vox_beak"
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)
//Tattoos
/datum/sprite_accessory/marking/tat_rheart
@@ -2266,19 +2307,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 +2330,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"
@@ -2319,7 +2360,7 @@ shaved
/datum/sprite_accessory/marking/brow_left/teshari
name = "Brow Left (Teshari)"
icon_state = "brow_l_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/brow_right
name = "Brow Right"
@@ -2329,7 +2370,7 @@ shaved
/datum/sprite_accessory/marking/brow_right/teshari
name = "Brow Right (Teshari)"
icon_state = "brow_r_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/cheekspot_left
name = "Cheek Spot (Left Cheek)"
@@ -2359,7 +2400,7 @@ shaved
/datum/sprite_accessory/marking/eyestripe/teshari
name = "Eye Stripe (Teshari)"
icon_state = "eyestripe_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/eyecorner_left
name = "Eye Corner Left"
@@ -2369,7 +2410,7 @@ shaved
/datum/sprite_accessory/marking/eyecorner_left/teshari
name = "Eye Corner Left (Teshari)"
icon_state = "eyecorner_l_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/eyecorner_right
name = "Eye Corner Right"
@@ -2379,13 +2420,13 @@ shaved
/datum/sprite_accessory/marking/eyecorner_right/teshari
name = "Eye Corner Right (Teshari)"
icon_state = "eyecorner_r_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/fullfacepaint
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"
@@ -2420,7 +2461,7 @@ shaved
/datum/sprite_accessory/marking/nosestripe/teshari
name = "Nose Stripe (Teshari)"
icon_state = "nosestripe_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/nosetape
name = "Nose Tape"
@@ -2431,7 +2472,7 @@ shaved
/datum/sprite_accessory/marking/nosetape/tesh
name = "Nose Tape (Teshari)"
icon_state = "nosetape_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_abdomen_left
name = "Scar, Abdomen Left"
@@ -2441,7 +2482,7 @@ shaved
/datum/sprite_accessory/marking/scar_abdomen_left/teshari
name = "Scar, Abdomen Left (Teshari)"
icon_state = "scar_abdomen_l_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_abdomen_right
name = "Scar, Abdomen Right"
@@ -2451,7 +2492,7 @@ shaved
/datum/sprite_accessory/marking/scar_abdomen_right/teshari
name = "Scar, Abdomen Right (Teshari)"
icon_state = "scar_abdomen_r_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_abdomen_small_left
name = "Scar, Abdomen Small Left"
@@ -2461,7 +2502,7 @@ shaved
/datum/sprite_accessory/marking/scar_abdomen_small_left/teshari
name = "Scar, Abdomen Small Left (Teshari)"
icon_state = "scar_abdomensmall_l_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_abdomen_small_right
name = "Scar, Abdomen Small Right"
@@ -2471,7 +2512,7 @@ shaved
/datum/sprite_accessory/marking/scar_abdomen_small_right/teshari
name = "Scar, Abdomen Small Right (Teshari)"
icon_state = "scar_abdomensmall_r_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_back_large
name = "Scar, Back Large"
@@ -2481,7 +2522,7 @@ shaved
/datum/sprite_accessory/marking/scar_back_large/teshari
name = "Scar, Back Large (Teshari)"
icon_state = "scar_back_large_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_back_small
name = "Scar, Back Small (Center)"
@@ -2491,7 +2532,7 @@ shaved
/datum/sprite_accessory/marking/scar_back_small/teshari
name = "Scar, Back Small (Center)(Teshari)"
icon_state = "scar_back_small_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
body_parts = list(BP_GROIN)
/datum/sprite_accessory/marking/scar_back_small_upper_right
@@ -2522,7 +2563,7 @@ shaved
/datum/sprite_accessory/marking/scar_chest_large_left/teshari
name = "Scar, Chest Large (Left)(Teshari)"
icon_state = "scar_chest_large_l_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
body_parts = list(BP_GROIN)
/datum/sprite_accessory/marking/scar_chest_large_right
@@ -2533,7 +2574,7 @@ shaved
/datum/sprite_accessory/marking/scar_chest_large_right/teshari
name = "Scar, Chest Large (Right)(Teshari)"
icon_state = "scar_chest_large_r_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
body_parts = list(BP_GROIN)
/datum/sprite_accessory/marking/scar_chest_small_left
@@ -2544,7 +2585,7 @@ shaved
/datum/sprite_accessory/marking/scar_chest_small_left/teshari
name = "Scar, Chest Small (Left)(Teshari)"
icon_state = "scar_chest_small_l_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_chest_small_right
name = "Scar, Chest Small (Right)"
@@ -2554,7 +2595,7 @@ shaved
/datum/sprite_accessory/marking/scar_chest_small_right/teshari
name = "Scar, Chest Small (Right)(Teshari)"
icon_state = "scar_chest_small_r_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_belly
name = "Scar, Belly"
@@ -2564,7 +2605,7 @@ shaved
/datum/sprite_accessory/marking/scar_belly/teshari
name = "Scar, Belly (Teshari)"
icon_state = "scar_belly_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
body_parts = list(BP_GROIN)
/datum/sprite_accessory/marking/scar_cheek_left
@@ -2585,7 +2626,7 @@ shaved
/datum/sprite_accessory/marking/scar_forehead_left/teshari
name = "Scar, Forehead (Left)(Teshari)"
icon_state = "scar_forehead_l_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_forehead_right
name = "Scar, Forehead (Right)"
@@ -2595,7 +2636,7 @@ shaved
/datum/sprite_accessory/marking/scar_forehead_right/teshari
name = "Scar, Forehead (Right)(Teshari)"
icon_state = "scar_forehead_r_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_chin
name = "Scar, Chin"
@@ -2605,7 +2646,7 @@ shaved
/datum/sprite_accessory/marking/scar_muzzle_teshari
name = "Scar, Muzzle"
icon_state = "scar_muzzle_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/scar_eye_left
@@ -2616,7 +2657,7 @@ shaved
/datum/sprite_accessory/marking/scar_eye_left/teshari
name = "Scar, Over Eye (Left)(Teshari)"
icon_state = "scar_eye_l_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_eye_right
name = "Scar, Over Eye (Right)"
@@ -2626,7 +2667,7 @@ shaved
/datum/sprite_accessory/marking/scar_eye_right/teshari
name = "Scar, Over Eye (Right)(Teshari)"
icon_state = "scar_eye_r_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_left_arm_upper
name = "Scar, Left Arm (Upper)"
@@ -2636,7 +2677,7 @@ shaved
/datum/sprite_accessory/marking/scar_left_arm_upper/teshari
name = "Scar, Left Arm (Upper)(Teshari)"
icon_state = "scar_arm_left_u_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_left_arm_lower
name = "Scar, Left Arm (Lower)"
@@ -2646,7 +2687,7 @@ shaved
/datum/sprite_accessory/marking/scar_left_arm_lower/teshari
name = "Scar, Left Arm (Lower)(Teshari)"
icon_state = "scar_arm_left_l_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_left_arm_rear
name = "Scar, Left Arm (Rear)"
@@ -2656,7 +2697,7 @@ shaved
/datum/sprite_accessory/marking/scar_left_arm_rear/teshari
name = "Scar, Left Arm (Rear)(Teshari)"
icon_state = "scar_arm_left_rear_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_left_hand
name = "Scar, Left Hand"
@@ -2666,7 +2707,7 @@ shaved
/datum/sprite_accessory/marking/scar_left_hand/teshari
name = "Scar, Left Hand (Teshari)"
icon_state = "scar_hand_left_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_right_arm_upper
name = "Scar, Right Arm (Upper)"
@@ -2676,7 +2717,7 @@ shaved
/datum/sprite_accessory/marking/scar_right_arm_upper/teshari
name = "Scar, Right Arm (Upper)(Teshari)"
icon_state = "scar_arm_right_u_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_right_arm_lower
name = "Scar, Right Arm (Lower)"
@@ -2686,7 +2727,7 @@ shaved
/datum/sprite_accessory/marking/scar_right_arm_lower/teshari
name = "Scar, Right Arm (Lower)(Teshari)"
icon_state = "scar_arm_right_l_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_right_arm_rear
name = "Scar, Right Arm (Rear)"
@@ -2696,7 +2737,7 @@ shaved
/datum/sprite_accessory/marking/scar_right_arm_rear/teshari
name = "Scar, Right Arm (Rear)(Teshari)"
icon_state = "scar_arm_right_rear_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_right_hand
name = "Scar, Right Hand"
@@ -2706,7 +2747,7 @@ shaved
/datum/sprite_accessory/marking/scar_right_hand/teshari
name = "Scar, Right Hand (Teshari)"
icon_state = "scar_hand_right_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_left_leg_upper
name = "Scar, Left Leg (Upper)"
@@ -2716,7 +2757,7 @@ shaved
/datum/sprite_accessory/marking/scar_left_leg_upper/teshari
name = "Scar, Left Leg (Upper)(Teshari)"
icon_state = "scar_leg_left_u_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_left_leg_lower
name = "Scar, Left Leg (Lower)"
@@ -2726,7 +2767,7 @@ shaved
/datum/sprite_accessory/marking/scar_left_leg_lower/teshari
name = "Scar, Left Leg (Lower)(Teshari)"
icon_state = "scar_leg_left_l_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_left_leg_rear
name = "Scar, Left Leg (Rear)"
@@ -2736,7 +2777,7 @@ shaved
/datum/sprite_accessory/marking/scar_left_leg_rear/teshari
name = "Scar, Left Leg (Rear)(Teshari)"
icon_state = "scar_leg_left_rear_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_left_foot
name = "Scar, Left Foot"
@@ -2746,7 +2787,7 @@ shaved
/datum/sprite_accessory/marking/scar_left_foot/teshari
name = "Scar, Left Foot (Teshari)"
icon_state = "scar_left_foot_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_right_leg_upper
name = "Scar, Right Leg (Upper)"
@@ -2756,7 +2797,7 @@ shaved
/datum/sprite_accessory/marking/scar_right_leg_upper/teshari
name = "Scar, Right Leg (Upper)(Teshari)"
icon_state = "scar_right_leg_u_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_right_leg_lower
name = "Scar, Right Leg (Lower)"
@@ -2766,7 +2807,7 @@ shaved
/datum/sprite_accessory/marking/scar_right_leg_lower/teshari
name = "Scar, Right Leg (Lower)(Teshari)"
icon_state = "scar_right_leg_l_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_right_leg_rear
name = "Scar, Right Leg (Rear)"
@@ -2776,7 +2817,7 @@ shaved
/datum/sprite_accessory/marking/scar_right_leg_rear/teshari
name = "Scar, Right Leg (Rear)(Teshari)"
icon_state = "scar_right_leg_rear_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/scar_right_foot
name = "Scar, Right Foot"
@@ -2786,7 +2827,7 @@ shaved
/datum/sprite_accessory/marking/scar_right_foot/teshari
name = "Scar, Right Foot (Teshari)"
icon_state = "scar_right_foot_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/skull_paint
name = "Skull Paint"
@@ -2807,55 +2848,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 +2904,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.
@@ -2938,13 +2979,13 @@ shaved
name = "Underfluff (Teshari)"
icon_state = "teshi_fluff"
body_parts = list(BP_HEAD, BP_TORSO, BP_GROIN, BP_R_LEG, BP_L_LEG)
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/teshi_heterochromia
name = "Heterochromia (Teshari) (right eye)"
icon_state = "teshi_heterochromia"
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
//Diona stuff.
@@ -2952,41 +2993,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 +3036,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 +3050,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 +3088,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)"
@@ -3164,7 +3205,7 @@ shaved
/datum/sprite_accessory/marking/aug/chestports/teshari
name = "Augment (Chest Ports)(Teshari)"
icon_state = "aug_chestports_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/aug/abdomenports
name = "Augment (Abdomen Ports)"
@@ -3175,7 +3216,7 @@ shaved
name = "Augment (Abdomen Ports)(Teshari)"
icon_state = "aug_abdomenports_tesh"
body_parts = list(BP_GROIN)
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
//bandages
@@ -3189,7 +3230,7 @@ shaved
/datum/sprite_accessory/marking/bandage/teshari
name = "Bandage, Head 1 (Teshari)"
icon_state = "bandage1_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/head2
name = "Bandage, Head 2"
@@ -3198,7 +3239,7 @@ shaved
/datum/sprite_accessory/marking/bandage/head2/teshari
name = "Bandage, Head 2 (Teshari)"
icon_state = "bandage2_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/head3
name = "Bandage, Head 3"
@@ -3207,7 +3248,7 @@ shaved
/datum/sprite_accessory/marking/bandage/head3/teshari
name = "Bandage, Head 3 (Teshari)"
icon_state = "bandage3_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/torso
name = "Bandage, Torso 1"
@@ -3217,7 +3258,7 @@ shaved
/datum/sprite_accessory/marking/bandage/torso/teshari
name = "Bandage, Torso 1 (Teshari)"
icon_state = "bandage1_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/torso/torso2
name = "Bandage, Torso 2"
@@ -3226,7 +3267,7 @@ shaved
/datum/sprite_accessory/marking/bandage/torso/torso2/teshari
name = "Bandage, Torso 2 (Teshari)"
icon_state = "bandage2_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/torso/torso3
name = "Bandage, Torso 3"
@@ -3235,7 +3276,7 @@ shaved
/datum/sprite_accessory/marking/bandage/torso/torso3/teshari
name = "Bandage, Torso 3 (Teshari)"
icon_state = "bandage3_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/groin
name = "Bandage, Groin 1"
@@ -3245,7 +3286,7 @@ shaved
/datum/sprite_accessory/marking/bandage/groin/teshari
name = "Bandage, Groin 1 (Teshari)"
icon_state = "bandage1_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/groin/groin2
name = "Bandage, Groin 2"
@@ -3254,7 +3295,7 @@ shaved
/datum/sprite_accessory/marking/bandage/groin/groin2/teshari
name = "Bandage, Groin 2 (Teshari)"
icon_state = "bandage2_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/groin/groin3
name = "Bandage, Groin 3"
@@ -3263,7 +3304,7 @@ shaved
/datum/sprite_accessory/marking/bandage/groin/groin3/teshari
name = "Bandage, Groin 3 (Teshari)"
icon_state = "bandage3_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/l_arm
name = "Bandage, Left Arm 1"
@@ -3273,7 +3314,7 @@ shaved
/datum/sprite_accessory/marking/bandage/l_arm/teshari
name = "Bandage, Left Arm 1 (Teshari)"
icon_state = "bandage1_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/l_arm/l_arm2
name = "Bandage, Left Arm 2"
@@ -3282,7 +3323,7 @@ shaved
/datum/sprite_accessory/marking/bandage/l_arm/l_arm2/teshari
name = "Bandage, Left Arm 2 (Teshari)"
icon_state = "bandage2_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/l_arm/l_arm3
name = "Bandage, Left Arm 3"
@@ -3291,7 +3332,7 @@ shaved
/datum/sprite_accessory/marking/bandage/l_arm/l_arm3/teshari
name = "Bandage, Left Arm 3 (Teshari)"
icon_state = "bandage3_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/l_hand
name = "Bandage, Left Hand 1"
@@ -3301,7 +3342,7 @@ shaved
/datum/sprite_accessory/marking/bandage/l_hand/teshari
name = "Bandage, Left Hand 1 (Teshari)"
icon_state = "bandage1_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/l_hand/l_hand2
name = "Bandage, Left Hand 2"
@@ -3310,7 +3351,7 @@ shaved
/datum/sprite_accessory/marking/bandage/l_hand/l_hand_2/teshari
name = "Bandage, Left Hand 2 (Teshari)"
icon_state = "bandage2_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/l_hand/l_hand3
name = "Bandage, Left Hand 3"
@@ -3324,7 +3365,7 @@ shaved
/datum/sprite_accessory/marking/bandage/r_arm/teshari
name = "Bandage, Right Arm 1 (Teshari)"
icon_state = "bandage1_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/r_arm/r_arm2
name = "Bandage, Right Arm 2"
@@ -3333,7 +3374,7 @@ shaved
/datum/sprite_accessory/marking/bandage/r_arm/r_arm2/teshari
name = "Bandage, Right Arm 2 (Teshari)"
icon_state = "bandage2_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/r_arm/r_arm3
name = "Bandage, Right Arm 3"
@@ -3342,7 +3383,7 @@ shaved
/datum/sprite_accessory/marking/bandage/r_arm/r_arm3/teshari
name = "Bandage, Right Arm 3 (Teshari)"
icon_state = "bandage3_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/r_hand
name = "Bandage, Right Hand 1"
@@ -3352,7 +3393,7 @@ shaved
/datum/sprite_accessory/marking/bandage/r_hand/teshari
name = "Bandage, Right Hand 1 (Teshari)"
icon_state = "bandage1_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/r_hand/r_hand2
name = "Bandage, Right Hand 2"
@@ -3361,7 +3402,7 @@ shaved
/datum/sprite_accessory/marking/bandage/r_hand/r_hand2/teshari
name = "Bandage, Right Hand 2 (Teshari)"
icon_state = "bandage2_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/r_hand/r_hand3
name = "Bandage, Right Hand 3"
@@ -3375,7 +3416,7 @@ shaved
/datum/sprite_accessory/marking/bandage/l_leg/teshari
name = "Bandage, Left Leg 1 (Teshari)"
icon_state = "bandage1_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/l_leg/l_leg2
name = "Bandage, Left Leg 2"
@@ -3384,7 +3425,7 @@ shaved
/datum/sprite_accessory/marking/bandage/l_leg/l_leg2/teshari
name = "Bandage, Left Leg 2 (Teshari)"
icon_state = "bandage2_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/l_leg/l_leg3
name = "Bandage, Left Leg 3"
@@ -3393,7 +3434,7 @@ shaved
/datum/sprite_accessory/marking/bandage/l_leg/l_leg3/teshari
name = "Bandage, Left Leg 3 (Teshari)"
icon_state = "bandage3_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/l_foot
name = "Bandage, Left Foot 1"
@@ -3403,7 +3444,7 @@ shaved
/datum/sprite_accessory/marking/bandage/l_foot/teshari
name = "Bandage, Left Foot 1 (Teshari)"
icon_state = "bandage1_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/l_foot/l_foot2
name = "Bandage, Left Foot 2"
@@ -3412,7 +3453,7 @@ shaved
/datum/sprite_accessory/marking/bandage/l_foot/l_foot_2/teshari
name = "Bandage, Left Foot 2 (Teshari)"
icon_state = "bandage2_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/l_foot/l_foot3
name = "Bandage, Left Foot 3"
@@ -3421,7 +3462,7 @@ shaved
/datum/sprite_accessory/marking/bandage/l_foot/l_foot_3/teshari
name = "Bandage, Left Foot 3 (Teshari)"
icon_state = "bandage3_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/r_leg
name = "Bandage, Right Leg 1"
@@ -3431,7 +3472,7 @@ shaved
/datum/sprite_accessory/marking/bandage/r_leg/teshari
name = "Bandage, Right Leg 1 (Teshari)"
icon_state = "bandage1_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/r_leg/r_leg2
name = "Bandage, Right Leg 2"
@@ -3440,7 +3481,7 @@ shaved
/datum/sprite_accessory/marking/bandage/r_leg/r_leg2/teshari
name = "Bandage, Right Leg 2 (Teshari)"
icon_state = "bandage2_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/r_leg/r_leg3
name = "Bandage, Right Leg 3"
@@ -3449,7 +3490,7 @@ shaved
/datum/sprite_accessory/marking/bandage/r_leg/r_leg3/teshari
name = "Bandage, Right Leg 3 (Teshari)"
icon_state = "bandage3_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/r_foot
name = "Bandage, Right Foot 1"
@@ -3459,7 +3500,7 @@ shaved
/datum/sprite_accessory/marking/bandage/r_foot/teshari
name = "Bandage, Right Foot 1 (Teshari)"
icon_state = "bandage1_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/r_foot/r_foot2
name = "Bandage, Right Foot 2"
@@ -3468,7 +3509,7 @@ shaved
/datum/sprite_accessory/marking/bandage/r_foot/r_foot2/teshari
name = "Bandage, Right Foot 2 (Teshari)"
icon_state = "bandage2_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/bandage/r_foot/r_foot3
name = "Bandage, Rufgt Foot 3"
@@ -3477,7 +3518,7 @@ shaved
/datum/sprite_accessory/marking/bandage/r_foot/r_foot3/teshari
name = "Bandage, Right Foot 3 (Teshari)"
icon_state = "bandage3_tesh"
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
//skin styles - WIP
//going to have to re-integrate this with surgery
@@ -3489,27 +3530,27 @@ 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
code/modules/mob/new_player/sprite_accessories_extra.dm
+11 -8
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, SPECIES_CUSTOM)
/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"
code/modules/mob/new_player/sprite_accessories_extra_vr.dm
+12 -44
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, SPECIES_CUSTOM)
/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, SPECIES_CUSTOM)
/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"
@@ -743,7 +731,7 @@
icon_state = "teshlarge_eyes"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/vr_teshari_coat
name = "Teshari coat"
@@ -751,7 +739,7 @@
icon_state = "tesh_coat"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_HEAD)
species_allowed = list(SPECIES_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/vr_teshari_pattern_male
name = "Teshari male pattern"
@@ -759,7 +747,7 @@
icon_state = "tesh-pattern-male"
color_blend_mode = ICON_MULTIPLY
body_parts = list(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_TESHARI)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/vr_teshari_pattern_female
name = "Teshari female pattern"
@@ -767,28 +755,7 @@
icon_state = "tesh-pattern-fem"
color_blend_mode = ICON_MULTIPLY
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)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/datum/sprite_accessory/marking/vr_unathihood
name = "Cobra Hood"
@@ -901,6 +868,7 @@
icon_state = "tesh-beak"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM)
/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,SPECIES_CUSTOM)
/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
icons/inventory/eyes/mob_vox.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 18 KiB

icons/inventory/suit/mob_vox.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 366 KiB

After

Width:  |  Height:  |  Size: 391 KiB

icons/mob/human_races/markings_vox.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

icons/mob/human_races/markings_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 71 KiB

icons/mob/human_races/r_vox_old.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

icons/mob/species/vox/tail.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB