diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs index b362ce5634..ed62176973 100644 --- a/Content.Server/Medical/VomitSystem.cs +++ b/Content.Server/Medical/VomitSystem.cs @@ -70,11 +70,21 @@ namespace Content.Server.Medical _solutionContainer.UpdateChemicals(stomach.Comp.Owner, sol); } } - // And the small bit of the chem stream from earlier + // Adds a tiny amount of the chem stream from earlier along with vomit if (TryComp(uid, out var bloodStream)) { - var temp = _solutionContainer.SplitSolution(uid, bloodStream.ChemicalSolution, solutionSize); - solution.AddSolution(temp, _proto); + var chemMultiplier = 0.1; + var vomitMultiplier = 0.9; + + // Makes a vomit solution the size of 90% of the chemicals removed from the chemstream + var vomitAmount = new Solution("Vomit", solutionSize * vomitMultiplier); + + // Takes 10% of the chemicals removed from the chem stream + var vomitChemstreamAmount = _solutionContainer.SplitSolution(uid, bloodStream.ChemicalSolution, solutionSize * chemMultiplier); + + _solutionContainer.SplitSolution(uid, bloodStream.ChemicalSolution, solutionSize * vomitMultiplier); + solution.AddSolution(vomitAmount, _proto); + solution.AddSolution(vomitChemstreamAmount, _proto); } if (_puddle.TrySpillAt(uid, solution, out var puddle, false)) diff --git a/Resources/Locale/en-US/reagents/meta/biological.ftl b/Resources/Locale/en-US/reagents/meta/biological.ftl index f2a0d8062b..1eee5df990 100644 --- a/Resources/Locale/en-US/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/reagents/meta/biological.ftl @@ -12,3 +12,6 @@ reagent-desc-ichor = An extremely potent regenerative chemical, perfected by spa reagent-name-fat = fat reagent-desc-fat = No matter how it was obtained, its application is important. + +reagent-name-vomit = vomit +reagent-desc-vomit = You can see a few chunks of someones last meal in it. diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml index 584aadfb99..568e7bf8aa 100644 --- a/Resources/Prototypes/Reagents/biological.yml +++ b/Resources/Prototypes/Reagents/biological.yml @@ -97,3 +97,21 @@ color: "#d8d8b0" physicalDesc: reagent-physical-desc-exotic-smelling slippery: false + +- type: reagent + id: Vomit + name: reagent-name-vomit + group: Biological + desc: reagent-desc-vomit + flavor: terrible + color: "#87ab08" + physicalDesc: reagent-physical-desc-pungent + slippery: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.5 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.1