Ed 5f7600b6a2 Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/CargoTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
#	Content.Shared/Storage/Components/EntityStorageComponent.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/game_presets.yml

2025-09-08 13:12:50 +03:00

..

_CP14

Adventure guild returns (#1745)

2025-09-07 19:15:29 +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

Terminal Hotfix (#40027)

2025-08-31 21:51:33 +02:00

Nonstations

Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync

2025-09-08 13:12:50 +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

Major Relic Update (#39215)

2025-08-28 11:40:36 -06:00

Test

Content changes required for physicsmap purge (#37878)

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

amber.yml

Add Polly to Amber station (#39139)

2025-07-22 17:52:41 -07:00

bagel.yml

fix bagel mapped containers missing (#38933)

2025-08-28 11:39:38 -06:00

box.yml

box station: tweak hop office (#39779)

2025-08-28 11:41:52 -06:00

centcomm.yml

Centcomm update (#38697)

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

elkridge.yml

Fix latejoinspawner on Elkridge (#40010)

2025-08-31 02:58:15 -06:00

exo.yml

Fix latejoinspawner on Exo (#40011)

2025-08-31 02:58:22 -06:00

fland.yml

Add Polly to Fland station (#39144)

2025-07-22 17:36:53 -07:00

marathon.yml

Fix electricity for Reagent Grinder at Marathon (#39801)

2025-08-23 15:48:39 -07:00

oasis.yml

update oasis -- AI rework (#39592)

2025-08-17 14:13:57 -07:00

packed.yml

Packed Station - North East Overhaul (#38339)

2025-08-17 12:00:48 -07:00

plasma.yml

Fix latejoin spawner on Plasma (#40012)

2025-08-31 02:58:28 -06:00

reach.yml

Content changes required for physicsmap purge (#37878)

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

relic.yml

Major Relic Update (#39215)

2025-08-28 11:40:36 -06:00

saltern.yml

Fix typo and make capitalization consistent in fax names (#39455)

2025-08-17 11:50:57 -07:00