Reverting language (commits 6459be6, b9e5f42)

mqole · Oct 30, 2024 · 8f61a36 · 8f61a36
1 parent 9a73738
commit 8f61a36
Show file tree

Hide file tree

Showing 126 changed files with 210 additions and 3,982 deletions.
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
@@ -68,7 +68,6 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.MovePulledObject);
             human.AddFunction(ContentKeyFunctions.ReleasePulledObject);
             human.AddFunction(ContentKeyFunctions.OpenCraftingMenu);
-            human.AddFunction(ContentKeyFunctions.OpenLanguageMenu);
             human.AddFunction(ContentKeyFunctions.OpenInventoryMenu);
             human.AddFunction(ContentKeyFunctions.SmartEquipBackpack);
             human.AddFunction(ContentKeyFunctions.SmartEquipBelt);

diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -214,7 +214,6 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.CycleChatChannelBackward);
             AddButton(ContentKeyFunctions.OpenCharacterMenu);
             AddButton(ContentKeyFunctions.OpenCraftingMenu);
-            AddButton(ContentKeyFunctions.OpenLanguageMenu);
             AddButton(ContentKeyFunctions.OpenGuidebook);
             AddButton(ContentKeyFunctions.OpenInventoryMenu);
             AddButton(ContentKeyFunctions.OpenAHelp);

diff --git a/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs b/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs
@@ -10,7 +10,6 @@
 using Content.Client.UserInterface.Systems.MenuBar.Widgets;
 using Content.Client.UserInterface.Systems.Sandbox;
 using Robust.Client.UserInterface.Controllers;
-using Content.Client._EinsteinEngine.UserInterface.Systems.Language;
 
 namespace Content.Client.UserInterface.Systems.MenuBar;
 
@@ -25,7 +24,6 @@ public sealed class GameTopMenuBarUIController : UIController
     [Dependency] private readonly SandboxUIController _sandbox = default!;
     [Dependency] private readonly GuidebookUIController _guidebook = default!;
     [Dependency] private readonly EmotesUIController _emotes = default!;
-    [Dependency] private readonly LanguageMenuUIController _language = default!;
 
     private GameTopMenuBar? GameTopMenuBar => UIManager.GetActiveUIWidgetOrNull<GameTopMenuBar>();
 
@@ -49,7 +47,6 @@ public void UnloadButtons()
         _action.UnloadButton();
         _sandbox.UnloadButton();
         _emotes.UnloadButton();
-        _language.UnloadButton();
     }
 
     public void LoadButtons()
@@ -63,6 +60,5 @@ public void LoadButtons()
         _action.LoadButton();
         _sandbox.LoadButton();
         _emotes.LoadButton();
-        _language.LoadButton();
     }
 }
diff --git a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
@@ -73,16 +73,6 @@
         HorizontalExpand="True"
         AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
         />
-    <ui:MenuButton
-        Name="LanguageButton"
-        Access="Internal"
-        Icon="{xe:Tex '/Textures/_EinsteinEngine/Interface/language.png'}"
-        BoundKey = "{x:Static is:ContentKeyFunctions.OpenLanguageMenu}"
-        ToolTip="Open the Language Menu"
-        MinSize="42 64"
-        HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
-    />
     <ui:MenuButton
         Name="AdminButton"
         Access="Internal"

diff --git a/Content.Client/_EinsteinEngine/Language/LanguageMenuWindow.xaml b/Content.Client/_EinsteinEngine/Language/LanguageMenuWindow.xaml
diff --git a/Content.Client/_EinsteinEngine/Language/LanguageMenuWindow.xaml.cs b/Content.Client/_EinsteinEngine/Language/LanguageMenuWindow.xaml.cs
diff --git a/Content.Client/_EinsteinEngine/Language/Systems/LanguageSystem.cs b/Content.Client/_EinsteinEngine/Language/Systems/LanguageSystem.cs
diff --git a/Content.Client/_EinsteinEngine/UserInterface/Systems/Language/LanguageMenuUIController.cs b/Content.Client/_EinsteinEngine/UserInterface/Systems/Language/LanguageMenuUIController.cs
diff --git a/Content.Server/Administration/Commands/DSay.cs b/Content.Server/Administration/Commands/DSay.cs
@@ -1,6 +1,5 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Administration;
-using Content.Shared.Chat;
 using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands
@@ -35,7 +34,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                 return;
 
             var chat = _e.System<ChatSystem>();
-            chat.TrySendInGameOOCMessage(entity, message, SharedChatSystem.InGameOOCChatType.Dead, false, shell, player);
+            chat.TrySendInGameOOCMessage(entity, message, InGameOOCChatType.Dead, false, shell, player);
         }
     }
 }