diff --git a/Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs b/Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs index 697845b231..0e87278466 100644 --- a/Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs @@ -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; diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index e3447fdf3a..098f65ef18 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -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); }