]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix verb sub (#30667)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Mon, 5 Aug 2024 09:24:56 +0000 (19:24 +1000)
committerGitHub <noreply@github.com>
Mon, 5 Aug 2024 09:24:56 +0000 (19:24 +1000)
* Fix verb sub

Mapping casualty, verbs are weird.

* also this

Content.Client/Verbs/UI/VerbMenuUIController.cs
Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs

index ad120da80b4532944f91a78d28e173081b28bf7b..efacf877adee395392bb3863003dd720e6f4a145 100644 (file)
@@ -47,6 +47,7 @@ namespace Content.Client.Verbs.UI
         {
             _context.OnContextKeyEvent += OnKeyBindDown;
             _context.OnContextClosed += Close;
+            _verbSystem.OnVerbsResponse += HandleVerbsResponse;
         }
 
         public void OnStateExited(GameplayState state)
index 72baa2c91d99bc22406bdcc9753c0af009696b68..5a252fc105a5a654c41bfc29e404df92d57aba92 100644 (file)
@@ -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<PaperComponent>(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;