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

..

_CP14

Update dev_map.yml (#361)

2024-07-28 20:56:05 +03:00

Dungeon

add an arabian lamp. (#27270)

2024-07-21 01:24:28 -06:00

Misc

Remove CRLF, enforce with workflow (#26401)

2024-03-24 22:06:17 +01:00

Nonstations

Nukie Outpost is no longer a station map (#30090)

2024-07-21 01:26:30 -06:00

Ruins

Adds 2 new space ruins (#28971)

2024-06-15 00:02:56 -06:00

Salvage

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03:00

Shuttles

Update Evac-Accordia (#30389)

2024-07-26 23:40:39 -06:00

Test

fix(dev_map): resave dev map (#30098)

2024-07-18 10:17:57 +03:00

atlas.yml

Update Atlas (#30331)

2024-07-24 14:52:34 -06:00

bagel.yml

Update Bagel (#30326)

2024-07-24 14:11:42 -06:00

box.yml

twek(BoxStation): Reorganize atmos TEG room to be more user friendly. (#30368)

2024-07-25 23:06:31 -06:00

centcomm.yml

Remove CRLF, enforce with workflow (#26401)

2024-03-24 22:06:17 +01:00

cluster.yml

Update Cluster (#30327)

2024-07-24 14:12:28 -06:00

core.yml

Update Core (#29880)

2024-07-10 11:42:45 -06:00

europa.yml

Component of planet initialization on the map (#26510)

2024-04-18 21:27:54 +10:00

fland.yml

Update Fland (#30330)

2024-07-24 14:12:55 -06:00

marathon.yml

Update Marathon (#30328)

2024-07-24 14:12:21 -06:00

meta.yml

Update Meta (#30348)

2024-07-25 15:58:39 -06:00

oasis.yml

Oasis updoot (#30388)

2024-07-26 23:39:43 -06:00

omega.yml

Update Omega (#30356)

2024-07-25 13:48:06 -06:00

origin.yml

Added cryosleep UnitSpawner and UnitSpawnerLate to the map Origin (#29761)

2024-07-06 11:33:20 -06:00

packed.yml

Update Packed (#30358)

2024-07-25 13:15:50 -06:00

reach.yml

Reach Fixes (#28913)

2024-06-12 20:09:10 -06:00

saltern.yml

Update Saltern (#30357)

2024-07-25 13:15:28 -06:00

train.yml

fix(train): Anchor botany machine, add second artifact spawner. (#30309)

2024-07-24 23:29:50 -06:00