Merge branch 'space-syndicate:master' into Listen-up

space-syndicate · Dec 9, 2024 · 4245a86 · 4245a86
2 parents d17b591 + e1a05f2
commit 4245a86
Show file tree

Hide file tree

Showing 72 changed files with 1,218 additions and 832 deletions.
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
@@ -16,9 +16,6 @@
             <cc:UICommandButton Command="callshuttle" Text="{Loc admin-player-actions-window-shuttle}" WindowType="{x:Type at:AdminShuttleWindow}"/>
             <cc:CommandButton Command="adminlogs" Text="{Loc admin-player-actions-window-admin-logs}"/>
             <cc:CommandButton Command="faxui" Text="{Loc admin-player-actions-window-admin-fax}"/>
-            <!-- Corvax-Next-AdminAudioPanel-Start -->
-            <cc:CommandButton Command="audiopanel" Text="{Loc admin-player-actions-window-audio-panel}"/>
-            <!-- Corvax-Next-AdminAudioPanel-End -->
         </GridContainer>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs b/Content.Client/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs
diff --git a/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml b/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml
diff --git a/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml.cs b/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml.cs