Ed 5b2020d708 Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml

2024-09-08 21:20:54 +03:00

..

Loadouts

Remove calls to FormattedMessage obsolete methods (#31706)

2024-09-01 13:00:53 +02:00

GameSettings.cs

Cleanup the namespaces (#8132)

2022-05-13 17:59:03 +10:00

HumanoidCharacterProfile.cs

Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream

2024-09-08 21:20:54 +03:00

ICharacterProfile.cs

Loadouts redux (#25715)

2024-04-16 22:57:43 +10: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