Ed fb40f8cd25 Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml

2024-07-28 20:58:48 +03:00

..

Pools

Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream

2024-07-23 12:24:42 +03:00

arenas.yml

Update arenas.yml

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

atlas.yml

Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2

2024-06-13 12:35:00 +03:00

bagel.yml

Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2

2024-06-13 12:35:00 +03:00

box.yml

tweak(medical): Reduce chemist slots (#28711)

2024-06-23 02:03:00 -06:00

centcomm.yml

Update centcomm.yml

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

cluster.yml

Update cluster evac (#29885)

2024-07-11 15:03:51 -06:00

core.yml

tweak(Core_map_Jobslots): Increase round start chemist slots from 1 to 2 (#30408)

2024-07-27 13:49:05 -06:00

debug.yml

Update debug.yml

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

europa.yml

Update cluster evac (#29885)

2024-07-11 15:03:51 -06:00

fland.yml

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

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

marathon.yml

Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2

2024-06-13 12:35:00 +03:00

meta.yml

tweak(medical): Reduce chemist slots (#28711)

2024-06-23 02:03:00 -06:00

oasis.yml

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

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

omega.yml

Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2

2024-06-13 12:35:00 +03:00

origin.yml

tweak(medical): Reduce chemist slots (#28711)

2024-06-23 02:03:00 -06:00

packed.yml

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

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

reach.yml

Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2

2024-06-13 12:35:00 +03:00

saltern.yml

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

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

salvage.yml

Vegan Meatball (#24650)

2024-03-07 22:37:57 +03:00

train.yml

Replace some to do with TODO (#30346)

2024-07-25 11:04:03 +03:00