Merge branch 'master' into fix-conflict-40263

diff --cc Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs
index 0fa85666a027be2534737fa159a66581a194fd4a,697845b231fc92c42120071dedc4fae32378d6e3..0e872784663126dd4748c4973492c10a26e790d5
--- 1/Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs
--- 2/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.

diff --cc Content.Shared/Preferences/HumanoidCharacterProfile.cs
Simple merge