From cd3ecaa8c13911b710c7f9c2c0d09c29057fe4cd Mon Sep 17 00:00:00 2001 From: Bangus Date: Tue, 14 Feb 2023 20:31:04 -0500 Subject: [PATCH] Unwhitelisted --- .../preference_setup/general/03_body.dm | 2 + .../mob/new_player/sprite_accessories.dm | 76 +++++++++---------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 374faf7335..8549b83e81 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -827,6 +827,7 @@ 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] var/datum/species/spec = GLOB.all_species[pref.species] @@ -834,6 +835,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O continue 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) if(new_marking && CanUseTopic(user)) pref.body_markings[new_marking] = "#000000" //New markings start black diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 7f3ddc9d29..aae978f405 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -2102,45 +2102,6 @@ shaved 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 @@ -3554,3 +3515,40 @@ shaved icon_state = "default" icon = 'icons/mob/human_races/r_skrell.dmi' //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)