From 79cd2a7d5660c3a386c510637cba7e0d6dcfe001 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Sun, 5 Nov 2023 21:16:56 -0500 Subject: [PATCH] Significantly nerf chemvomit and give it a reasonable default. (#21453) --- .../Chemistry/ReagentEffects/ChemVomit.cs | 4 ++-- Resources/Prototypes/Reagents/cleaning.yml | 13 +++++++++++-- Resources/Prototypes/Reagents/medicine.yml | 3 +++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs b/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs index cfdfd5ffa0..630d00124c 100644 --- a/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs +++ b/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs @@ -13,10 +13,10 @@ namespace Content.Server.Chemistry.ReagentEffects { /// How many units of thirst to add each time we vomit [DataField("thirstAmount")] - public float ThirstAmount = -40f; + public float ThirstAmount = -8f; /// How many units of hunger to add each time we vomit [DataField("hungerAmount")] - public float HungerAmount = -40f; + public float HungerAmount = -8f; protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-chem-vomit", ("chance", Probability)); diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml index 5c03e50272..b70a7af0fa 100644 --- a/Resources/Prototypes/Reagents/cleaning.yml +++ b/Resources/Prototypes/Reagents/cleaning.yml @@ -52,10 +52,16 @@ Food: effects: - !type:ChemVomit + conditions: + - !type:ReagentThreshold + min: 6 probability: 0.20 Drink: effects: - !type:ChemVomit + conditions: + - !type:ReagentThreshold + min: 6 probability: 0.20 - type: reagent @@ -73,9 +79,12 @@ - !type:SatiateThirst factor: 3 - !type:ChemVomit + conditions: + - !type:ReagentThreshold + min: 6 probability: 0.10 - thirstAmount: -10.0 - hungerAmount: -10.0 + thirstAmount: -5.0 + hungerAmount: -5.0 plantMetabolism: - !type:PlantAdjustWater amount: .8 diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 3342444759..62eb269358 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -407,6 +407,9 @@ Medicine: effects: - !type:ChemVomit + conditions: + - !type:ReagentThreshold + min: 4 probability: 0.3 - type: reagent -- 2.51.2