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
..
UI	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-23 21:07:25 +03:00
VendingMachineBoundUserInterface.cs	Open some windows non-centered to avoid covering the player (#24767)	2024-02-01 23:49:48 +11:00
VendingMachineSystem.cs	more component ref removal + combining server/client comps (#13178)	2022-12-25 05:28:21 +01:00