Ed dda8ea2b09 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream ...

# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml

2024-05-13 18:32:59 +03:00

..

_CP14

Tiles rework (#131)

2024-05-04 16:35:59 +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

Fix godmode serialization (#27427)

2024-04-28 14:30:39 +10:00

Shuttles

New event: Approaching unknown shuttle (#24490)

2024-05-10 04:35:59 -07:00

Test

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

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

atlas.yml

Atlas Rework (#27702)

2024-05-10 02:12:14 -06:00

bagel.yml

Remove CRLF, enforce with workflow (#26401)

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

box.yml

Minor map fixes (#27564)

2024-05-09 20:15:34 -06:00

centcomm.yml

Remove CRLF, enforce with workflow (#26401)

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

cluster.yml

Cluster med refactor V2, robotics console, emergency N2 lockers (#27840)

2024-05-09 20:45:13 -06:00

core.yml

Update Core (#27887)

2024-05-10 09:28:09 -06:00

europa.yml

Component of planet initialization on the map (#26510)

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

fland.yml

fix fland kitchen freezer (#27532)

2024-05-10 09:57:21 -06: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

Minor map fixes (#27564)

2024-05-09 20:15:34 -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

saltern robotics console (#27834)

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

train.yml

Replace Train syndicate Jaws (#27734)

2024-05-08 10:30:53 +03:00