cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Species Tweaks

Browse Source 
- Removes Reagent tags for Akula, Neverean, and Sergals, as they were not used at all.
- Adds Reagent tag for Xenochimera.
- Xenochimera now get 25% Hunger satisfaction from Nutriment (Previously 100%)
- Fixes a Xenochimera-related runtime
- Increases the heat discomfort level of Tajarans by 6 kelvin
This commit is contained in:
Unknown
2019-03-22 15:38:17 -04:00
committed by Novacat
parent d3979a820f
commit 2265616bc5
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/__defines/chemistry_vr.dm
View File

@@ -1,4 +1,5 @@
// More for our custom races // More for our custom races
#define IS_SERGAL 10 //#define IS_SERGAL 10
#define IS_AKULA 11 //#define IS_AKULA 11
#define IS_NEVREAN 12 //#define IS_NEVREAN 12
#define IS_CHIMERA 11

7
code/modules/client/preference_setup/vore/07_traits.dm
View File

@@ -87,13 +87,14 @@
var/S = pref.custom_base ? pref.custom_base : "Human" 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) var/datum/species/custom/new_CS = CS.produceCopy(S, pref.pos_traits + pref.neu_traits + pref.neg_traits, character)
//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 //Statistics for this would be nice
var/english_traits = english_list(new_CS.traits, and_text = ";", comma_text = ";") 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 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
/datum/category_item/player_setup_item/vore/traits/content(var/mob/user) /datum/category_item/player_setup_item/vore/traits/content(var/mob/user)
. += "<b>Custom Species</b> " . += "<b>Custom Species</b> "
. += "<a href='?src=\ref[src];custom_species=1'>[pref.custom_species ? pref.custom_species : "-Input Name-"]</a><br>" . += "<a href='?src=\ref[src];custom_species=1'>[pref.custom_species ? pref.custom_species : "-Input Name-"]</a><br>"

1
code/modules/mob/living/carbon/human/species/station/station_special_vr.dm
View File

@@ -66,6 +66,7 @@
base_color = "#333333" base_color = "#333333"
blood_color = "#14AD8B" blood_color = "#14AD8B"
reagent_tag = IS_CHIMERA
/datum/species/xenochimera/handle_environment_special(var/mob/living/carbon/human/H) /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. //If they're KO'd/dead, they're probably not thinking a lot about much of anything.

8
code/modules/mob/living/carbon/human/species/station/station_vr.dm
View File

@@ -37,7 +37,7 @@
flesh_color = "#AFA59E" flesh_color = "#AFA59E"
base_color = "#777777" base_color = "#777777"
reagent_tag = IS_SERGAL //reagent_tag = IS_SERGAL
heat_discomfort_strings = list( heat_discomfort_strings = list(
"Your fur prickles in the heat.", "Your fur prickles in the heat.",
@@ -99,7 +99,7 @@
base_color = "#777777" base_color = "#777777"
blood_color = "#1D2CBF" blood_color = "#1D2CBF"
reagent_tag = IS_AKULA //reagent_tag = IS_AKULA
/datum/species/akula/can_breathe_water() /datum/species/akula/can_breathe_water()
return TRUE // Surprise, SHERKS. return TRUE // Surprise, SHERKS.
@@ -140,7 +140,7 @@
flesh_color = "#AFA59E" flesh_color = "#AFA59E"
base_color = "#333333" base_color = "#333333"
reagent_tag = IS_SERGAL //reagent_tag = IS_SERGAL
heat_discomfort_strings = list( heat_discomfort_strings = list(
"Your fur prickles in the heat.", "Your fur prickles in the heat.",
@@ -319,7 +319,7 @@
min_age = 18 min_age = 18
gluttonous = 0 //Moving this here so I don't have to fix this conflict every time polaris glances at station.dm 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) 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 /datum/species/skrell
spawn_flags = SPECIES_CAN_JOIN spawn_flags = SPECIES_CAN_JOIN

1
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
View File

@@ -47,6 +47,7 @@
switch(alien) switch(alien)
if(IS_DIONA) return if(IS_DIONA) return
if(IS_UNATHI) removed *= 0.5 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. if(issmall(M)) removed *= 2 // Small bodymass, more effect from lower volume.
M.heal_organ_damage(0.5 * removed, 0) 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. if(M.species.gets_food_nutrition) //VOREStation edit. If this is set to 0, they don't get nutrition from food.