VigersRay 8fedc6f64a Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/CODEOWNERS # Content.Client/Options/UI/Tabs/AudioTab.xaml # Content.Client/Options/UI/Tabs/AudioTab.xaml.cs # Content.Shared/Preferences/Loadouts/RoleLoadout.cs # Resources/Prototypes/Entities/Mobs/NPCs/animals.yml # Resources/Prototypes/Entities/Mobs/NPCs/pets.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Loadouts/role_loadouts.yml # Resources/Prototypes/SoundCollections/NukeMusic.yml # Resources/Prototypes/lobbyscreens.yml # Resources/migration.yml		2024-06-23 21:07:25 +03:00
..
VendingMachineMenu.xaml	Vending UI facelift (#25377)	2024-02-19 15:18:26 -07:00
VendingMachineMenu.xaml.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-23 21:07:25 +03:00