Ed b581f5d132 Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync ...

# Conflicts:
#	.github/workflows/check-trailing-whitespace.yml
#	Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
#	Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Shared/Light/Components/SunShadowCycleComponent.cs
#	Resources/Prototypes/Damage/modifier_sets.yml
#	Resources/Prototypes/Maps/Pools/default.yml

2025-06-23 16:37:22 +03:00

..

Consumable

Merge remote-tracking branch 'upstream/stable' into ed-10-06-2025-upstream-sync

2025-06-10 11:33:34 +03:00

Materials

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

2025-06-07 13:36:58 -04: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

Lube Evaporates Slowly (#37998)

2025-06-02 12:41:34 +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

Reduce Liquid Frezon Duration (#38100)

2025-06-06 18:41:21 -04:00

medicine.yml

HOTFIX Cryochem revert (#37844)

2025-05-26 16:49:34 +02:00

narcotics.yml

Transparent tear gas (#36440)

2025-06-13 09:53:44 -04: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