Ed d5fbdbdec0 Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml

2025-05-27 12:21:14 +03:00

..

AccessibilityTab.xaml

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

AccessibilityTab.xaml.cs

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

AdminOptionsTab.xaml

Role subtypes (#35359)

2025-04-16 19:04:48 +02:00

AdminOptionsTab.xaml.cs

Role subtypes (#35359)

2025-04-16 19:04:48 +02:00

AudioTab.xaml

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

AudioTab.xaml.cs

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

GraphicsTab.xaml

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00

GraphicsTab.xaml.cs

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00

KeyRebindTab.xaml

Add scroll zooming for admins and ghosts (#14061)

2023-04-22 04:26:41 -06:00

KeyRebindTab.xaml.cs

Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

2025-05-27 12:21:14 +03:00

MiscTab.xaml

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00

MiscTab.xaml.cs

Localization hud layout (#31013)

2024-08-16 22:04:33 -04:00