Morb0 6c09b978a3 Merge remote-tracking branch 'wizards/master' into upstream-sync ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Telephone/TelephoneSystem.cs
#	LICENSE.TXT
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Guidebook/rules.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/ServerInfo/Guidebook/Chemicals.xml
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json

2025-01-12 19:59:31 +03:00

..

UI

Merge remote-tracking branch 'wizards/master' into upstream-sync

2025-01-12 19:59:31 +03:00

ClientPreferencesManager.cs

Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync

2024-05-15 18:53:52 +03:00

IClientPreferencesManager.cs

Lobby refactor + species loadouts support (#27576)

2024-05-12 09:18:21 +10:00

LobbyState.cs

Lobby chat width and custom lobby titles (#33783)

2025-01-05 21:56:01 +01:00

LobbyUIController.cs

Merge remote-tracking branch 'wizards/master' into upstream-sync

2024-12-26 00:30:02 +03:00