tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

4
Content.Shared/Preferences/HumanoidCharacterProfile.cs
View File

@@ -399,7 +399,7 @@ namespace Content.Shared.Preferences
// Category not found so dump it.
TraitCategoryPrototype? traitCategory = null;
if (category != null && !protoManager.TryIndex(category, out traitCategory))
if (category != null && !protoManager.Resolve(category, out traitCategory))
return new(this);
var list = new HashSet<ProtoId<TraitPrototype>>(_traitPreferences) { traitId };
@@ -665,7 +665,7 @@ namespace Content.Shared.Preferences
}
// No category so dump it.
if (!protoManager.TryIndex(traitProto.Category, out var category))
if (!protoManager.Resolve(traitProto.Category, out var category))
continue;
var existing = groups.GetOrNew(category.ID);