Ed a899122d1b Merge remote-tracking branch 'space-station-14/master' into 21-04-2024-cleaning-up ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Recipes/Lathes/electronics.yml
#	Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png
#	Resources/Textures/Interface/Nano/item_status_middle.svg.96dpi.png
#	Resources/Textures/Interface/Nano/item_status_right.svg.96dpi.png

2024-04-21 20:54:50 +03:00

..

_CP14

Update cave-arena.yml

2024-04-21 18:31:56 +03:00

Dungeon

SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)

2024-04-21 12:09:26 -04:00

Misc

Remove CRLF, enforce with workflow (#26401)

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

Nonstations

Shuttle console + FTL rework (#24430)

2024-03-03 18:39:19 +11:00

Ruins

Remove CRLF, enforce with workflow (#26401)

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

Salvage

Remove CRLF, enforce with workflow (#26401)

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

Shuttles

Add map Oasis (#25736)

2024-04-20 23:59:12 -06:00

Test

You can bless more containers with a bible (#26526)

2024-04-20 16:16:55 +10:00

atlas.yml

You can bless more containers with a bible (#26526)

2024-04-20 16:16:55 +10:00

bagel.yml

Remove CRLF, enforce with workflow (#26401)

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

box.yml

box update (#27069)

2024-04-17 16:01:24 -06:00

centcomm.yml

Remove CRLF, enforce with workflow (#26401)

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

cluster.yml

You can bless more containers with a bible (#26526)

2024-04-20 16:16:55 +10:00

core.yml

Update Core (#27195)

2024-04-20 23:58:23 -06:00

europa.yml

Component of planet initialization on the map (#26510)

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

fland.yml

You can bless more containers with a bible (#26526)

2024-04-20 16:16:55 +10:00

marathon.yml

Remove CRLF, enforce with workflow (#26401)

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

meta.yml

No More Bartender Incendiaries on Meta (#27142)

2024-04-20 11:06:21 +10:00

oasis.yml

Add map Oasis (#25736)

2024-04-20 23:59:12 -06:00

omega.yml

Remove CRLF, enforce with workflow (#26401)

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

origin.yml

Remove CRLF, enforce with workflow (#26401)

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

packed.yml

Remove CRLF, enforce with workflow (#26401)

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

reach.yml

Upstream, Yay (#27)

2024-04-03 10:33:34 +03:00

saltern.yml

You can bless more containers with a bible (#26526)

2024-04-20 16:16:55 +10:00

train.yml

Remove CRLF, enforce with workflow (#26401)

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