Morb0 4bf8b9eed6 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Shared/Preferences/Loadouts/RoleLoadout.cs # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml		2024-05-29 01:14:59 +03:00
..
Loadouts	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-29 01:14:59 +03:00
GameSettings.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
HumanoidCharacterProfile.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-23 13:06:49 +03:00
ICharacterProfile.cs	Fix upstream	2024-04-17 12:49:15 +03:00
JobPriority.cs
MsgDeleteCharacter.cs	Pass IRobustSerializer to NetMessage (#11021)	2022-09-14 17:25:25 +10:00
MsgPreferencesAndSettings.cs	Update NetMessage to pass in MemoryStream (#21796)	2023-11-28 19:11:16 +11:00
MsgSelectCharacter.cs	Pass IRobustSerializer to NetMessage (#11021)	2022-09-14 17:25:25 +10:00
MsgUpdateCharacter.cs	Update NetMessage to pass in MemoryStream (#21796)	2023-11-28 19:11:16 +11:00
PlayerPreferences.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
PreferenceUnavailableMode.cs
SpawnPriorityPreference.cs	Client customization late-join spawner priority for arrivals/cryostorage (#24586)	2024-02-01 21:12:09 +11:00