From 715c07e95e0ecb119b96f810dda92e96450e37ba Mon Sep 17 00:00:00 2001 From: Bangus Date: Sat, 11 Feb 2023 17:41:12 -0500 Subject: [PATCH] Marking system now respects me, unlike dad --- .../preference_setup/general/03_body.dm | 3 +- .../mob/new_player/sprite_accessories.dm | 148 +++++++++--------- .../new_player/sprite_accessories_extra.dm | 2 +- .../new_player/sprite_accessories_extra_vr.dm | 16 +- 4 files changed, 85 insertions(+), 84 deletions(-) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 49bfba58b6..374faf7335 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -829,9 +829,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/list/usable_markings = pref.body_markings.Copy() ^ body_marking_styles_list.Copy() 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 var/new_marking = tgui_input_list(user, "Choose a body marking:", "Character Preference", usable_markings) if(new_marking && CanUseTopic(user)) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index beacf36feb..7f3ddc9d29 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -2360,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/brow_right name = "Brow Right" @@ -2370,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/cheekspot_left name = "Cheek Spot (Left Cheek)" @@ -2400,7 +2400,7 @@ shaved /datum/sprite_accessory/marking/eyestripe/teshari name = "Eye Stripe (Teshari)" icon_state = "eyestripe_tesh" - species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/eyecorner_left name = "Eye Corner Left" @@ -2410,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/eyecorner_right name = "Eye Corner Right" @@ -2420,7 +2420,7 @@ shaved /datum/sprite_accessory/marking/eyecorner_right/teshari name = "Eye Corner Right (Teshari)" icon_state = "eyecorner_r_tesh" - species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/fullfacepaint name = "Full Face Paint" @@ -2461,7 +2461,7 @@ shaved /datum/sprite_accessory/marking/nosestripe/teshari name = "Nose Stripe (Teshari)" icon_state = "nosestripe_tesh" - species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/nosetape name = "Nose Tape" @@ -2472,7 +2472,7 @@ shaved /datum/sprite_accessory/marking/nosetape/tesh name = "Nose Tape (Teshari)" icon_state = "nosetape_tesh" - species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_abdomen_left name = "Scar, Abdomen Left" @@ -2482,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_abdomen_right name = "Scar, Abdomen Right" @@ -2492,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_abdomen_small_left name = "Scar, Abdomen Small Left" @@ -2502,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_abdomen_small_right name = "Scar, Abdomen Small Right" @@ -2512,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_back_large name = "Scar, Back Large" @@ -2522,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_back_small name = "Scar, Back Small (Center)" @@ -2532,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) body_parts = list(BP_GROIN) /datum/sprite_accessory/marking/scar_back_small_upper_right @@ -2563,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) body_parts = list(BP_GROIN) /datum/sprite_accessory/marking/scar_chest_large_right @@ -2574,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) body_parts = list(BP_GROIN) /datum/sprite_accessory/marking/scar_chest_small_left @@ -2585,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_chest_small_right name = "Scar, Chest Small (Right)" @@ -2595,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_belly name = "Scar, Belly" @@ -2605,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) body_parts = list(BP_GROIN) /datum/sprite_accessory/marking/scar_cheek_left @@ -2626,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_forehead_right name = "Scar, Forehead (Right)" @@ -2636,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_chin name = "Scar, Chin" @@ -2646,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/scar_eye_left @@ -2657,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_eye_right name = "Scar, Over Eye (Right)" @@ -2667,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_left_arm_upper name = "Scar, Left Arm (Upper)" @@ -2677,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_left_arm_lower name = "Scar, Left Arm (Lower)" @@ -2687,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_left_arm_rear name = "Scar, Left Arm (Rear)" @@ -2697,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_left_hand name = "Scar, Left Hand" @@ -2707,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_right_arm_upper name = "Scar, Right Arm (Upper)" @@ -2717,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_right_arm_lower name = "Scar, Right Arm (Lower)" @@ -2727,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_right_arm_rear name = "Scar, Right Arm (Rear)" @@ -2737,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_right_hand name = "Scar, Right Hand" @@ -2747,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_left_leg_upper name = "Scar, Left Leg (Upper)" @@ -2757,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_left_leg_lower name = "Scar, Left Leg (Lower)" @@ -2767,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_left_leg_rear name = "Scar, Left Leg (Rear)" @@ -2777,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_left_foot name = "Scar, Left Foot" @@ -2787,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_right_leg_upper name = "Scar, Right Leg (Upper)" @@ -2797,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_right_leg_lower name = "Scar, Right Leg (Lower)" @@ -2807,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_right_leg_rear name = "Scar, Right Leg (Rear)" @@ -2817,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/scar_right_foot name = "Scar, Right Foot" @@ -2827,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/skull_paint name = "Skull Paint" @@ -2979,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) //Diona stuff. @@ -3205,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/aug/abdomenports name = "Augment (Abdomen Ports)" @@ -3216,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) //bandages @@ -3230,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/head2 name = "Bandage, Head 2" @@ -3239,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/head3 name = "Bandage, Head 3" @@ -3248,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/torso name = "Bandage, Torso 1" @@ -3258,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/torso/torso2 name = "Bandage, Torso 2" @@ -3267,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/torso/torso3 name = "Bandage, Torso 3" @@ -3276,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/groin name = "Bandage, Groin 1" @@ -3286,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/groin/groin2 name = "Bandage, Groin 2" @@ -3295,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/groin/groin3 name = "Bandage, Groin 3" @@ -3304,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/l_arm name = "Bandage, Left Arm 1" @@ -3314,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/l_arm/l_arm2 name = "Bandage, Left Arm 2" @@ -3323,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/l_arm/l_arm3 name = "Bandage, Left Arm 3" @@ -3332,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/l_hand name = "Bandage, Left Hand 1" @@ -3342,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/l_hand/l_hand2 name = "Bandage, Left Hand 2" @@ -3351,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/l_hand/l_hand3 name = "Bandage, Left Hand 3" @@ -3365,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/r_arm/r_arm2 name = "Bandage, Right Arm 2" @@ -3374,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/r_arm/r_arm3 name = "Bandage, Right Arm 3" @@ -3383,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/r_hand name = "Bandage, Right Hand 1" @@ -3393,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/r_hand/r_hand2 name = "Bandage, Right Hand 2" @@ -3402,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/r_hand/r_hand3 name = "Bandage, Right Hand 3" @@ -3416,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/l_leg/l_leg2 name = "Bandage, Left Leg 2" @@ -3425,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/l_leg/l_leg3 name = "Bandage, Left Leg 3" @@ -3434,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/l_foot name = "Bandage, Left Foot 1" @@ -3444,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/l_foot/l_foot2 name = "Bandage, Left Foot 2" @@ -3453,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/l_foot/l_foot3 name = "Bandage, Left Foot 3" @@ -3462,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/r_leg name = "Bandage, Right Leg 1" @@ -3472,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/r_leg/r_leg2 name = "Bandage, Right Leg 2" @@ -3481,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/r_leg/r_leg3 name = "Bandage, Right Leg 3" @@ -3490,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/r_foot name = "Bandage, Right Foot 1" @@ -3500,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/r_foot/r_foot2 name = "Bandage, Right Foot 2" @@ -3509,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/bandage/r_foot/r_foot3 name = "Bandage, Rufgt Foot 3" @@ -3518,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) //skin styles - WIP //going to have to re-integrate this with surgery diff --git a/code/modules/mob/new_player/sprite_accessories_extra.dm b/code/modules/mob/new_player/sprite_accessories_extra.dm index 0df39d66c2..3569d1badd 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra.dm @@ -443,7 +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) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr/spirit_lights name = "Ward - Spirit FBP Lights" 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 488ff5a661..942f49087d 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm @@ -401,7 +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) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr_harpy_feathers name = "Rapala leg Feather" @@ -525,7 +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) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr_spirit_lights name = "Ward - Spirit FBP Lights" @@ -731,7 +731,7 @@ icon_state = "teshlarge_eyes" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr_teshari_coat name = "Teshari coat" @@ -739,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr_teshari_pattern_male name = "Teshari male pattern" @@ -747,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_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr_teshari_pattern_female name = "Teshari female pattern" @@ -755,7 +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,SPECIES_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr_unathihood name = "Cobra Hood" @@ -868,7 +868,7 @@ icon_state = "tesh-beak" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr_tesh_beak_alt name = "Teshari beak, rounded" @@ -876,7 +876,7 @@ icon_state = "tesh-beak-alt" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_TESHARI,SPECIES_CUSTOM) + species_allowed = list(SPECIES_TESHARI) /datum/sprite_accessory/marking/vr_generic_hooves name = "Generic Hooves"