Ed 3409e0f752 Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Overlays/StencilOverlay.cs
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/SkinColor.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml

2025-09-15 13:50:49 +03:00

..

Loadouts

Fix usages of TryIndex() (#39124)

2025-09-09 18:17:56 +02:00

Roles

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03:00

CharacterPickerButton.xaml

Make CharacterPickerButton the same height for dwarves as for non-dwarves (#35297)

2025-02-19 11:44:17 +01:00

CharacterPickerButton.xaml.cs

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03:00

CharacterSetupGui.xaml

Add admin remarks button to lobby (#31761)

2024-11-15 23:09:29 -06:00

CharacterSetupGui.xaml.cs

Add admin remarks button to lobby (#31761)

2024-11-15 23:09:29 -06:00

CharacterSetupGuiSavePanel.xaml

Character menu asks if you want to save your character on exit (#29875)

2024-07-11 10:24:37 +10:00

CharacterSetupGuiSavePanel.xaml.cs

Character menu asks if you want to save your character on exit (#29875)

2024-07-11 10:24:37 +10:00

HighlightedContainer.xaml

Lobby refactor + species loadouts support (#27576)

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

HighlightedContainer.xaml.cs

Lobby refactor + species loadouts support (#27576)

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

HumanoidProfileEditor.xaml

Give silicons proper lobby/character editor previews (#33763)

2024-12-08 02:46:41 +01:00

HumanoidProfileEditor.xaml.cs

Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync

2025-09-15 13:50:49 +03:00

LobbyCharacterPreviewPanel.xaml

Loadouts redux (#25715)

2024-04-16 22:57:43 +10:00

LobbyCharacterPreviewPanel.xaml.cs

Power stuff (#31314)

2024-08-25 22:18:42 +10:00

LobbyGui.xaml

Playtime Reminders - Raising awareness of addiction by highlighting excessive playtime (#36483)

2025-06-19 03:06:26 +02:00

LobbyGui.xaml.cs

Add collapse button to lobby right panel (#37140)

2025-05-06 13:24:58 -04:00

ObserveWarningWindow.xaml

Fix late join & observe to de-admin admins. (#28319)

2024-05-28 14:00:42 -04:00

ObserveWarningWindow.xaml.cs

Fix late join & observe to de-admin admins. (#28319)

2024-05-28 14:00:42 -04:00