Ed d5fbdbdec0 Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml

2025-05-27 12:21:14 +03:00

..

_CP14

City Gate fix + Comoss update (#1289)

2025-05-20 22:36:43 +03:00

Dungeon

RoomSpawner mask (#33110)

2025-02-12 15:47:48 +03:00

Lavaland

New Salvage Wrecks (#36884)

2025-05-14 20:55:24 -07:00

Misc

baby proof the terminal (#33281)

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

Nonstations

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

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

Ruins

New Salvage Ruin - Atmos Interchange (#37115)

2025-05-02 08:45:46 -07:00

Salvage

Upstream sync (#846)

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

Shuttles

Evac Shuttle Wode update (#37223)

2025-05-21 16:26:57 -07:00

Test

[Maps] Dev rework (#34708)

2025-05-12 23:30:05 -07:00

amber.yml

Amber Station - Added Job Board (#37565)

2025-05-18 00:23:21 -07:00

bagel.yml

Bagel Update (Salvage Job Computer) (#37652)

2025-05-20 16:27:57 -07:00

box.yml

Box Station - Added GenPop (Sec redesigned) (#37663)

2025-05-20 22:00:51 -07:00

centcomm.yml

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

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

convex.yml

Convex job board update (#37579)

2025-05-18 10:43:43 -07:00

core.yml

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

elkridge.yml

Elkridge - Salv job board and overhaul (#37600)

2025-05-19 11:55:41 -07:00

fland.yml

Fland Update (Salvage Job Computer) (#37653)

2025-05-20 16:27:31 -07:00

gate.yml

Gate map: Holopads added (#33918)

2024-12-17 14:37:19 -07:00

loop.yml

loop salvage job board (#37618)

2025-05-19 14:30:03 -07:00

marathon.yml

Marathon Update (#37654)

2025-05-20 16:29:45 -07:00

meta.yml

Meta Silo n Dept Economy (#36885)

2025-04-24 10:28:50 -07:00

oasis.yml

feex oasis portal (#37058)

2025-04-29 19:55:45 -07:00

omega.yml

Omega Update (Salvage Job Computer) (#37655)

2025-05-20 16:35:59 -07:00

packed.yml

Packed Update (Salvage Job Computer) (#37656)

2025-05-20 17:12:15 -07:00

plasma.yml

Telecoms Resprite (#35811)

2025-05-17 22:10:56 -04:00

reach.yml

Reach Update (#37669)

2025-05-21 00:51:20 -07:00

relic.yml

more touchups

2025-03-23 18:19:14 -05:00

saltern.yml

remove(Saltern): Remove the material recalimer (#31268)

2024-08-21 12:41:20 -06:00

train.yml

Train: fix problematic atmos setup (#34018)

2024-12-22 13:41:35 -07:00