Ed 59e6435fe2 Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Construction/UI/ConstructionMenuPresenter.cs
#	Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
#	Resources/Prototypes/Procedural/vgroid.yml

2025-05-12 14:25:42 +03:00

..

Commands

Make pow3r validation logic available on release (#36075)

2025-03-25 10:02:39 -07:00

Components

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

2025-05-12 14:25:42 +03:00

EntitySystems

Predicted internals (#33800)

2025-05-02 18:22:29 +10:00

Events

Revert "add breakers to power batteries" (#17632)

2023-07-08 12:47:38 +10:00

Generation/Teg

Predicted internals (#33800)

2025-05-02 18:22:29 +10:00

Generator

Predicted internals (#33800)

2025-05-02 18:22:29 +10:00

NodeGroups

Predicted internals (#33800)

2025-05-02 18:22:29 +10:00

Nodes

Predicted internals (#33800)

2025-05-02 18:22:29 +10:00

Pow3r

Make pow3r validation logic available on release (#36075)

2025-03-25 10:02:39 -07:00

SMES

Remove AllComponentsOneEntityDeleteTest (#19965)

2023-09-09 19:35:05 -05:00

PowerWireAction.cs

Upstream sync (#1035)

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

SetBatteryPercentCommand.cs

Remove all obsolete BatteryComponent method calls (#25871)

2024-03-06 16:34:50 +11:00