From 91b97dbd6bdbdb4f84f3007b6e5f7a7aa7451c0d Mon Sep 17 00:00:00 2001
From: ThereDrD <88589686+ThereDrD0@users.noreply.github.com>
Date: Wed, 28 Jan 2026 08:25:15 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D1=84=D0=B8=D0=BA=D1=81=20=D1=83=D1=82=D0=B5?=
 =?UTF-8?q?=D1=87=D0=BA=D0=B8=20=D0=BF=D0=B0=D0=BC=D1=8F=D1=82=D0=B8=20?=
 =?UTF-8?q?=D0=B2=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B0=D0=BF=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=BA=D0=B0=20=D1=81=20=D0=BC=D1=83=D0=B7=D1=8B=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B9=20(#3804)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_Sunrise/TapePlayer/TapePlayerBoundUserInterface.cs       | 4 ++--
 Content.Client/_Sunrise/TapePlayer/TapePlayerSystem.cs        | 3 +++
 Content.Shared/_Sunrise/TapePlayer/MusicTapeComponent.cs      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Content.Client/_Sunrise/TapePlayer/TapePlayerBoundUserInterface.cs b/Content.Client/_Sunrise/TapePlayer/TapePlayerBoundUserInterface.cs
index a0aec15c7a..2cc6d9fd95 100644
--- a/Content.Client/_Sunrise/TapePlayer/TapePlayerBoundUserInterface.cs
+++ b/Content.Client/_Sunrise/TapePlayer/TapePlayerBoundUserInterface.cs
@@ -61,7 +61,7 @@ public sealed class TapePlayerBoundUserInterface : BoundUserInterface
         if (_entityManager.TryGetComponent<MusicTapeComponent>(tapePlayer.InsertedTape, out var musicTapeComponent))
         {
             var audio = EntMan.System<AudioSystem>();
-            var length = audio.GetAudioLength(audio.GetSound(musicTapeComponent.Sound));
+            var length = audio.GetAudioLength(audio.ResolveSound(musicTapeComponent.Sound));
             _menu.SetSelectedSong(musicTapeComponent.SongName, (float) length.TotalSeconds);
         }
         else
@@ -104,7 +104,7 @@ public sealed class TapePlayerBoundUserInterface : BoundUserInterface
             return;
 
         _menu.OnClose -= Close;
-        _menu.Dispose();
+        _menu.Orphan();
         _menu = null;
     }
 }
diff --git a/Content.Client/_Sunrise/TapePlayer/TapePlayerSystem.cs b/Content.Client/_Sunrise/TapePlayer/TapePlayerSystem.cs
index 9454b70b88..9d93424bd7 100644
--- a/Content.Client/_Sunrise/TapePlayer/TapePlayerSystem.cs
+++ b/Content.Client/_Sunrise/TapePlayer/TapePlayerSystem.cs
@@ -46,6 +46,9 @@ namespace Content.Client._Sunrise.TapePlayer
 
         private void OnTapePlayerAfterState(Entity<TapePlayerComponent> ent, ref AfterAutoHandleStateEvent args)
         {
+            if (IsClientSide(ent))
+                return;
+
             if (!_uiSystem.TryGetOpenUi<TapePlayerBoundUserInterface>(ent.Owner, TapePlayerUiKey.Key, out var bui))
                 return;
 
diff --git a/Content.Shared/_Sunrise/TapePlayer/MusicTapeComponent.cs b/Content.Shared/_Sunrise/TapePlayer/MusicTapeComponent.cs
index acbe1f5c7c..159b19176d 100644
--- a/Content.Shared/_Sunrise/TapePlayer/MusicTapeComponent.cs
+++ b/Content.Shared/_Sunrise/TapePlayer/MusicTapeComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared._Sunrise.TapePlayer
     [RegisterComponent, NetworkedComponent]
     public sealed partial class MusicTapeComponent : Component
     {
-        [DataField(customTypeSerializer: typeof(SoundSpecifierTypeSerializer), required: true)]
+        [DataField(required: true)]
         public SoundSpecifier Sound;
 
         [DataField]