Ed 677e5194d6 Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync ...

# Conflicts:
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/Traits/TraitSystem.cs
#	Content.Shared/CCVar/CCVars.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/box.yml
#	Resources/Maps/core.yml

2024-11-23 01:48:24 +03:00

..

alerts.yml

Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync

2024-11-23 01:48:24 +03:00

categories.yml

Remove AlertType and AlertCategory (#27933)

2024-05-23 22:43:04 -04:00

magboots.yml

Minor alert locale (#22926)

2023-12-24 14:13:02 -05:00

ninja.yml

ninja 2 electric boogaloo (#15534)

2023-09-10 16:20:27 +10:00

revenant.yml

Content changes for entity categories PR (#27232)

2024-06-02 14:08:15 +10:00