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
..
2024-08-13 13:53:59 +03:00
2025-05-12 14:25:42 +03:00
2024-08-05 18:12:07 +10:00
2024-08-05 17:36:26 +10:00
2024-08-03 01:49:08 +10:00