Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into plasmaman
Browse files Browse the repository at this point in the history
angelofallars committed Jan 13, 2025
2 parents 6d570d3 + 0d1bad0 commit 8df5f10
Showing 2 changed files with 12 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Content.Shared/Preferences/HumanoidCharacterProfile.cs
Original file line number Diff line number Diff line change
@@ -478,14 +478,17 @@ public void EnsureValid(ICommonSession session, IDependencyCollection collection

var antags = AntagPreferences
.Where(id => prototypeManager.TryIndex<AntagPrototype>(id, out var antag) && antag.SetPreference)
.Distinct()
.ToList();

var traits = TraitPreferences
.Where(prototypeManager.HasIndex<TraitPrototype>)
.Distinct()
.ToList();

var loadouts = LoadoutPreferences
.Where(l => prototypeManager.HasIndex<LoadoutPrototype>(l.LoadoutName))
.Distinct()
.ToList();

Name = name;
9 changes: 9 additions & 0 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
@@ -9811,3 +9811,12 @@ Entries:
id: 6686
time: '2025-01-13T16:24:56.0000000+00:00'
url: https://github.com/Simple-Station/Einstein-Engines/pull/1526
- author: VMSolidus
changes:
- type: Fix
message: >-
Attempted to fix a crash related to antag preferences saving multiple
times.
id: 6687
time: '2025-01-13T18:20:20.0000000+00:00'
url: https://github.com/Simple-Station/Einstein-Engines/pull/1523

0 comments on commit 8df5f10

Please sign in to comment.