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
..
2025-05-12 14:25:42 +03:00
2025-05-06 22:03:05 -04:00
2025-03-21 00:30:47 +11:00
2024-07-11 15:55:56 +10:00
2025-03-10 16:24:10 +03:00
2024-12-24 01:24:19 +01:00
2024-07-11 15:55:56 +10:00
2025-04-23 01:36:49 +02:00
2024-08-10 11:14:58 -04:00