diff --git a/code/__defines/chemistry_vr.dm b/code/__defines/chemistry_vr.dm index 7c29bced61..8a0c9e4e73 100644 --- a/code/__defines/chemistry_vr.dm +++ b/code/__defines/chemistry_vr.dm @@ -1,4 +1,5 @@ // More for our custom races -#define IS_SERGAL 10 -#define IS_AKULA 11 -#define IS_NEVREAN 12 \ No newline at end of file +//#define IS_SERGAL 10 +//#define IS_AKULA 11 +//#define IS_NEVREAN 12 +#define IS_CHIMERA 11 \ No newline at end of file diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 4276a41163..fe87d35fbe 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -87,13 +87,14 @@ var/S = pref.custom_base ? pref.custom_base : "Human" var/datum/species/custom/new_CS = CS.produceCopy(S, pref.pos_traits + pref.neu_traits + pref.neg_traits, character) - //Statistics for this would be nice - var/english_traits = english_list(new_CS.traits, and_text = ";", comma_text = ";") - log_game("TRAITS [pref.client_ckey]/([character]) with: [english_traits]") //Terrible 'fake' key_name()... but they aren't in the same entity yet - //Any additional non-trait settings can be applied here new_CS.blood_color = pref.blood_color + if(pref.species == SPECIES_CUSTOM) + //Statistics for this would be nice + var/english_traits = english_list(new_CS.traits, and_text = ";", comma_text = ";") + log_game("TRAITS [pref.client_ckey]/([character]) with: [english_traits]") //Terrible 'fake' key_name()... but they aren't in the same entity yet + /datum/category_item/player_setup_item/vore/traits/content(var/mob/user) . += "Custom Species " . += "[pref.custom_species ? pref.custom_species : "-Input Name-"]
" 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 1857e59bcd..cdc6f46165 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 @@ -66,6 +66,7 @@ base_color = "#333333" blood_color = "#14AD8B" + reagent_tag = IS_CHIMERA /datum/species/xenochimera/handle_environment_special(var/mob/living/carbon/human/H) //If they're KO'd/dead, they're probably not thinking a lot about much of anything. diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index b2c369884f..6e77a91076 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -37,7 +37,7 @@ flesh_color = "#AFA59E" base_color = "#777777" - reagent_tag = IS_SERGAL + //reagent_tag = IS_SERGAL heat_discomfort_strings = list( "Your fur prickles in the heat.", @@ -99,7 +99,7 @@ base_color = "#777777" blood_color = "#1D2CBF" - reagent_tag = IS_AKULA + //reagent_tag = IS_AKULA /datum/species/akula/can_breathe_water() return TRUE // Surprise, SHERKS. @@ -140,7 +140,7 @@ flesh_color = "#AFA59E" base_color = "#333333" - reagent_tag = IS_SERGAL + //reagent_tag = IS_SERGAL heat_discomfort_strings = list( "Your fur prickles in the heat.", @@ -319,7 +319,7 @@ min_age = 18 gluttonous = 0 //Moving this here so I don't have to fix this conflict every time polaris glances at station.dm inherent_verbs = list(/mob/living/proc/shred_limb) - heat_discomfort_level = 294 //Prevents heat discomfort spam at 20c + heat_discomfort_level = 300 //Prevents heat discomfort spam at 20c /datum/species/skrell spawn_flags = SPECIES_CAN_JOIN diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 30f09aaf02..0823841387 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -47,6 +47,7 @@ switch(alien) if(IS_DIONA) return if(IS_UNATHI) removed *= 0.5 + if(IS_CHIMERA) removed *= 0.25 //VOREStation Edit if(issmall(M)) removed *= 2 // Small bodymass, more effect from lower volume. M.heal_organ_damage(0.5 * removed, 0) if(M.species.gets_food_nutrition) //VOREStation edit. If this is set to 0, they don't get nutrition from food.