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

# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml

2025-04-30 20:31:50 +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

increase material prices (#30869)

2024-08-18 21:28:46 -06:00

biological.yml

Puddle code hotfix 2 (#37046)

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

botany.yml

Fix that space (#32149)

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

chemicals.yml

Puddle Code Slipping Cleanup (#35845)

2025-04-20 17:27:12 -04: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

Diphenhydramine causes drowsiness (#36212)

2025-04-02 23:29:52 -07:00

narcotics.yml

Mutetoxin buff (#32915)

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

pyrotechnic.yml

Puddle Code Slipping Cleanup (#35845)

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

toxins.yml

Puddle Code Slipping Cleanup (#35845)

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