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

..

_CP14

Trading request system (#1460)

2025-06-23 01:21:25 +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-10-06-2025-upstream-sync

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

Ruins

remove actions from maps (#37457)

2025-05-24 13:37:10 -07:00

Salvage

Upstream sync (#846)

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

Shuttles

Exo - Minor balance changes and fixes (#38435)

2025-06-18 21:06:17 -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

Content changes required for physicsmap purge (#37878)

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

box.yml

Box Station - Added Turrets (#37860)

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

centcomm.yml

Wizard Teleport Scroll (Teleport Location ECS) (#36424)

2025-04-28 19:42:24 +02:00

elkridge.yml

Elkridge - Major Update (#38259)

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

exo.yml

Exo - Minor balance changes and fixes (#38435)

2025-06-18 21:06:17 -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

Content changes required for physicsmap purge (#37878)

2025-05-28 19:38:47 +10: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