diff --git a/Content.Client/Verbs/UI/VerbMenuUIController.cs b/Content.Client/Verbs/UI/VerbMenuUIController.cs index ad120da80b..efacf877ad 100644 --- a/Content.Client/Verbs/UI/VerbMenuUIController.cs +++ b/Content.Client/Verbs/UI/VerbMenuUIController.cs @@ -47,6 +47,7 @@ namespace Content.Client.Verbs.UI { _context.OnContextKeyEvent += OnKeyBindDown; _context.OnContextClosed += Close; + _verbSystem.OnVerbsResponse += HandleVerbsResponse; } public void OnStateExited(GameplayState state) diff --git a/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs index 72baa2c91d..5a252fc105 100644 --- a/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs +++ b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs @@ -7,6 +7,7 @@ using Content.Server.Traitor.Components; using Robust.Shared.Random; using Robust.Shared.Utility; using System.Linq; +using Content.Shared.Paper; namespace Content.Server.Traitor.Systems; @@ -33,11 +34,11 @@ public sealed class TraitorCodePaperSystem : EntitySystem if (!Resolve(uid, ref component)) return; - if (HasComp(uid)) + if (TryComp(uid, out PaperComponent? paperComp)) { if (TryGetTraitorCode(out var paperContent, component)) { - _paper.SetContent(uid, paperContent); + _paper.SetContent((uid, paperComp), paperContent); } } } @@ -83,7 +84,7 @@ public sealed class TraitorCodePaperSystem : EntitySystem 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;