Ed 59e6435fe2 Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Construction/UI/ConstructionMenuPresenter.cs
#	Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
#	Resources/Prototypes/Procedural/vgroid.yml

2025-05-12 14:25:42 +03:00

..

_CP14

Demiplane maps aftertest tweaks (#1256)

2025-05-06 08:29:09 +03:00

Dungeon

RoomSpawner mask (#33110)

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

Lavaland

Salv Ruins Again (#37193)

2025-05-04 23:33:18 -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

3mo xeno archeology (first phase) (#33370)

2025-04-15 10:34:53 +10:00

Test

remove tropico from devmap (#34585)

2025-01-22 20:20:08 +01:00

amber.yml

Amber Station - Security and AI Sat Overhaul (#37262)

2025-05-07 18:39:09 -07:00

bagel.yml

Bagel Station - Removed Gamer Loot (#37171)

2025-05-04 00:20:33 -07:00

box.yml

init

2025-04-19 13:21:07 +02:00

centcomm.yml

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

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

convex.yml

Convex genpop update (#37216)

2025-05-05 23:56:34 -07:00

core.yml

Upstream sync (#1035)

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

elkridge.yml

Elkridge - Genpop (#36914)

2025-04-25 08:05:25 -07:00

fland.yml

Fland Update (Genpop) (#37207)

2025-05-05 18:29:17 -07:00

gate.yml

Gate map: Holopads added (#33918)

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

loop.yml

loop turnstyle fix hopefully (#36946)

2025-04-25 22:08:23 -07:00

marathon.yml

init

2025-04-19 19:11:17 +02: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 (Genpop) (#37157)

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

packed.yml

init

2025-04-19 13:13:05 +02:00

plasma.yml

Ore silos and department eco

2025-04-19 18:51:53 +10:00

reach.yml

Reach/Cargo Update (Holopads & Atmos) (#33943)

2024-12-18 16:29:21 -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