From 2265616bc52edf84bdcf7797ed35e86632f5136b Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 22 Mar 2019 15:38:17 -0400 Subject: [PATCH 1/7] Species Tweaks - 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 --- code/__defines/chemistry_vr.dm | 7 ++++--- code/modules/client/preference_setup/vore/07_traits.dm | 9 +++++---- .../carbon/human/species/station/station_special_vr.dm | 1 + .../living/carbon/human/species/station/station_vr.dm | 8 ++++---- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 1 + 5 files changed, 15 insertions(+), 11 deletions(-) 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. From 21bfead6982751bd8934ee32f4e6950ef428bef6 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 22 Mar 2019 15:39:21 -0400 Subject: [PATCH 2/7] Another Tweak --- .../mob/living/carbon/human/species/station/station_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6e77a91076..c3347b7e13 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 @@ -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 = 300 //Prevents heat discomfort spam at 20c + heat_discomfort_level = 295 //Prevents heat discomfort spam at 20c /datum/species/skrell spawn_flags = SPECIES_CAN_JOIN From 6465150c4ef60a7eeb0a3be3ae5d67e8093da27e Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 24 Mar 2019 18:53:51 -0400 Subject: [PATCH 3/7] Fixes some serious spacebrain gas --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 0823841387..eb500417d4 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -34,14 +34,11 @@ data -= taste /datum/reagent/nutriment/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - /* VOREStation Removal - if(!injectable && alien != IS_SLIME) + + if(!injectable && alien != IS_SLIME && alien != IS_CHIMERA) //VOREStation Edit M.adjustToxLoss(0.1 * removed) return - affect_ingest(M, alien, removed) - */ //VOREStation Removal End - if(injectable) //vorestation addition/replacement - affect_ingest(M, alien, removed) + affect_ingest(M, alien, removed) /datum/reagent/nutriment/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) switch(alien) From 75158977135ffa7a2eebfd6ecae5b05fc07f0b40 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 24 Mar 2019 19:41:01 -0400 Subject: [PATCH 4/7] Whitespace Reeeeee --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 1 - 1 file changed, 1 deletion(-) 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 eb500417d4..c6da967d6f 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -34,7 +34,6 @@ data -= taste /datum/reagent/nutriment/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(!injectable && alien != IS_SLIME && alien != IS_CHIMERA) //VOREStation Edit M.adjustToxLoss(0.1 * removed) return From c0a0bb63a689d428f3da6526496ae41d799063bd Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 24 Mar 2019 20:16:14 -0400 Subject: [PATCH 5/7] Buffs Xenochimera Protein Because protein is a sub-type of nutriment, I am 99% certain that this is required to offset the nutriment debuff. --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 4 ++++ 1 file changed, 4 insertions(+) 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 c6da967d6f..6528826ac7 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -74,6 +74,10 @@ return if(IS_UNATHI) ..(M, alien, removed*2.25) //Unathi get most of their nutrition from meat. + //VOREStation Edit Start + if(IS_CHIMERA) + ..(M, alien, removed*4) //Xenochimera are obligate carnivores. + //VOREStation Edit End ..() /datum/reagent/nutriment/protein/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) From ec78c7b13baf014154ef25e188f49df5da7fbdca Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 25 Mar 2019 01:17:30 -0400 Subject: [PATCH 6/7] Adds Tajhair to Xenochim/Proteans --- .../mob/new_player/sprite_accessories_vr.dm | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 262275fdea..e00e06ea52 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -209,6 +209,31 @@ icon_state = "hair_messy" species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) + taj_ears_curls + name = "Tajaran Curly" + icon_state = "hair_curly" + species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) + + taj_ears_wife + name = "Tajaran Housewife" + icon_state = "hair_wife" + species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) + + taj_ears_victory + name = "Tajaran Victory Curls" + icon_state = "hair_victory" + species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) + + taj_ears_bob + name = "Tajaran Bob" + icon_state = "hair_tbob" + species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) + + taj_ears_fingercurl + name = "Tajaran Finger Curls" + icon_state = "hair_fingerwave" + species_allowed = list(SPECIES_TAJ, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) + teshari_fluffymohawk name = "Teshari Fluffy Mohawk" icon = 'icons/mob/human_face_vr.dmi' From b602fd8c1b472fb239bb4febf09c9083f5e8b568 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 29 Mar 2019 10:35:11 -0400 Subject: [PATCH 7/7] Cleans up code --- code/__defines/chemistry_vr.dm | 5 +---- .../mob/living/carbon/human/species/station/station_vr.dm | 6 ------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/code/__defines/chemistry_vr.dm b/code/__defines/chemistry_vr.dm index 8a0c9e4e73..094bfc2139 100644 --- a/code/__defines/chemistry_vr.dm +++ b/code/__defines/chemistry_vr.dm @@ -1,5 +1,2 @@ // More for our custom races -//#define IS_SERGAL 10 -//#define IS_AKULA 11 -//#define IS_NEVREAN 12 -#define IS_CHIMERA 11 \ No newline at end of file +#define IS_CHIMERA 12 \ No newline at end of file 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 c3347b7e13..a4563fdf9d 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,8 +37,6 @@ flesh_color = "#AFA59E" base_color = "#777777" - //reagent_tag = IS_SERGAL - heat_discomfort_strings = list( "Your fur prickles in the heat.", "You feel uncomfortably warm.", @@ -99,8 +97,6 @@ base_color = "#777777" blood_color = "#1D2CBF" - //reagent_tag = IS_AKULA - /datum/species/akula/can_breathe_water() return TRUE // Surprise, SHERKS. @@ -140,8 +136,6 @@ flesh_color = "#AFA59E" base_color = "#333333" - //reagent_tag = IS_SERGAL - heat_discomfort_strings = list( "Your fur prickles in the heat.", "You feel uncomfortably warm.",