shadowling veil toggles unpoweredflashlight

Space-Stories · Oct 25, 2024 · 557f73a · 557f73a
1 parent 5f57a9c
commit 557f73a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Content.Server/Stories/Shadowling/ShadowlingSystem.Actions.cs b/Content.Server/Stories/Shadowling/ShadowlingSystem.Actions.cs
@@ -174,8 +174,10 @@ private void OnVeilEvent(EntityUid uid, ShadowlingComponent component, Shadowlin
         {
             if (HasComp<PoweredLightComponent>(ent))
                 _poweredLight.TryDestroyBulb(ent);
-            else if (TryComp<HandheldLightComponent>(ent, out var comp))
-                _handheldLight.TurnOff((ent, comp));
+            else if (TryComp<HandheldLightComponent>(ent, out var HandheldLight))
+                _handheldLight.TurnOff((ent, HandheldLight));
+            else if (TryComp<UnpoweredFlashlightComponent>(ent, out var UnpoweredFlashlight))
+                _unpoweredFlashlight.SetLight(ent, false, ent, true);
         }
 
         args.Handled = true;

diff --git a/Content.Server/Stories/Shadowling/ShadowlingSystem.cs b/Content.Server/Stories/Shadowling/ShadowlingSystem.cs
@@ -15,6 +15,7 @@
 using Content.Server.Stunnable;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
+using Content.Shared.Light.EntitySystems;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Stories.Shadowling;
 using Content.Shared.Weapons.Ranged.Events;
@@ -36,6 +37,7 @@ public sealed partial class ShadowlingSystem : EntitySystem
     [Dependency] private readonly SmokeSystem _smoke = default!;
     [Dependency] private readonly StandingStateSystem _standing = default!;
     [Dependency] private readonly HandheldLightSystem _handheldLight = default!;
+    [Dependency] private readonly UnpoweredFlashlightSystem _unpoweredFlashlight = default!;
     [Dependency] private readonly DoAfterSystem _doAfter = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly RoundEndSystem _roundEnd = default!;