From 6f6f5cbdab74f7679bf2aac656501f960e1334d3 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Tue, 8 Aug 2023 01:16:49 +0100
Subject: [PATCH] remove sharps from uplink code (#18807)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Content.Server/PDA/Ringer/RingerSystem.cs | 34 +++++------------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/Content.Server/PDA/Ringer/RingerSystem.cs b/Content.Server/PDA/Ringer/RingerSystem.cs
index eba052f9e1..b132fa761f 100644
--- a/Content.Server/PDA/Ringer/RingerSystem.cs
+++ b/Content.Server/PDA/Ringer/RingerSystem.cs
@@ -122,30 +122,7 @@ namespace Content.Server.PDA.Ringer
 
         public void RandomizeUplinkCode(EntityUid uid, RingerUplinkComponent uplink, ComponentInit args)
         {
-            var notes = new[]
-            {
-                Note.A,
-                Note.Asharp,
-                Note.B,
-                Note.C,
-                Note.Csharp,
-                Note.D,
-                Note.Dsharp,
-                Note.E,
-                Note.F,
-                Note.Fsharp,
-                Note.G,
-                Note.Gsharp,
-            };
-
-            var ringtone = new Note[RingtoneLength];
-
-            for (var i = 0; i < RingtoneLength; i++)
-            {
-                ringtone[i] = _random.Pick(notes);
-            }
-
-            uplink.Code = ringtone;
+            uplink.Code = GenerateRingtone();
         }
 
         //Non Event Functions
@@ -153,15 +130,18 @@ namespace Content.Server.PDA.Ringer
         private Note[] GenerateRingtone()
         {
             // Default to using C pentatonic so it at least sounds not terrible.
-            var notes = new[]
+            return GenerateRingtone(new[]
             {
                 Note.C,
                 Note.D,
                 Note.E,
                 Note.G,
-                Note.A,
-            };
+                Note.A
+            });
+        }
 
+        private Note[] GenerateRingtone(Note[] notes)
+        {
             var ringtone = new Note[RingtoneLength];
 
             for (var i = 0; i < RingtoneLength; i++)