Ed 5f7600b6a2 Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/CargoTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
#	Content.Shared/Storage/Components/EntityStorageComponent.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/game_presets.yml

2025-09-08 13:12:50 +03:00

..

Consumable

Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream

2025-07-08 00:40:30 +03:00

Materials

fix: allow ejecting diamonds from lathes/silos (#38132)

2025-06-07 13:36:58 -04:00

biological.yml

Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync

2025-09-08 13:12:50 +03:00

botany.yml

Fix that space (#32149)

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

chemicals.yml

Expand soap making, but better (#39303)

2025-08-15 23:59:58 -07:00

cleaning.yml

Crawling Part 1: The Knockdownening (#36881)

2025-07-20 01:54:42 +02:00

elements.yml

Chem colors (#28367)

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

fun.yml

Add corgium (#37951)

2025-06-14 11:07:48 +02:00

gases.yml

Refactor SeeingRainbows to new status effect system (#38620)

2025-06-27 21:19:04 +03:00

medicine.yml

[NEW STATUS SYSTEM] Drunkenness, Stuttering, Slurred Speech, and Bloodloss (#38678)

2025-08-18 16:26:29 -04:00

narcotics.yml

Refactor SeeingRainbows to new status effect system (#38620)

2025-06-27 21:19:04 +03:00

pyrotechnic.yml

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

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

toxins.yml

Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream

2025-07-08 00:40:30 +03:00