From cb6ebb49a9a4aeff6dc4e16968d85d9990ba8a4c Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Mon, 28 Feb 2022 04:31:48 +0000 Subject: [PATCH] more allergen tweaks --- .../living/carbon/human/species/species.dm | 2 +- .../species/station/traits_vr/neutral.dm | 4 +-- .../reagents/reactions/instant/instant_vr.dm | 7 ++++ code/modules/reagents/reagents/medicine_vr.dm | 33 +++++++++++++++++++ 4 files changed, 43 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 995bcfa97f..9dd1eaffe7 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -54,7 +54,7 @@ var/taste_sensitivity = TASTE_NORMAL // How sensitive the species is to minute tastes. var/allergens = null // Things that will make this species very sick var/allergen_reaction = AG_TOX_DMG|AG_OXY_DMG|AG_EMOTE|AG_PAIN|AG_BLURRY|AG_CONFUSE // What type of reactions will you have? These the 'main' options and are intended to approximate anaphylactic shock at high doses. VOREStation Edit'd. - var/allergen_damage_severity = 5 // How bad are reactions to the allergen? Touch with extreme caution. VOREStation Edit'd. + var/allergen_damage_severity = 4 // How bad are reactions to the allergen? Touch with extreme caution. VOREStation Edit'd. var/allergen_disable_severity = 4 // Whilst this determines how long nonlethal effects last and how common emotes are. VOREStation Edit'd. var/min_age = 17 diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index 1c3818324a..3c2e093580 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -251,7 +251,7 @@ desc = "This trait drastically reduces the effects of allergen reactions. If you don't have any allergens set, it does nothing. It does not apply to special reactions (such as unathi drowsiness from sugars)." cost = 0 custom_only = FALSE - var_changes = list("allergen_damage_severity" = 2.5, "allergen_disable_severity" = 3) + var_changes = list("allergen_damage_severity" = 2, "allergen_disable_severity" = 3) excludes = list(/datum/trait/neutral/allergen_increased_effect) /datum/trait/neutral/allergen_increased_effect @@ -259,7 +259,7 @@ desc = "This trait drastically increases the effects of allergen reactions, enough that even a small dose can be lethal. If you don't have any allergens set, it does nothing. It does not apply to special reactions (such as unathi drowsiness from sugars)." cost = 0 custom_only = FALSE - var_changes = list("allergen_damage_severity" = 10, "allergen_disable_severity" = 6) + var_changes = list("allergen_damage_severity" = 8, "allergen_disable_severity" = 6) excludes = list(/datum/trait/neutral/allergen_reduced_effect) // Spicy Food Traits, from negative to positive. diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm index 63b764dafe..c9b3ad1dc7 100644 --- a/code/modules/reagents/reactions/instant/instant_vr.dm +++ b/code/modules/reagents/reactions/instant/instant_vr.dm @@ -147,6 +147,13 @@ inhibitors = list("fluorine" = 0.01) result_amount = 1 +/decl/chemical_reaction/instant/nutridax + name = "Nutridax" + id = "nutridax" + result = "nutridax" + required_reagents = list("oxygen" = 1, "lipozine" = 1, "carbon" = 1) + result_amount = 3 + /////////////////////////////////////////////////////////////////////////////////// /// Vore Drugs diff --git a/code/modules/reagents/reagents/medicine_vr.dm b/code/modules/reagents/reagents/medicine_vr.dm index 55ed8b1ee2..5984a7a797 100644 --- a/code/modules/reagents/reagents/medicine_vr.dm +++ b/code/modules/reagents/reagents/medicine_vr.dm @@ -92,3 +92,36 @@ /datum/reagent/sleevingcure/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.remove_a_modifier_of_type(/datum/modifier/resleeving_sickness) M.remove_a_modifier_of_type(/datum/modifier/faux_resleeving_sickness) + +/datum/reagent/nutridax + name = "Nutridax" + id = "nutridax" + description = "A dieting aid that targets free-floating proteins and sugars." + taste_description = "bitterness" + reagent_state = SOLID + color = "#605048" + overdose = REAGENTS_OVERDOSE + +/datum/reagent/nutridax/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + if(alien == IS_DIONA) + return + M.dizziness = 0 + M.drowsyness = 0 + M.stuttering = 0 + M.SetConfused(0) + if(M.ingested) + for(var/datum/reagent/R in M.ingested.reagent_list) + if(istype(R, /datum/reagent/nutriment)) + R.remove_self(removed * 30) + +/datum/reagent/nutridax/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + if(alien == IS_DIONA) + return + M.dizziness = 0 + M.drowsyness = 0 + M.stuttering = 0 + M.SetConfused(0) + if(M.bloodstr) + for(var/datum/reagent/R in M.bloodstr.reagent_list) + if(istype(R, /datum/reagent/nutriment)) + R.remove_self(removed * 20)