Ed 8ff09f552b Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2 ...

# Conflicts:
#	Content.Client/Guidebook/GuidebookSystem.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Guidebook/GuideEntry.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/arenas.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/debug.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/reach.yml
#	Resources/Prototypes/Maps/saltern.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/lobbyscreens.yml

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

..

_CP14

minor AlchemyTest map update (#237)

2024-06-12 18:38:48 +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

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

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

Shuttles

Replace Chef Ship Helmet (#28036)

2024-05-14 19:59:06 -04:00

Test

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

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

atlas.yml

atlas update (#28442)

2024-05-31 02:39:08 -06:00

bagel.yml

bagel update (#28080)

2024-05-17 00:15:52 -06: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 Update (#28854)

2024-06-11 19:07:37 -06:00

core.yml

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

2024-06-11 15:20:47 +03: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

Update Oasis -- robo control comp, other minor changes. (#27990)

2024-05-29 13:20:29 -06:00

omega.yml

Fix unlocked locker on Omega (#28247)

2024-05-28 01:52:59 -06: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

Reach Fixes (#28913)

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

saltern.yml

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

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

train.yml

Replace Train syndicate Jaws (#27734)

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