Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix borgs not being able to toggle flashlight #20448

Merged
merged 1 commit into from
Oct 4, 2023
Merged

fix borgs not being able to toggle flashlight #20448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Content.Server/Light/EntitySystems/HandheldLightSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,13 @@ private void OnGetState(EntityUid uid, HandheldLightComponent component, ref Com
private void OnMapInit(EntityUid uid, HandheldLightComponent component, MapInitEvent args)
{
_actionContainer.EnsureAction(uid, ref component.ToggleActionEntity, component.ToggleAction);
_actions.AddAction(uid, ref component.SelfToggleActionEntity, component.ToggleAction);
}

private void OnShutdown(EntityUid uid, HandheldLightComponent component, ComponentShutdown args)
{
_actions.RemoveAction(uid, component.ToggleActionEntity);
_actions.RemoveAction(uid, component.SelfToggleActionEntity);
}

private byte? GetLevel(EntityUid uid, HandheldLightComponent component)
Expand Down
3 changes: 3 additions & 0 deletions Content.Shared/Light/Components/HandheldLightComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ public sealed partial class HandheldLightComponent : Component
[DataField("toggleActionEntity")]
public EntityUid? ToggleActionEntity;

[DataField]
public EntityUid? SelfToggleActionEntity;

public const int StatusLevels = 6;

/// <summary>
Expand Down