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

..

Commands

Make some prototypes use frozen collections (#22576)

2023-12-25 15:12:22 +11:00

Components

Syringe gun! (#32112)

2024-10-23 00:03:42 +11:00

Containers/EntitySystems

Moved Serverside solution container code to shared (yes that includes ensureSolution!) (#27478)

2024-05-06 17:27:36 -07:00

EntitySystems

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

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

TileReactions

Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)

2024-09-02 13:26:04 +02:00