juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-conflict-40263

Browse Source
This commit is contained in:
Errant
2025-09-10 19:52:34 +02:00
committed by GitHub
parent fc36a7a7c8 b86094eb45
commit 90662bc6ee
1274 changed files with 36202 additions and 13752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs
View File

@@ -45,7 +45,7 @@ public sealed class FoodSequenceSystem : SharedFoodSequenceSystem
if (!TryComp<FoodSequenceStartPointComponent>(args.Start, out var start))
return;
if (!_proto.TryIndex(args.Proto, out var elementProto))
if (!_proto.Resolve(args.Proto, out var elementProto))
return;
if (!ent.Comp.OnlyFinal || elementProto.Final || start.FoodLayers.Count == start.MaxLayers)
@@ -118,7 +118,7 @@ public sealed class FoodSequenceSystem : SharedFoodSequenceSystem
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.
@@ -185,7 +185,7 @@ public sealed class FoodSequenceSystem : SharedFoodSequenceSystem
var nameCounter = 1;
foreach (var proto in existedContentNames)
{
if (!_proto.TryIndex(proto, out var protoIndexed))
if (!_proto.Resolve(proto, out var protoIndexed))
continue;
if (protoIndexed.Name is null)