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

Dedupe lots of nutrition and fix usedelay (#6406)

Browse Source
This commit is contained in:
metalgearsloth
2022-02-07 00:37:38 +11:00
committed by GitHub
parent da1007b7f1
commit dc38a8a149
10 changed files with 207 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Nutrition/IngestionEvents.cs
View File

@@ -17,16 +17,16 @@ public sealed class IngestionAttemptEvent : CancellableEntityEventArgs
}
/// <summary>
/// Raised directed at the food after a successful force-feed do-after.
/// Raised directed at the food after a successful feed do-after.
/// </summary>
public sealed class ForceFeedEvent : EntityEventArgs
public sealed class FeedEvent : EntityEventArgs
{
public readonly EntityUid User;
public readonly FoodComponent Food;
public readonly Solution FoodSolution;
public readonly List<UtensilComponent> Utensils;
public ForceFeedEvent(EntityUid user, FoodComponent food, Solution foodSolution, List<UtensilComponent> utensils)
public FeedEvent(EntityUid user, FoodComponent food, Solution foodSolution, List<UtensilComponent> utensils)
{
User = user;
Food = food;
@@ -51,13 +51,13 @@ public sealed class ForceFeedCancelledEvent : EntityEventArgs
/// <summary>
/// Raised directed at the drink after a successful force-drink do-after.
/// </summary>
public sealed class ForceDrinkEvent : EntityEventArgs
public sealed class DrinkEvent : EntityEventArgs
{
public readonly EntityUid User;
public readonly DrinkComponent Drink;
public readonly Solution DrinkSolution;
public ForceDrinkEvent(EntityUid user, DrinkComponent drink, Solution drinkSolution)
public DrinkEvent(EntityUid user, DrinkComponent drink, Solution drinkSolution)
{
User = user;
Drink = drink;
@@ -68,11 +68,11 @@ public sealed class ForceDrinkEvent : EntityEventArgs
/// <summary>
/// Raised directed at the food after a failed force-dink do-after.
/// </summary>
public sealed class ForceDrinkCancelledEvent : EntityEventArgs
public sealed class DrinkCancelledEvent : EntityEventArgs
{
public readonly DrinkComponent Drink;
public ForceDrinkCancelledEvent(DrinkComponent drink)
public DrinkCancelledEvent(DrinkComponent drink)
{
Drink = drink;
}