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

54 KiB

Raw Permalink Blame History

View Raw