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

Meat Patty (#34896)

2025-04-23 20:45:27 -07:00

Decoration

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

2025-04-30 20:31:50 +03:00

Devices

Hydroponic trays can now be bought (#36630)

2025-04-16 16:51:00 -07:00

Economy/cash.rsi

Plates & Cash gridinv visuals (#24075)

2024-01-14 11:44:17 -05:00

Fun

Make toy sword less obvious (#34199)

2025-04-24 03:21:35 +02:00

Magic

Wizard: Repulse Spell (#35377)

2025-02-22 10:56:54 -05:00

Materials

Basic Resources Crate (#36419)

2025-04-16 15:20:36 -04:00

Misc

Cleanup: Move folders out of bureaucracy.rsi and paper.yml (#35108)

2025-04-22 23:31:42 -07:00

Power

Portable Recharger: Arsenal T3 (#26655)

2024-04-28 13:19:33 +10:00

Specific

Add rehydratable mop bucket cube, refactor the rehydratable yml (#34586)

2025-04-21 13:16:25 -04:00

Storage

Adds handheld artifact container to cargo orders (#33327)

2025-04-16 19:35:57 -04:00

Tanks

Resprite the equipped gas canister suit slots (#30809)

2024-08-09 20:32:55 +10:00

Tiles

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

Tools

change MV cable outline (#36751)

2025-04-20 16:30:37 -04:00

Vehicles

ATV resprite (#25885)

2024-03-07 08:36:00 +03:00

Weapons

ERT Janitor Weapon - Hydra (#34416)

2025-04-19 16:03:05 +02:00