From 3630efecad2433c33c8e21050cd8730cf7d8156d Mon Sep 17 00:00:00 2001
From: Surani1 <suranionfleek@gmail.com>
Date: Mon, 7 Oct 2024 19:13:32 +0500
Subject: [PATCH] fix conversations

---
 Content.Client/Audio/Jukebox/JukeboxMenu.xaml |  6 ++--
 .../Locale/en-US/jukebox/jukebox-menu.ftl     |  1 -
 .../en-US/ss220/jukebox/jukebox-menu.ftl      |  1 +
 .../Locale/ru-RU/jukebox/jukebox-menu.ftl     |  1 -
 .../ru-RU/ss220/jukebox/jukebox-menu.ftl      |  1 +
 .../Objects/Fun/Instruments/boombox.yml       | 31 -------------------
 6 files changed, 6 insertions(+), 35 deletions(-)
 create mode 100644 Resources/Locale/en-US/ss220/jukebox/jukebox-menu.ftl
 create mode 100644 Resources/Locale/ru-RU/ss220/jukebox/jukebox-menu.ftl
 delete mode 100644 Resources/Prototypes/SS220/Entities/Objects/Fun/Instruments/boombox.yml

diff --git a/Content.Client/Audio/Jukebox/JukeboxMenu.xaml b/Content.Client/Audio/Jukebox/JukeboxMenu.xaml
index 02766f3915a865..af5f14c6f75c63 100644
--- a/Content.Client/Audio/Jukebox/JukeboxMenu.xaml
+++ b/Content.Client/Audio/Jukebox/JukeboxMenu.xaml
@@ -3,10 +3,12 @@
     <BoxContainer Margin="4 0" Orientation="Vertical">
         <ItemList Name="MusicList" SelectMode="Button" Margin="3 3 3 3"
         HorizontalExpand="True" VerticalExpand="True" SizeFlagsStretchRatio="8"/>
+        <!-- SS220-jukebox-tweak-begin -->
         <BoxContainer Orientation="Vertical">
-        <Label Name="Volume" Text="{Loc 'jukebox-menu-slidervolume'}" />
-        <Slider Name="VolumeSlider" HorizontalExpand="True" />
+            <Label Name="Volume" Text="{Loc 'jukebox-menu-slidervolume'}" />
+            <Slider Name="VolumeSlider" HorizontalExpand="True" />
         </BoxContainer>
+        <!-- SS220-jukebox-tweak-end -->
         <BoxContainer Orientation="Vertical">
             <Label Name="SongSelected" Text="{Loc 'jukebox-menu-selectedsong'}" />
             <Label Name="SongName" Text="---" />
diff --git a/Resources/Locale/en-US/jukebox/jukebox-menu.ftl b/Resources/Locale/en-US/jukebox/jukebox-menu.ftl
index f4923a774f501a..d015976cc4bdae 100644
--- a/Resources/Locale/en-US/jukebox/jukebox-menu.ftl
+++ b/Resources/Locale/en-US/jukebox/jukebox-menu.ftl
@@ -1,6 +1,5 @@
 jukebox-menu-title = Jukebox
 jukebox-menu-selectedsong = Selected Song:
-jukebox-menu-slidervolume = Volume:
 jukebox-menu-buttonplay = Play
 jukebox-menu-buttonpause = Pause
 jukebox-menu-buttonstop = Stop
diff --git a/Resources/Locale/en-US/ss220/jukebox/jukebox-menu.ftl b/Resources/Locale/en-US/ss220/jukebox/jukebox-menu.ftl
new file mode 100644
index 00000000000000..add858c3e359c6
--- /dev/null
+++ b/Resources/Locale/en-US/ss220/jukebox/jukebox-menu.ftl
@@ -0,0 +1 @@
+jukebox-menu-slidervolume = Volume:
diff --git a/Resources/Locale/ru-RU/jukebox/jukebox-menu.ftl b/Resources/Locale/ru-RU/jukebox/jukebox-menu.ftl
index f609453a17d037..5fc1249e3fe65a 100644
--- a/Resources/Locale/ru-RU/jukebox/jukebox-menu.ftl
+++ b/Resources/Locale/ru-RU/jukebox/jukebox-menu.ftl
@@ -1,6 +1,5 @@
 jukebox-menu-title = Музыкальный автомат
 jukebox-menu-selectedsong = Выбранная песня:
-jukebox-menu-slidervolume = Громкость звука:
 jukebox-menu-buttonplay = Играть
 jukebox-menu-buttonpause = Пауза
 jukebox-menu-buttonstop = Стоп
diff --git a/Resources/Locale/ru-RU/ss220/jukebox/jukebox-menu.ftl b/Resources/Locale/ru-RU/ss220/jukebox/jukebox-menu.ftl
new file mode 100644
index 00000000000000..4a4d61ac355b8c
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss220/jukebox/jukebox-menu.ftl
@@ -0,0 +1 @@
+jukebox-menu-slidervolume = Громкость звука:
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Fun/Instruments/boombox.yml b/Resources/Prototypes/SS220/Entities/Objects/Fun/Instruments/boombox.yml
deleted file mode 100644
index cbfb55dce2f85a..00000000000000
--- a/Resources/Prototypes/SS220/Entities/Objects/Fun/Instruments/boombox.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-#На будущее
-#- type: entity
-#  parent: BaseHandheldInstrument
-#  id: Boombox
-#  name: boombox
-#  description: Anyway, here's Wonderwall.
-#  components:
-#  - type: Jukebox
-#    onState: on
-#    offState: off
-#    selectState: select
-#  - type: ActivatableUI
-#    key: enum.JukeboxUiKey.Key
-#  - type: UserInterface
-#    interfaces:
-#        enum.JukeboxUiKey.Key:
-#          type: JukeboxBoundUserInterface
-#        enum.WiresUiKey.Key:
-#          type: WiresBoundUserInterface
-#  - type: Sprite
-#    sprite: Objects/Fun/Instruments/guitar.rsi
-#    state: icon
-#  - type: Item
-#    sprite: Objects/Fun/Instruments/guitar.rsi
-#    size: Normal
-#  - type: Clothing
-#    quickEquip: false
-#    slots:
-#    - back
-#    - suitStorage
-#    sprite: Objects/Fun/Instruments/guitar.rsi