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

# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml

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

..

_CP14

fix viator

2025-04-26 18:09:44 +03:00

Dungeon

RoomSpawner mask (#33110)

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

Lavaland

Added more salvage ruins (#36822)

2025-04-21 22:30:20 -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 - Hydro Outpost (#36826)

2025-04-23 16:56:31 -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 - Silo (#36764)

2025-04-24 11:24:07 -07:00

bagel.yml

init

2025-04-19 12:48:50 +02: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

init

2025-04-19 19:28:25 +02:00

core.yml

Upstream sync (#1035)

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

elkridge.yml

added silo, moved service request console

2025-04-19 18:54:29 +10:00

fland.yml

init

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

gate.yml

Gate map: Holopads added (#33918)

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

loop.yml

loop lairlock lattice fix (#36758)

2025-04-19 23:51:13 -06: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

init

2025-04-19 12:17:09 +02:00

omega.yml

init

2025-04-19 12:07:50 +02: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