Morb0 d97a09543d Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Client/IoC/ClientContentIoC.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/RoleLoadout.cs # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json		2024-05-15 18:53:52 +03:00
..
Jukebox	Resolve all non-obsoleting warnings in content (#27934)	2024-05-11 20:13:58 -07:00
AmbientOverlayCommand.cs	Prune most yml ambientsound entries (#8573)	2022-06-03 03:42:35 -07:00
AmbientSoundOverlay.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
AmbientSoundSystem.cs	Update audioparams (#26387)	2024-03-29 16:55:05 +11:00
AmbientSoundTreeComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
AmbientSoundTreeSystem.cs	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00
AudioUIController.cs	Add UI click sounds (#22410)	2023-12-29 15:43:36 +11:00
ClientGlobalSoundSystem.cs	Random spontaneous cleanup PR (#25131)	2024-02-13 16:48:39 -05:00
ContentAudioSystem.AmbientMusic.cs	Random spontaneous cleanup PR (#25131)	2024-02-13 16:48:39 -05:00
ContentAudioSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-11 08:37:54 +03:00
ContentAudioSystem.LobbyMusic.cs	Update audioparams (#26387)	2024-03-29 16:55:05 +11:00