Added some consistency to the comments. Removed some more vestigial RMC stuff.

Content.Client/Credits/CreditsWindow.xaml.cs

@@ -3,7 +3,6 @@ using System.Numerics;
 using System.Threading.Tasks;
 using Content.Client.Stylesheets;
 using Content.Shared.CCVar;
-using Content.Client._DV.AccountLinking; // DeltaV
 using Robust.Client.AutoGenerated;
 using Robust.Client.Credits;
 using Robust.Client.UserInterface;
@@ -31,7 +30,6 @@ public sealed partial class CreditsWindow : DefaultWindow
     [Dependency] private readonly ISerializationManager _serialization = default!;
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly ILocalizationManager _loc = default!;
-    [Dependency] private readonly LinkAccountManager _linkAccount = default!; // DeltaV - TODO: Discord Linking - why is this here?
 
     private static readonly Dictionary<string, int> PatronTierPriority = new()
     {

Content.Client/Info/LinkBanner.cs

@@ -51,7 +51,7 @@ namespace Content.Client.Info
             changelogButton.OnPressed += args => UserInterfaceManager.GetUIController<ChangelogUIController>().ToggleWindow();
             buttons.AddChild(changelogButton);
 
-            // Start DeltaV - Discord Linking / Patreon
+            // BEGIN DeltaV - Discord / Patreon Account Linking
             var linkAccount = UserInterfaceManager.GetUIController<LinkAccountUIController>();
             var linkAccountButton = new Button
             {

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

@@ -10,7 +10,6 @@ using Content.Client.Stylesheets;
 using Content.Client.Sprite;
 using Content.Client.UserInterface.Systems.Guidebook;
 using Content.Shared._DV.Species; // DeltaV - Species hider
-using Content.Shared._DV.AccountLinking; // DeltaV
 using Content.Shared.CCVar;
 using Content.Shared.Clothing;
 using Content.Shared.GameTicking;

Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml

@@ -13,11 +13,9 @@
 
             </BoxContainer>
             <controls:VSpacer/>
-            <BoxContainer Orientation="Horizontal" HorizontalAlignment="Center">
-                <Button Name="CharacterSetup" Text="{Loc 'lobby-character-preview-panel-character-setup-button'}"
-                        HorizontalAlignment="Center"
-                        Margin="0 5 0 0" />
-            </BoxContainer>
+            <Button Name="CharacterSetup" Text="{Loc 'lobby-character-preview-panel-character-setup-button'}"
+                    HorizontalAlignment="Center"
+                    Margin="0 5 0 0"/>
         </BoxContainer>
         <Label Name="Unloaded" Text="{Loc 'lobby-character-preview-panel-unloaded-preferences-label'}"/>
     </BoxContainer>

Content.Client/_DV/AccountLinking/LinkAccountUIController.cs

@@ -10,7 +10,7 @@ using Robust.Shared.Timing;
 
 namespace Content.Client._DV.AccountLinking;
 
-public sealed class LinkAccountUIController : UIController //, IOnSystemChanged<LinkAccountSystem>
+public sealed class LinkAccountUIController : UIController
 {
     [Dependency] private readonly IClipboardManager _clipboard = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;

Content.Server.Database/Model.cs

@@ -48,13 +48,14 @@ namespace Content.Server.Database
         public DbSet<IPIntelCache> IPIntelCache { get; set; } = null!;
         public DbSet<DVModel.SeenTip> DVSeenTips { get; set; } = null!; // DeltaV - Tips
 
-        // RMC14
+        // BEGIN DeltaV - Discord / Patreon Account Linking
         public DbSet<DiscordAccount> DiscordAccounts { get; set; } = default!;
         public DbSet<DiscordLinkedAccount> DiscordLinkedAccounts { get; set; } = default!;
         public DbSet<PatronTier> PatronTiers { get; set; } = default!;
         public DbSet<Patron> Patrons { get; set; } = default!;
         public DbSet<DiscordLinkingCodes> DiscordLinkingCodes { get; set; } = default!;
         public DbSet<DiscordLinkedAccountLogs> DiscordLinkedAccountLogs { get; set; } = default!;
+        // END DeltaV
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
@@ -403,7 +404,8 @@ namespace Content.Server.Database
                 .OwnsOne(p => p.HWId)
                 .Property(p => p.Type)
                 .HasDefaultValue(HwidType.Legacy);
-            // BEGIN DeltaV - Discord Account Linking 
+
+            // BEGIN DeltaV - Discord / Patreon Account Linking
             modelBuilder.Entity<DiscordLinkedAccount>()
                 .HasOne(l => l.Player)
                 .WithOne(p => p.LinkedAccount)
@@ -684,11 +686,12 @@ namespace Content.Server.Database
         public List<ServerRoleBan> AdminServerRoleBansLastEdited { get; set; } = null!;
         public List<RoleWhitelist> JobWhitelists { get; set; } = null!;
 
-        // RMC14
+        // BEGIN DeltaV - Discord / Patreon Account Linking
         public DiscordLinkedAccount? LinkedAccount { get; set; }
         public Patron? Patron { get; set; }
         public DiscordLinkingCodes? LinkingCodes { get; set; }
         public List<DiscordLinkedAccountLogs> LinkedAccountLogs { get; set; } = default!;
+        // END DeltaV
     }
 
     [Table("whitelist")]

Content.Server/Database/ServerDbBase.cs

@@ -1926,7 +1926,7 @@ INSERT INTO player_round (players_id, rounds_id) VALUES ({players[player]}, {id}
         }
         #endregion
 
-        // BEGIN DeltaV - Discord/Patreon Linking
+        // BEGIN DeltaV - Discord / Patreon Account Linking
         #region DeltaV - Account Linking
 
         public async Task<Guid?> GetLinkingCode(Guid player)

Content.Server/Database/ServerDbManager.cs

@@ -354,6 +354,7 @@ namespace Content.Server.Database
 
         #endregion
 
+        // BEGIN DeltaV - Discord / Patreon Account Linking
         #region DeltaV - Discord Linking
 
         Task<Guid?> GetLinkingCode(Guid player);
@@ -366,6 +367,7 @@ namespace Content.Server.Database
 
         Task<List<Patron>> GetAllPatrons();
         #endregion
+        // END DeltaV
 
         #region DB Notifications
 
@@ -1172,6 +1174,7 @@ namespace Content.Server.Database
             return RunDbCommand(() => _db.GetAllPatrons());
         }
         #endregion
+        // END DeltaV
 
 
         // Wrapper functions to run DB commands from the thread pool.