Vigers Ray fffada0d68 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Launcher/LauncherConnectingGui.xaml # Content.Client/Parallax/ParallaxControl.cs # Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs # Content.Server/Cargo/Components/StationBankAccountComponent.cs # Content.Server/Cargo/Systems/CargoSystem.Orders.cs # Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs # Content.Shared/Weapons/Reflect/ReflectSystem.cs # Resources/Locale/en-US/_strings/cargo/cargo-accounts.ftl		2025-04-13 17:18:35 +03:00
..
MainMenuControl.xaml	ParallaxControl UI Dehardcode (#36071)	2025-04-13 22:44:44 +10:00
MainMenuControl.xaml.cs	фикс OOC чата для админов	2025-04-06 01:59:18 +03:00