Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml
This commit is contained in:
Ed
2025-05-27 12:21:14 +03:00
1165 changed files with 76878 additions and 44718 deletions

View File

@@ -19,6 +19,14 @@ namespace Content.Shared.Storage
{
public static string ContainerId = "storagebase";
public const byte ChunkSize = 8;
// No datafield because we can just derive it from stored items.
/// <summary>
/// Bitmask of occupied tiles
/// </summary>
public Dictionary<Vector2i, ulong> OccupiedGrid = new();
[ViewVariables]
public Container Container = default!;