fish-station/Content.Shared/Preferences
VigersRay 5f10d21fa6 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Administration/Commands/PlayTimeCommands.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Events/BreakerFlipRule.cs
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
2024-06-04 09:41:27 +03:00
..
Loadouts Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
GameSettings.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
HumanoidCharacterProfile.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-04 09:41:27 +03:00
ICharacterProfile.cs Merge sunrise build (#2) 2024-05-31 02:16:18 +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
SpawnPriorityPreference.cs Client customization late-join spawner priority for arrivals/cryostorage (#24586) 2024-02-01 21:12:09 +11:00