]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix lizards being unable to eat custom burgers (#31005)
authorthemias <89101928+themias@users.noreply.github.com>
Wed, 14 Aug 2024 19:47:03 +0000 (15:47 -0400)
committerGitHub <noreply@github.com>
Wed, 14 Aug 2024 19:47:03 +0000 (13:47 -0600)
* Fix lizards being unable to eat custom burgers

* ensure tag comp

Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs

index ee0138ae94bd1938015c4ed88301c885e9263a3f..6e2f6546fb521fc76459f96f8755bf8ce8ea0aff 100644 (file)
@@ -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<FoodSequenceStartPointComponent> start, Entity<FoodSequenceElementComponent> element)
+    {
+        if (!TryComp<TagComponent>(element, out var elementTags))
+            return;
+
+        EnsureComp<TagComponent>(start.Owner);
+
+        _tag.TryAddTags(start.Owner, elementTags.Tags);
+    }
 }