Ed 5c391b753f Merge remote-tracking branch 'upstream/stable' into ed-06-02-2025-upstream-sync-fix ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
#	Resources/Maps/Test/dev_map.yml
#	Resources/Prototypes/Maps/Pools/default.yml

2025-02-06 14:38:00 +03:00

..

_CP14

Guildmaster YML implementation + Clothing pack (#832)

2025-02-01 17:52:01 +03:00

Dungeon

Demiplan polishing 2 (#528)

2024-11-02 00:59:55 +03:00

Misc

baby proof the terminal (#33281)

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

Nonstations

Upstream sync (#846)

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

Ruins

Upstream sync (#846)

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

Salvage

Upstream sync (#846)

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

Shuttles

Upstream sync (#846)

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

Test

remove tropico from devmap (#34585)

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

amber.yml

Upstream sync (#846)

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

bagel.yml

Upstream sync (#846)

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

box.yml

Upstream sync (#846)

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

centcomm.yml

Upstream sync (#846)

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

cog.yml

Upstream sync (#846)

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

convex.yml

Upstream sync (#846)

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

core.yml

Upstream sync (#786)

2025-01-21 23:57:12 +03:00

elkridge.yml

Upstream sync (#846)

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

fland.yml

Upstream sync (#846)

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

gate.yml

Gate map: Holopads added (#33918)

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

loop.yml

Upstream sync (#846)

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

marathon.yml

Upstream sync (#846)

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

meta.yml

Upstream sync (#846)

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

oasis.yml

Upstream sync (#846)

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

omega.yml

Upstream sync (#846)

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

packed.yml

Upstream sync (#846)

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

plasma.yml

Upstream sync (#846)

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

reach.yml

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

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