diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 53a47625e6..c6b8f32e1e 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -73,7 +73,7 @@ if(!(path in negative_traits)) pref.neg_traits -= path - if(!pref.custom_base || !(pref.custom_base in playable_species - whitelisted_species)) + if(!pref.custom_base || (pref.custom_base != "Xenochimera" && !(pref.custom_base in playable_species - whitelisted_species))) pref.custom_base = "Human" /datum/category_item/player_setup_item/vore/traits/copy_to_mob(var/mob/living/carbon/human/character) @@ -98,10 +98,14 @@ . += "Custom Species " . += "[pref.custom_species ? pref.custom_species : "-Input Name-"]
" - if((pref.species == "Custom Species") || (pref.species == "Xenochimera")) + if(pref.species == "Custom Species") . += "Icon Base: " . += "[pref.custom_base ? pref.custom_base : "Human"]
" + if(pref.species == "Xenochimera") + . += "Icon Base: " + . += "[pref.custom_base ? pref.custom_base : "Human"]
" + if(pref.species == "Custom Species") var/points_left = pref.starting_trait_points @@ -162,6 +166,12 @@ pref.custom_base = text_choice return TOPIC_REFRESH_UPDATE_PREVIEW + else if(href_list["custom_base_xenochimera"]) + var/text_choice = input("Pick an icon set for your species:","Icon Base") in playable_species - whitelisted_species - "Custom Species" - "Promethean" + "Xenochimera" + if(text_choice in playable_species) + pref.custom_base = text_choice + return TOPIC_REFRESH_UPDATE_PREVIEW + else if(href_list["blood_color"]) var/color_choice = input("Pick a blood color (does not apply to synths)","Blood Color",pref.blood_color) as color if(color_choice) diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index 179302314d..2f46b1b13f 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -15,7 +15,7 @@ brute_mod = 0.8 //About as tanky to brute as a Unathi. They'll probably snap and go feral when hurt though. burn_mod = 1.15 //As vulnerable to burn as a Tajara. can_fly = 1 //They have wings by default. - var/base_species = "Tajaran" //They have the taj sprite. + var/base_species = "Xenochimera" num_alternate_languages = 2 secondary_langs = list("Sol Common")