Ed 5b2020d708 Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml

2024-09-08 21:20:54 +03:00

..

Pools

fuck

2024-08-21 14:19:44 +03:00

arenas.yml

Update arenas.yml

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

bagel.yml

Bagel (#31806)

2024-09-03 14:06:18 -06:00

box.yml

boxstation AI update (#31771)

2024-09-03 00:29:26 -06:00

centcomm.yml

Update centcomm.yml

2024-07-23 21:50:00 +03:00

cog.yml

Updated cog (Maints edition) (#31935)

2024-09-07 13:58:16 -06: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

fland.yml

fland update (#31803)

2024-09-03 14:05:52 -06:00

marathon.yml

marathon update (#31804)

2024-09-03 14:06:00 -06:00

meta.yml

Meta (#31785)

2024-09-03 04:05:44 -06:00

oasis.yml

Oasis Update (AI) (#31767)

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

omega.yml

omega update (#31808)

2024-09-03 14:06:26 -06:00

packed.yml

packed update (#31807)

2024-09-03 14:08:27 -06:00

reach.yml

Adds a salvage jobspawn to reach (#31712)

2024-09-01 22:37:02 -06: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