From df1f8dd52a9ad6f7e03bd57bb2202abb3d1730c1 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sun, 23 Apr 2023 17:35:57 +1200 Subject: [PATCH] Allow eating and drinking to be cancelled. (#15434) --- Content.Server/Nutrition/EntitySystems/DrinkSystem.cs | 1 - Content.Server/Nutrition/EntitySystems/FoodSystem.cs | 2 -- 2 files changed, 3 deletions(-) diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index 41212e536b..71fb0a2fcf 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -282,7 +282,6 @@ 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 a78aa77124..5f107180ee 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -146,8 +146,6 @@ 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, - //Works better with cancel duplicate on because you can just use again to stop - CancelDuplicate = false, }; _doAfterSystem.TryStartDoAfter(doAfterArgs);