VigersRay 47cdabdaed Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/StatusEffect/StatusEffectsSystem.cs # Resources/Audio/Effects/attributions.yml # Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml		2024-09-19 16:09:00 +03:00
..
Commands	Make some prototypes use frozen collections (#22576)	2023-12-25 15:12:22 +11:00
Components	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-19 16:09:00 +03:00
Containers/EntitySystems	Moved Serverside solution container code to shared (yes that includes ensureSolution!) (#27478)	2024-05-06 17:27:36 -07:00
EntitySystems	Clean up solution regen and drain comps (#29777)	2024-09-19 12:17:13 +10:00
TileReactions	Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)	2024-09-02 13:26:04 +02:00