Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Satiety tweaks (#9519)

Browse Source 
* Satiety tweaks

* actually lets do this
This commit is contained in:
Kara
2022-07-07 11:21:26 -07:00
committed by GitHub
parent 0d4f7d06a7
commit f092f478f7
8 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Body/Components/StomachComponent.cs
View File

@@ -24,7 +24,7 @@ namespace Content.Server.Body.Components
/// Initial internal solution storage volume
/// </summary>
[DataField("maxVolume")]
public FixedPoint2 InitialMaxVolume { get; private set; } = FixedPoint2.New(20);
public FixedPoint2 InitialMaxVolume { get; private set; } = FixedPoint2.New(50);
/// <summary>
/// Time in seconds between reagents being ingested and them being

2
Content.Server/Chemistry/Components/ChemMasterComponent.cs
View File

@@ -290,7 +290,7 @@ namespace Content.Server.Chemistry.Components
return;
}
var actualVolume = FixedPoint2.Min(individualVolume, FixedPoint2.New(20));
var actualVolume = FixedPoint2.Min(individualVolume, FixedPoint2.New(25));
for (int i = 0; i < pillAmount; i++)
{
var pill = _entities.SpawnEntity("Pill", _entities.GetComponent<TransformComponent>(Owner).Coordinates);

17
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
View File

@@ -315,10 +315,21 @@ namespace Content.Server.Nutrition.EntitySystems
// All stomach are full or can't handle whatever solution we have.
if (firstStomach == null)
{
_popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough-other"),
uid, Filter.Entities(args.User));
_solutionContainerSystem.TryAddSolution(args.Drink.Owner, args.DrinkSolution, drained);
_popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough"),
uid, Filter.Entities(uid));
if (forceDrink)
{
_popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough-other"),
uid, Filter.Entities(args.User));
_spillableSystem.SpillAt(uid, drained, "PuddleSmear");
}
else
{
_solutionContainerSystem.TryAddSolution(args.Drink.Owner, args.DrinkSolution, drained);
}
_spillableSystem.SpillAt(uid, drained, "PuddleSmear");
return;
}