Ed d5fbdbdec0 Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml

2025-05-27 12:21:14 +03:00

..

Consumable

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

2025-05-27 12:21:14 +03:00

Materials

Sheet-meister 2000 Cloth recipe (#32676)

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

biological.yml

Adjust walking sounds (#36941)

2025-05-13 02:16:16 -07: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

Adjust walking sounds (#36941)

2025-05-13 02:16:16 -07:00

elements.yml

Chem colors (#28367)

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

fun.yml

Pepper makes you cough (#36358)

2025-05-19 11:23:38 -07:00

gases.yml

Condensed gases can now be metabolized. (#31648)

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

medicine.yml

HOTFIX Cryochem revert (#37844)

2025-05-26 16:49:34 +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

Epinephrine Antihistamine effect, Histamines not radioactive (#37460)

2025-05-20 18:12:53 -07:00