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
..
Components	Pathological Liar (#27618)	2024-05-04 04:11:46 -07:00
EntitySystems	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-15 18:53:52 +03:00
Muting	Moves muted to shared (#25374)	2024-02-21 15:53:46 -05:00
AccentSystem.cs	Add department-specific radio channels (#9061)	2022-06-23 20:11:03 +10:00
EmotesMenuSystem.cs	Emotes Menu (#26702)	2024-04-28 21:38:23 -07:00
ListenEvent.cs	IListener and IRadio purge (#11980)	2022-11-15 15:09:27 +11:00
SpeechNoiseSystem.cs	Lower speech noise volume & refactor system (#24579)	2024-01-28 21:49:55 +11:00