lzk228 a0ab19ee4a Merge remote-tracking branch 'wizards/stable' into 04-21-upstream-sync ...

# Conflicts:
#	Content.Client/Humanoid/MarkingPicker.xaml.cs
#	Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Maps/amber.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/convex.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/elkridge.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/loop.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/plasma.yml
#	Resources/Prototypes/Maps/relic.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Textures/Objects/Misc/brbsign.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/sechud.png

2025-04-22 11:02:12 +02:00

..

UI

Merge remote-tracking branch 'wizards/stable' into 04-21-upstream-sync

2025-04-22 11:02:12 +02: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 commit '3551eb04115854cdbbf1841f5960c3cdbc508583' into 02-19-upstream

2025-02-19 03:00:13 +01:00