From ba566ff216ed4f54d56168e58a21282994fbac2a Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Wed, 23 Mar 2022 16:08:44 +0100 Subject: [PATCH] Fix food eat message not having loc argument passed in. --- Content.Server/Nutrition/Components/FoodComponent.cs | 3 +++ Content.Server/Nutrition/EntitySystems/FoodSystem.cs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs index 15074786ae..d44ddfec88 100644 --- a/Content.Server/Nutrition/Components/FoodComponent.cs +++ b/Content.Server/Nutrition/Components/FoodComponent.cs @@ -43,6 +43,9 @@ namespace Content.Server.Nutrition.Components [DataField("utensilRequired")] public bool UtensilRequired = false; + /// + /// The localization identifier for the eat message. Needs a "food" entity argument passed to it. + /// [DataField("eatMessage")] public string EatMessage = "food-nom"; diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index 81b9edd13b..43440be1fd 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -298,7 +298,7 @@ namespace Content.Server.Nutrition.EntitySystems _logSystem.Add(LogType.ForceFeed, $"{ToPrettyString(user.Value):user} threw {ToPrettyString(uid):food} {SolutionContainerSystem.ToPrettyString(foodSolution):solution} into the mouth of {ToPrettyString(target):target}"); var filter = user == null ? Filter.Entities(target) : Filter.Entities(target, user.Value); - _popupSystem.PopupEntity(Loc.GetString(food.EatMessage), target, filter); + _popupSystem.PopupEntity(Loc.GetString(food.EatMessage, ("food", food.Owner)), target, filter); foodSolution.DoEntityReaction(uid, ReactionMethod.Ingestion); _stomachSystem.TryTransferSolution(((IComponent) firstStomach.Value.Comp).Owner, foodSolution, firstStomach.Value.Comp);