Vigers Ray 6020a6fd5b Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs # Content.Server/Weapons/Ranged/Systems/GunSystem.cs # Content.Server/Zombies/ZombieSystem.cs # Content.Shared/Inventory/InventorySystem.Relay.cs # Content.Shared/Zombies/SharedZombieSystem.cs # Content.Shared/Zombies/ZombieComponent.cs # Resources/Locale/en-US/_strings/research/technologies.ftl # Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml # Resources/Prototypes/Polymorphs/polymorph.yml # Resources/Prototypes/Recipes/Lathes/security.yml # Resources/Prototypes/Research/arsenal.yml # Resources/Prototypes/Research/experimental.yml		2025-04-17 00:07:59 +03:00
..
Tabs	Merge remote-tracking branch 'space-wizards/master'	2025-04-17 00:07:59 +03:00
EscapeMenu.xaml	Провиль и привязка через лобби.	2024-10-11 23:44:48 +03:00
EscapeMenu.xaml.cs	Merge more UI refactor stuff (#11277)	2022-09-14 14:34:48 -07:00
OptionDropDown.xaml	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00
OptionDropDown.xaml.cs	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00
OptionSlider.xaml	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00
OptionSlider.xaml.cs	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00
OptionsMenu.xaml	Merge remote-tracking branch 'space-wizards/master'	2025-03-25 11:30:01 +03:00
OptionsMenu.xaml.cs	Merge remote-tracking branch 'space-wizards/master'	2025-03-25 11:30:01 +03:00
OptionsTabControlRow.xaml	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00
OptionsTabControlRow.xaml.cs	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00