From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Wed, 10 Sep 2025 17:52:34 +0000 (+0200)
Subject: Merge branch 'master' into fix-conflict-40263
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=90662bc6eeaa543ae1eb4859665e075be16103fb;p=space-station-14.git

Merge branch 'master' into fix-conflict-40263
---

90662bc6eeaa543ae1eb4859665e075be16103fb
diff --cc Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs
index 0fa85666a0,697845b231..0e87278466
--- a/Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs
@@@ -117,8 -117,7 +117,8 @@@ public sealed class FoodSequenceSystem 
          //looking for a suitable FoodSequence prototype
          if (!element.Comp1.Entries.TryGetValue(start.Comp.Key, out var elementProto))
              return false;
 +
-         if (!_proto.TryIndex(elementProto, out var elementIndexed))
+         if (!_proto.Resolve(elementProto, out var elementIndexed))
              return false;
  
          //if we run out of space, we can still put in one last, final finishing element.