Ed f59de85047 Merge remote-tracking branch 'upstream/stable' into ed-21-07-2025-upstream-sync ...

# Conflicts:
#	Content.Client/Overlays/StencilOverlay.Weather.cs
#	Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
#	Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/GameTicking/SharedGameTicker.cs

2025-07-21 11:27:53 +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

[TRADE] Reagent and Food price rework and 4 new contracts: Butchers, Diary, Gardeners and Tailors (#1453)

2025-06-26 18:18:19 +03:00

botany.yml

Fix that space (#32149)

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

chemicals.yml

Artifact glue reagent (#38670)

2025-07-07 18:45:46 -07:00

cleaning.yml

Refactor SeeingRainbows to new status effect system (#38620)

2025-06-27 21:19:04 +03: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

Refactor SeeingRainbows to new status effect system (#38620)

2025-06-27 21:19:04 +03: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