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

..

Consumable

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

2025-04-30 20:31:50 +03:00

Materials

Sheet-meister 2000 Cloth recipe (#32676)

2025-04-26 05:22:51 +02:00

biological.yml

Ichor double-metabolize fix + Very minor cleanup (#37107)

2025-05-06 14:16:13 -04:00

botany.yml

Fix that space (#32149)

2024-09-14 14:28:35 +03:00

chemicals.yml

Revert "Traumoxadone (#37126)"

2025-05-08 18:13:33 +02:00

cleaning.yml

Puddle code hotfix 2 (#37046)

2025-04-29 21:10:00 +01:00

elements.yml

Chem colors (#28367)

2024-05-31 12:44:22 -07:00

fun.yml

Puddle Code Slipping Cleanup (#35845)

2025-04-20 17:27:12 -04:00

gases.yml

Condensed gases can now be metabolized. (#31648)

2025-04-13 17:21:55 +02:00

medicine.yml

Revert "Traumoxadone (#37126)"

2025-05-08 18:13:33 +02:00

narcotics.yml

Mutetoxin buff (#32915)

2024-10-20 22:43:14 -05:00

pyrotechnic.yml

Vox now can eat trash other other inedible things (#35681)

2025-05-01 20:16:51 +02:00

toxins.yml

Vox now can eat trash other other inedible things (#35681)

2025-05-01 20:16:51 +02:00