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

Adds repeating DoAfters to Food and Drink (#15233)

Browse Source
This commit is contained in:
keronshb
2023-04-15 18:14:26 -04:00
committed by GitHub
parent 39e59f11bf
commit c6aae19a16
7 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,7 +307,9 @@ namespace Content.Server.Nutrition.EntitySystems
var drained = _solutionContainerSystem.Drain(uid, solution, transferAmount);
var forceDrink = args.User != args.Target;
//var forceDrink = args.Args.Target.Value != args.Args.User;
args.Handled = true;
if (transferAmount <= 0)
return;
if (!_bodySystem.TryGetBodyOrganComponents<StomachComponent>(args.Args.Target.Value, out var stomachs, body))
{
@@ -316,12 +318,10 @@ namespace Content.Server.Nutrition.EntitySystems
if (HasComp<RefillableSolutionComponent>(args.Args.Target.Value))
{
_puddleSystem.TrySpillAt(args.Args.User, drained, out _);
args.Handled = true;
return;
}
_solutionContainerSystem.Refill(args.Args.Target.Value, solution, drained);
args.Handled = true;
return;
}
@@ -340,7 +340,6 @@ namespace Content.Server.Nutrition.EntitySystems
else
_solutionContainerSystem.TryAddSolution(uid, solution, drained);
args.Handled = true;
return;
}
@@ -377,11 +376,13 @@ namespace Content.Server.Nutrition.EntitySystems
_reaction.DoEntityReaction(args.Args.Target.Value, solution, ReactionMethod.Ingestion);
//TODO: Grab the stomach UIDs somehow without using Owner
_stomachSystem.TryTransferSolution(firstStomach.Value.Comp.Owner, drained, firstStomach.Value.Comp);
args.Handled = true;
var comp = EnsureComp<ForensicsComponent>(uid);
if (TryComp<DnaComponent>(args.Args.Target, out var dna))
comp.DNAs.Add(dna.DNA);
if (!forceDrink && solution.Volume > 0)
args.Repeat = true;
}
private void AddDrinkVerb(EntityUid uid, DrinkComponent component, GetVerbsEvent<AlternativeVerb> ev)