Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into ee_lighting_fix

Author: spess-empyrean

Content.Server/Abilities/Psionics/Abilities/AssayPowerSystem.cs

@@ -40,16 +40,19 @@ private void OnPowerUsed(EntityUid uid, PsionicComponent psionic, AssayPowerActi
             return;
 
         var ev = new AssayDoAfterEvent(_gameTiming.CurTime, args.FontSize, args.FontColor);
-        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.Performer, args.UseDelay - TimeSpan.FromSeconds(psionic.CurrentAmplification), ev, args.Performer, args.Target, args.Performer)
+        var doAfterArgs = new DoAfterArgs(EntityManager, args.Performer, args.UseDelay - TimeSpan.FromSeconds(psionic.CurrentAmplification), ev, args.Performer, args.Target, args.Performer)
         {
             BlockDuplicate = true,
             BreakOnMove = true,
             BreakOnDamage = true,
-        }, out var doAfterId);
+        };
+
+        if (!_doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId))
+            return;
+
         psionic.DoAfter = doAfterId;
 
         _popups.PopupEntity(Loc.GetString(args.PopupTarget, ("entity", args.Target)), args.Performer, PopupType.Medium);
-
         _audioSystem.PlayPvs(args.SoundUse, args.Performer, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f));
         _psionics.LogPowerUsed(args.Performer, args.PowerName, args.MinGlimmer, args.MaxGlimmer);
         args.Handled = true;

README.md

@@ -41,7 +41,7 @@ We provide some scripts shown below to make the job easier.
 ### Build dependencies
 
 > - Git
-> - .NET SDK 8.0.100
+> - .NET SDK 9.0.101
 
 
 ### Windows

Resources/Changelog/Changelog.yml

@@ -9895,3 +9895,12 @@ Entries:
   id: 6692
   time: '2025-01-15T00:55:06.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1537
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: >-
+        Fixed a bug where failing to cast the Assay power meant one lost the
+        ability to ever use psionic powers again.
+  id: 6693
+  time: '2025-01-15T05:19:36.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1551