Ed 7a8326d41e Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream ...

# Conflicts:
#	Content.Server/Audio/ContentAudioSystem.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Shuttles/Systems/ShuttleSystem.cs
#	Resources/Locale/en-US/navmap-beacons/station-beacons.ftl

2025-07-08 00:40:30 +03:00

..

AccessibilityTab.xaml

Add text highlighting (#31442)

2025-06-04 12:12:37 +02:00

AccessibilityTab.xaml.cs

Add text highlighting (#31442)

2025-06-04 12:12:37 +02: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

Add wall-based ambient occlusion (#38276)

2025-06-24 17:56:14 +10:00

GraphicsTab.xaml.cs

Add wall-based ambient occlusion (#38276)

2025-06-24 17:56:14 +10:00

KeyRebindTab.xaml

Add scroll zooming for admins and ghosts (#14061)

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

KeyRebindTab.xaml.cs

New belt controls (#1298)

2025-06-03 14:39:39 +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