From e1cd163344481655eeaaf1b52f334f439635c5a7 Mon Sep 17 00:00:00 2001 From: keronshb <54602815+keronshb@users.noreply.github.com> Date: Wed, 5 Apr 2023 22:47:20 -0400 Subject: [PATCH] Multiple uses on Food/Drink won't cancel the do-after anymore (#15163) * stops do-afters from cancelling if food/drink is used twice * Update DrinkSystem.cs --- Content.Server/Nutrition/EntitySystems/DrinkSystem.cs | 1 + Content.Server/Nutrition/EntitySystems/FoodSystem.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index 21ab837b48..64efdc89fe 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -281,6 +281,7 @@ namespace Content.Server.Nutrition.EntitySystems // Mice and the like can eat without hands. // TODO maybe set this based on some CanEatWithoutHands event or component? NeedHand = forceDrink, + CancelDuplicate = false, }; _doAfterSystem.TryStartDoAfter(doAfterEventArgs); diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index 30cd1c8ba6..d0e89ea9f0 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -146,6 +146,7 @@ namespace Content.Server.Nutrition.EntitySystems // Mice and the like can eat without hands. // TODO maybe set this based on some CanEatWithoutHands event or component? NeedHand = forceFeed, + CancelDuplicate = false, }; _doAfterSystem.TryStartDoAfter(doAfterEventArgs); -- 2.51.2