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