Merge Stable into Master (#40263)
This commit is contained in:
@@ -117,6 +117,7 @@ public sealed class FoodSequenceSystem : SharedFoodSequenceSystem
|
||||
//looking for a suitable FoodSequence prototype
|
||||
if (!element.Comp1.Entries.TryGetValue(start.Comp.Key, out var elementProto))
|
||||
return false;
|
||||
|
||||
if (!_proto.Resolve(elementProto, out var elementIndexed))
|
||||
return false;
|
||||
|
||||
|
||||
@@ -631,6 +631,9 @@ namespace Content.Shared.Preferences
|
||||
continue;
|
||||
}
|
||||
|
||||
// This happens after we verify the prototype exists
|
||||
// These values are set equal in the database and we need to make sure they're equal here too!
|
||||
loadouts.Role = roleName;
|
||||
loadouts.EnsureValid(this, session, collection);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user