Ed 07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream ...

# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

2025-02-23 23:07:55 +03:00

..

Pools

Removes Cog station (#34996)

2025-02-09 14:01:31 -07:00

amber.yml

Amber Station Improvements (#35384)

2025-02-23 01:31:04 -07:00

arenas.yml

Update arenas.yml

2024-07-23 13:46:57 +03:00

bagel.yml

let bagel be played at max pop (#33769)

2024-12-07 14:24:16 -07:00

box.yml

Upstream sync (#846)

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

centcomm.yml

Refactor map loading & saving

2024-12-23 02:42:17 +13:00

convex.yml

Upstream sync (#846)

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

core.yml

Update Core (#31774)

2024-09-03 00:46:47 -06:00

debug.yml

Update debug.yml

2024-07-23 13:40:19 +03:00

elkridge.yml

Elkridge Tweaks 2 (#34757)

2025-02-09 18:07:10 -07:00

fland.yml

Fland Armory Restock (#35044)

2025-02-10 13:45:42 -07:00

gate.yml

Gate map (#32032)

2024-12-17 13:06:33 +03:00

loop.yml

Upstream sync (#846)

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

marathon.yml

Marathon Armory Restock (#34798)

2025-01-31 23:32:41 -07:00

meta.yml

Meta Station - Armory restock + fixes (#34717)

2025-01-31 00:22:52 -07:00

oasis.yml

Oasis Update (AI) (#31767)

2024-09-02 20:01:40 -06:00

omega.yml

Modifications to bring Omega up to date. (#32317)

2024-09-19 22:07:49 -06:00

packed.yml

Armory Packed update. (#34808)

2025-02-01 14:19:28 -07:00

plasma.yml

Upstream sync (#846)

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

reach.yml

Adds a salvage jobspawn to reach (#31712)

2024-09-01 22:37:02 -06:00

Relic.yml

Relic station (#34988)

2025-02-09 16:24:13 -07:00

saltern.yml

Fixing Botanist role numbers in various stations - V2 (#29581)

2024-07-21 01:23:27 -06:00

salvage.yml

anonymize salvage wrecks (#31087)

2024-08-17 15:09:21 +10:00

train.yml

standardize map protos and fill gaps (#31120)

2024-08-17 00:23:57 -06:00