Ed 07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream ...

# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

2025-02-23 23:07:55 +03:00

..

Loadouts

Small loadout window improvement (#35171)

2025-02-18 23:36:49 +11: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/master' into ed-16-02-2025-planet-light-upstream

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

Upstream sync (#786)

2025-01-21 23:57:12 +03:00

LobbyGui.xaml.cs

Add admin remarks button to lobby (#31761)

2024-11-15 23:09:29 -06: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