rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge Stable into Master (#40263)

Browse source
This commit is contained in:
Errant 2025-09-10 20:10:49 +02:00 • committed by GitHub
commit 1666e302c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs
View file

@ -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;

3
Content.Shared/Preferences/HumanoidCharacterProfile.cs
View file

@ -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);
}