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
..
Commands	Chill bounties + fixes (#23411)	2024-01-03 17:34:47 -07:00
Components	Night on Europa (#27731)	2024-05-06 20:02:22 -07:00
Events	Fix emergency shuttle initialization	2024-04-19 18:57:12 -04:00
Systems	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-15 18:53:52 +03:00
StationConfig.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00