Ed cd736e4fd4 Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml

2024-12-11 14:49:02 +03:00

..

AbsorbentSystem.cs

Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)

2024-09-02 13:26:04 +02:00

DrainSystem.cs

Fix sinks and toilets not draining (#33691)

2024-12-04 03:42:16 +01:00

PuddleDebugDebugOverlaySystem.cs

Code cleanup: puddles and spreaders (#26102)

2024-03-15 14:41:08 +11:00

PuddleSystem.cs

Footprints + Mop + Force undersky liquid evaporation (#469)

2024-09-28 18:09:30 +03:00

PuddleSystem.Evaporation.cs

Footprints + Mop + Force undersky liquid evaporation (#469)

2024-09-28 18:09:30 +03:00

PuddleSystem.Spillable.cs

Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)

2024-09-02 13:26:04 +02:00

PuddleSystem.Transfers.cs

Revert 'Revert 'Solution Entities'' (#23168)

2023-12-29 08:47:43 -04:00

SmokeSystem.cs

Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)

2024-09-02 13:26:04 +02:00

SpraySystem.cs

Added Firebots - Real (#32482)

2024-09-30 20:13:16 -07:00