tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Multiple uses on Food/Drink won't cancel the do-after anymore (#15163)

Browse Source 
* stops do-afters from cancelling if food/drink is used twice

* Update DrinkSystem.cs
This commit is contained in:
keronshb
2023-04-05 22:47:20 -04:00
committed by GitHub
parent 4f23c0d122
commit e1cd163344
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,6 +281,7 @@ namespace Content.Server.Nutrition.EntitySystems
// Mice and the like can eat without hands. // Mice and the like can eat without hands.
// TODO maybe set this based on some CanEatWithoutHands event or component? // TODO maybe set this based on some CanEatWithoutHands event or component?
NeedHand = forceDrink, NeedHand = forceDrink,
CancelDuplicate = false,
}; };
_doAfterSystem.TryStartDoAfter(doAfterEventArgs); _doAfterSystem.TryStartDoAfter(doAfterEventArgs);

1
Content.Server/Nutrition/EntitySystems/FoodSystem.cs
View File

@@ -146,6 +146,7 @@ namespace Content.Server.Nutrition.EntitySystems
// Mice and the like can eat without hands. // Mice and the like can eat without hands.
// TODO maybe set this based on some CanEatWithoutHands event or component? // TODO maybe set this based on some CanEatWithoutHands event or component?
NeedHand = forceFeed, NeedHand = forceFeed,
CancelDuplicate = false,
}; };
_doAfterSystem.TryStartDoAfter(doAfterEventArgs); _doAfterSystem.TryStartDoAfter(doAfterEventArgs);