diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index b4276400c1..536a107374 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -448,13 +448,14 @@ 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 = input(user, "Choose a body marking:", "Character Preference") as null|anything in 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_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 573f2173d6..27938b4a12 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -249,6 +249,13 @@ /datum/sprite_accessory/facial_hair + vulp_none + name = "None" + icon = 'icons/mob/human_face_vr.dmi' + icon_state = "none" + species_allowed = list("Vulpkanin") + gender = NEUTER + vulp_blaze name = "Blaze" icon = 'icons/mob/human_face_vr.dmi' @@ -316,4 +323,45 @@ name = "colorable mature inkling hair" desc = "" icon = 'icons/mob/human_face_vr.dmi' - icon_state = "inkling-colorable" \ No newline at end of file + icon_state = "inkling-colorable" + + +//VOREStation Body Markings and Overrides +//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/vr + icon = 'icons/mob/human_races/markings_vr.dmi' + + vulp_belly + name = "belly fur (Vulp)" + icon_state = "vulp_belly" + body_parts = list(BP_TORSO) + + vulp_fullbelly + name = "full belly fur (Vulp)" + icon_state = "vulp_fullbelly" + body_parts = list(BP_TORSO) + + vulp_crest + name = "belly crest (Vulp)" + icon_state = "vulp_crest" + body_parts = list(BP_TORSO) + + vulp_nose + name = "nose (Vulp)" + icon_state = "vulp_nose" + body_parts = list(BP_HEAD) + + vulp_face + name = "face (Vulp)" + icon_state = "vulp_face" + body_parts = list(BP_HEAD) + + vulp_earsface + name = "ears and face (Vulp)" + icon_state = "vulp_earsface" + body_parts = list(BP_HEAD) + + vulp_all + name = "all head highlights (Vulp)" + icon_state = "vulp_all" + body_parts = list(BP_HEAD) diff --git a/icons/mob/human_face_vr.dmi b/icons/mob/human_face_vr.dmi index 356cff483b..489f80a6ce 100644 Binary files a/icons/mob/human_face_vr.dmi and b/icons/mob/human_face_vr.dmi differ diff --git a/icons/mob/human_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi new file mode 100644 index 0000000000..ac82f5a456 Binary files /dev/null and b/icons/mob/human_races/markings_vr.dmi differ