Ed 7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml

2025-02-16 11:58:47 +03:00

..

Loadouts

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03: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-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +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