Skip to content

Commit 314d266

Browse files
committed
Merge branch 'Flotilla-Station-Publish' of https://github.com/Dennisz125/space-station-14-starlight into Flotilla-Station-Publish
2 parents 6ca78d1 + 4dee00d commit 314d266

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void Initialize()
6060

6161
// NullLink start
6262
_net.RegisterNetMessage<MsgUpdatePlayerPlayTime>(Update);
63-
_achievements.AchievementsUpdated += OnAchievementsUpdated;
63+
_achievements.AchievementUnlocked += OnAchievementsUnlocked;
6464
_cfg.OnValueChanged(NullLinkCCVars.Project, OnProjectChanged, true);
6565
_cfg.OnValueChanged(NullLinkCCVars.Server, OnServerChanged, true);
6666
// NullLink end
@@ -121,7 +121,7 @@ private void MergePlayTime()
121121
Updated?.Invoke();
122122
}
123123

124-
private void OnAchievementsUpdated()
124+
private void OnAchievementsUnlocked(string achievement)
125125
=> Updated?.Invoke();
126126
// Nulllink end
127127

Resources/Changelog/ChangelogStarlight.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
Entries:
2-
- author: OMEGA
3-
changes:
4-
- message: The EngiDrobe and AtmosDrobe now stock a utility belt and a gas mask.
5-
type: Add
6-
id: 407654
7-
time: '2026-08-16T15:53:55.000000+00:00'
8-
url: https://github.com/ss14Starlight/space-station-14/pull/5638
92
- author: OMEGA
103
changes:
114
- message: The Chief Engineer's access configurator now starts in their toolbelt instead of their locker.
@@ -2799,4 +2792,11 @@ Entries:
27992792
id: 408053
28002793
time: '2026-09-02T18:18:42.000000+00:00'
28012794
url: https://github.com/ss14Starlight/space-station-14/pull/5934
2795+
- author: Arkanic
2796+
changes:
2797+
- message: Ethanol lag bugfix (hopefully) (likely) (for real this time).
2798+
type: Fix
2799+
id: 408054
2800+
time: '2026-09-02T22:50:05.000000+00:00'
2801+
url: https://github.com/ss14Starlight/space-station-14/pull/5950
28022802
Order: -1

0 commit comments

Comments
 (0)