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

..

_CP14

Cooking simulator 2: Soups (#1535)

2025-07-17 17:35:13 +03:00

Dungeon

Random maints update to decal spawners (#37916)

2025-05-28 22:03:46 -07:00

Lavaland

Content changes required for physicsmap purge (#37878)

2025-05-28 19:38:47 +10:00

Misc

baby proof the terminal (#33281)

2024-11-22 23:50:41 +01:00

Nonstations

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

2025-07-21 11:27:53 +03:00

Ruins

make telesci wreck easier (#37569)

2025-07-02 18:27:56 -06:00

Salvage

Upstream sync (#846)

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

Shuttles

Exo - Minor balance changes and fixes (#38689)

2025-07-03 11:51:40 -07:00

Test

Content changes required for physicsmap purge (#37878)

2025-05-28 19:38:47 +10:00

amber.yml

stop amber AI core from inducing seizures (#38209)

2025-06-10 02:36:33 -07:00

bagel.yml

Bagel genpop (#38829)

2025-07-10 12:16:06 -06:00

box.yml

Box Station - Added Turrets (#37860)

2025-05-30 00:25:30 -07:00

centcomm.yml

Centcomm update (#38697)

2025-07-02 19:31:19 -07:00

elkridge.yml

Elkridge - Major Update (#38259)

2025-06-13 15:17:57 -04:00

exo.yml

Exo - Minor balance changes and fixes (#38689)

2025-07-03 11:51:40 -07:00

fland.yml

Fland Update (#38068)

2025-06-04 17:41:38 -04:00

marathon.yml

Marathon Update - Genpop (#37687)

2025-06-01 12:38:39 -07:00

oasis.yml

update oasis (#37770)

2025-06-24 03:29:05 -07:00

packed.yml

Content changes required for physicsmap purge (#37878)

2025-05-28 19:38:47 +10:00

plasma.yml

Plasma genpop (#38028)

2025-06-03 00:30:22 -04:00

reach.yml

Content changes required for physicsmap purge (#37878)

2025-05-28 19:38:47 +10:00

relic.yml

Minor Relic improvements (#38269)

2025-06-11 15:25:38 -07:00

saltern.yml

Content changes required for physicsmap purge (#37878)

2025-05-28 19:38:47 +10:00