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 verb sub #30667

Merged
merged 2 commits into from
Aug 5, 2024
Merged

Fix verb sub #30667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdd6081
Fix verb sub
metalgearsloth Aug 5, 2024
b9daa2b
also this
metalgearsloth Aug 5, 2024
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
1 change: 1 addition & 0 deletions Content.Client/Verbs/UI/VerbMenuUIController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public void OnStateEntered(GameplayState state)
{
_context.OnContextKeyEvent += OnKeyBindDown;
_context.OnContextClosed += Close;
_verbSystem.OnVerbsResponse += HandleVerbsResponse;
}

public void OnStateExited(GameplayState state)
Expand Down
7 changes: 4 additions & 3 deletions Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Robust.Shared.Random;
using Robust.Shared.Utility;
using System.Linq;
using Content.Shared.Paper;

namespace Content.Server.Traitor.Systems;

Expand All @@ -33,11 +34,11 @@ private void SetupPaper(EntityUid uid, TraitorCodePaperComponent? component = nu
if (!Resolve(uid, ref component))
return;

if (HasComp<PaperComponent>(uid))
if (TryComp(uid, out PaperComponent? paperComp))
{
if (TryGetTraitorCode(out var paperContent, component))
{
_paper.SetContent(uid, paperContent);
_paper.SetContent((uid, paperComp), paperContent);
}
}
}
Expand Down Expand Up @@ -83,7 +84,7 @@ private bool TryGetTraitorCode([NotNullWhen(true)] out string? traitorCode, Trai

if (!codesMessage.IsEmpty)
{
if (i == 1)
if (i == 1)
traitorCode = Loc.GetString("traitor-codes-message-singular") + codesMessage;
else
traitorCode = Loc.GetString("traitor-codes-message-plural") + codesMessage;
Expand Down
Loading