Ed 59e6435fe2 Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Construction/UI/ConstructionMenuPresenter.cs
#	Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
#	Resources/Prototypes/Procedural/vgroid.yml

2025-05-12 14:25:42 +03:00

..

Components

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

2025-05-12 14:25:42 +03:00

EntitySystems

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

2025-05-12 14:25:42 +03:00

Events

Add a component that inserts the held item when no interaction happens on the stored item (#29823)

2024-08-11 12:29:44 +10:00

EntitySpawnEntry.cs

Fix prototypes so they pass analyzer checks (#35435)

2025-02-24 15:21:59 +11:00

Events.cs

Content update for NetEntities (#18935)

2023-09-11 09:42:41 +10:00

ItemStorageLocation.cs

biggest gridinv update OF ALL TIME (#25834)

2024-03-28 17:31:47 +11:00

StorageComponent.cs

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

StorageHelpers.cs

Grid Inventory (#21931)

2023-12-04 16:04:39 -07:00