Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch '20-11-19-sandboxing' into 20-11-27-merge

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-11-27 00:53:48 +01:00
parent 42214036c7 0dbb75051e
commit f29476290c
21 changed files with 174 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Shared/Atmos/GasPrototype.cs
View File

@@ -67,17 +67,17 @@ namespace Content.Shared.Atmos
{
var serializer = YamlObjectSerializer.NewReader(mapping);
serializer.DataField(this, x => ID, "id", string.Empty);
serializer.DataField(this, x => Name, "name", string.Empty);
serializer.DataField(this, x => OverlayPath, "overlayPath", string.Empty);
serializer.DataField(this, x => SpecificHeat, "specificHeat", 0f);
serializer.DataField(this, x => HeatCapacityRatio, "heatCapacityRatio", 1.4f);
serializer.DataField(this, x => MolarMass, "molarMass", 1f);
serializer.DataField(this, x => GasMolesVisible, "gasMolesVisible", 0.25f);
serializer.DataField(this, x => GasOverlayTexture, "gasOverlayTexture", string.Empty);
serializer.DataField(this, x => GasOverlaySprite, "gasOverlaySprite", string.Empty);
serializer.DataField(this, x => GasOverlayState, "gasOverlayState", string.Empty);
serializer.DataField(this, x => Color, "color", string.Empty);
serializer.DataField(this, x => x.ID, "id", string.Empty);
serializer.DataField(this, x => x.Name, "name", string.Empty);
serializer.DataField(this, x => x.OverlayPath, "overlayPath", string.Empty);
serializer.DataField(this, x => x.SpecificHeat, "specificHeat", 0f);
serializer.DataField(this, x => x.HeatCapacityRatio, "heatCapacityRatio", 1.4f);
serializer.DataField(this, x => x.MolarMass, "molarMass", 1f);
serializer.DataField(this, x => x.GasMolesVisible, "gasMolesVisible", 0.25f);
serializer.DataField(this, x => x.GasOverlayTexture, "gasOverlayTexture", string.Empty);
serializer.DataField(this, x => x.GasOverlaySprite, "gasOverlaySprite", string.Empty);
serializer.DataField(this, x => x.GasOverlayState, "gasOverlayState", string.Empty);
serializer.DataField(this, x => x.Color, "color", string.Empty);
}
}
}