Ed e216eeae20 Merge remote-tracking branch 'space-station-14/master' into ed-25-05-2024-upstream ...

# Conflicts:
#	Content.Server/Atmos/Components/FlammableComponent.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

2024-05-25 18:49:49 +03:00

..

Commands

Make some prototypes use frozen collections (#22576)

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

Components

add fuel costs back to finishing welding (#27030)

2024-04-19 19:20:30 -04: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 'refs/remotes/upstream/master' into ed-17-05-2024-upstream

2024-05-17 12:57:04 +03:00

ReactionEffects

Resolve 'EntitySystem.Get<T>()' is obsolete in content (#27936)

2024-05-12 20:34:52 -04:00

ReagentEffectConditions

Resolve 'EntitySystem.Get<T>()' is obsolete in content (#27936)

2024-05-12 20:34:52 -04:00

ReagentEffects

Remove AlertType and AlertCategory (#27933)

2024-05-23 22:43:04 -04:00

TileReactions

Resolve 'EntitySystem.Get<T>()' is obsolete in content (#27936)

2024-05-12 20:34:52 -04:00