Morb0 32a8d1a21e Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Server/Power/Generator/GeneratorSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png		2024-02-03 03:38:29 +03:00
..
BackpackPreference.cs
ClothingPreference.cs
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	2024-02-03 03:38:29 +03:00
ICharacterProfile.cs	Species sponsor (#1480)	2023-10-03 02:50:23 +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