Arthur Asimov f8d4eea0dc Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Content.Client/Options/UI/Tabs/AudioTab.xaml.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/GameTicking/GameTicker.StatusShell.cs # Content.Server/RoundEnd/RoundEndSystem.cs # Resources/Prototypes/Datasets/Names/Operation_suffix.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Maps/core.yml # Resources/ServerInfo/Guidebook/Cargo/Salvage.xml # Resources/ServerInfo/Guidebook/Science/Robotics.xml		2023-12-03 15:10:26 +03:00
..
BackpackPreference.cs	Remove redundant #nullable enable (#4275)	2021-07-16 17:37:09 -07:00
ClothingPreference.cs	Remove redundant #nullable enable (#4275)	2021-07-16 17:37:09 -07:00
GameSettings.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
HumanoidCharacterProfile.cs	Species sponsor (#1480)	2023-10-03 02:50:23 +03:00
ICharacterProfile.cs	Species sponsor (#1480)	2023-10-03 02:50:23 +03:00
JobPriority.cs	Remove redundant #nullable enable (#4275)	2021-07-16 17:37:09 -07:00
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	Remove redundant #nullable enable (#4275)	2021-07-16 17:37:09 -07:00