Morb0 13b3bfa217 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # .github/workflows/update-wiki.yml # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Shared/Humanoid/HumanoidCharacterAppearance.cs # Content.Shared/Humanoid/Markings/MarkingPrototype.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/manifest.yml		2023-09-24 12:56:24 +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	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
ICharacterProfile.cs	Rework sponsor markings (#593)	2022-11-27 08:13:01 -08: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	Pass IRobustSerializer to NetMessage (#11021)	2022-09-14 17:25:25 +10:00
MsgSelectCharacter.cs	Pass IRobustSerializer to NetMessage (#11021)	2022-09-14 17:25:25 +10:00
MsgUpdateCharacter.cs	Pass IRobustSerializer to NetMessage (#11021)	2022-09-14 17:25:25 +10: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