Ed 5f7600b6a2 Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/CargoTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
#	Content.Shared/Storage/Components/EntityStorageComponent.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/game_presets.yml

2025-09-08 13:12:50 +03:00

..

ControlExtensions

Link to reagent ingredients on the same Guidebook page (#36700)

2025-05-09 10:06:26 +10:00

Controls

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

2025-09-08 13:12:50 +03:00

Fragments

Refactor serialization copying to use source generators (#19412)

2023-08-22 18:14:33 -07:00

RichText

Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814)

2025-07-07 21:57:05 +02:00

Screens

Revert "Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream"

2024-11-06 16:52:08 +03:00

Systems

Merge branch 'master' into ed-25-08-2025-upstream-sync

2025-09-08 11:31:28 +03:00

XamlExtensions

Revert "Update submodule to 175.0.0 (#21318)" (#21319)

2023-10-29 15:29:30 +11:00

BoundKeyHelpers.cs

Use different chatbox placeholder when dependent keys unbound (#22747)

2023-12-22 11:39:29 -08:00

BuiPredictionState.cs

Battery (SMES/substation) interface (#36386)

2025-04-27 21:08:34 +10:00

BuiPreTickUpdateSystem.cs

Battery (SMES/substation) interface (#36386)

2025-04-27 21:08:34 +10:00

ButtonHelpers.cs

Add ButtonHelpers and the SetButtonDisabledRecursive helper.

2021-07-29 12:55:37 +02:00

IEntityControl.cs

Improve vv /c/enthover and add keybind (#20127)

2023-09-16 14:09:51 +10:00

InputCoalescer.cs

Battery (SMES/substation) interface (#36386)

2025-04-27 21:08:34 +10:00

StatsWindow.xaml

Fix showvalue Ui for melee weapons (#38703)

2025-08-06 15:01:49 -07:00

StatsWindow.xaml.cs

Cargo economy balance (#11123)

2022-09-15 11:53:17 +10:00

StatValuesEui.cs

Cargo economy balance (#11123)

2022-09-15 11:53:17 +10:00