Significantly nerf chemvomit and give it a reasonable default. (#21453)

diff --git a/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs b/Content.Server/Chemistry/ReagentEffects/ChemVomit.cs
index cfdfd5ffa05726e9cf24afa3ec33cbbaf9b3cebe..630d00124c3f6cd760ac92072816ea89db8ea15d 100644 (file)
--- 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 5c03e50272beff07eda8160ab5864772e5cc3dc5..b70a7af0fadfbdba145e90df8a31a91102247588 100644 (file)
--- 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 3342444759d8ebe76607788fb5963141e3aec5c4..62eb2693586b837b4a030648469d27f759ae6a45 100644 (file)
--- 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