diff --git a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs index ee0138ae94..6e2f6546fb 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs @@ -7,6 +7,7 @@ using Content.Shared.Mobs.Systems; using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.EntitySystems; using Content.Shared.Popups; +using Content.Shared.Tag; using Robust.Shared.Random; namespace Content.Server.Nutrition.EntitySystems; @@ -17,6 +18,7 @@ public sealed class FoodSequenceSystem : SharedFoodSequenceSystem [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private readonly TagSystem _tag = default!; [Dependency] private readonly IRobustRandom _random = default!; public override void Initialize() @@ -79,6 +81,7 @@ public sealed class FoodSequenceSystem : SharedFoodSequenceSystem MergeFoodSolutions(start, element); MergeFlavorProfiles(start, element); MergeTrash(start, element); + MergeTags(start, element); QueueDel(element); return true; } @@ -158,4 +161,14 @@ public sealed class FoodSequenceSystem : SharedFoodSequenceSystem startFood.Trash.Add(trash); } } + + private void MergeTags(Entity start, Entity element) + { + if (!TryComp(element, out var elementTags)) + return; + + EnsureComp(start.Owner); + + _tag.TryAddTags(start.Owner, elementTags.Tags); + } }