From 81738b65bea9347c7e06c3afe5f971af9089fd97 Mon Sep 17 00:00:00 2001
From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Thu, 19 Sep 2024 18:12:26 +0200
Subject: [PATCH] minor layout changes

---
 Content.Server/GameTicking/Rules/TraitorRuleSystem.cs |  6 +-----
 Content.Server/Traitor/Uplink/UplinkSystem.cs         | 10 +++-------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index dc3fa56179f956..80d6147dc7226d 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -81,11 +81,7 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
         var briefing = "";
 
         if (component.GiveCodewords)
-        {
-            briefing = string.Format("{0}{1}",
-                briefing,
-                Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", component.Codewords))));
-        }
+            briefing = Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", component.Codewords)));
 
         var issuer = _random.Pick(_prototypeManager.Index(component.ObjectiveIssuers).Values);
 
diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
index 47c9a20f2aeeb6..6dcb45c7d60bed 100644
--- a/Content.Server/Traitor/Uplink/UplinkSystem.cs
+++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -44,14 +44,10 @@ public bool AddUplink(
     {
         // Try to find target item if none passed
 
-        //uplinkEntity ??= FindUplinkTarget(user); //TODO:ERRANT see if I can use this?
+        uplinkEntity ??= FindUplinkTarget(user);
 
         if (uplinkEntity == null)
-        {
-            uplinkEntity = FindUplinkTarget(user);
-            if (uplinkEntity == null)
-                return ImplantUplink(user, balance, giveDiscounts); //TODO:ERRANT clean this up
-        }
+            return ImplantUplink(user, balance, giveDiscounts);
 
         EnsureComp<UplinkComponent>(uplinkEntity.Value);
 
@@ -76,7 +72,7 @@ private void SetUplink(EntityUid user, EntityUid uplink, FixedPoint2 balance, bo
             uplink,
             store);
 
-        var uplinkInitializedEvent = new StoreInitializedEvent( //TODO:ERRANT fix this thing
+        var uplinkInitializedEvent = new StoreInitializedEvent(
             TargetUser: user,
             Store: uplink,
             UseDiscounts: giveDiscounts,