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

..

Components

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

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

Controls

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

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

Richtext

Guidebook Tables (#28484)

2024-06-01 20:58:33 -07:00

DocumentParsingManager.cs

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

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

DocumentParsingManager.static.cs

Guidebook Revival (#13320)

2023-01-16 02:42:22 -06:00

GuidebookSystem.cs

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

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