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

..

ISSUE_TEMPLATE

Update issue templates (#19458)

2023-08-23 16:50:49 -05:00

workflows

change licenses (#191)

2024-05-31 00:01:22 +03:00

CODEOWNERS

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

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

config.yml

Create config.yml

2020-02-04 20:42:36 +01:00

labeler.yml

Update PR Labeler to v5 (#26845)

2024-04-28 21:23:49 -07:00

PULL_REQUEST_TEMPLATE.md

Update PULL_REQUEST_TEMPLATE.md

2024-05-21 11:48:56 +03:00

rsi-schema.json

change licenses (#191)

2024-05-31 00:01:22 +03:00