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
..
Components	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-23 21:07:25 +03:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-23 21:07:25 +03:00
AccessGroupPrototype.cs	Add door electronics access configuration menu (#17778)	2024-04-01 17:06:13 +11:00
AccessLevelPrototype.cs	Add door electronics access configuration menu (#17778)	2024-04-01 17:06:13 +11:00
SharedAccessWire.cs	Wires refactor (#7699)	2022-05-06 12:35:06 +10:00
SharedAgentIDCardSystem.cs	Cleans up StatusIconSystem and fixing some bugs (#28270)	2024-06-03 12:12:21 -04:00