tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Data Rework Content Edition (#82)

Browse Source 
* WiP Data Rework.

* Convert stationstation to new map format.

* stationstation.yml v2

* Update submodule
This commit is contained in:
Pieter-Jan Briers
2018-07-26 23:38:16 +02:00
committed by GitHub
parent 8c874c76dc
commit b34591ab59
19 changed files with 1280 additions and 2906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs
View File

@@ -5,6 +5,7 @@ using SS14.Shared.GameObjects;
using SS14.Shared.Utility;
using YamlDotNet.RepresentationModel;
using Content.Shared.GameObjects;
using SS14.Shared.Serialization;
namespace Content.Server.GameObjects
{
@@ -29,19 +30,12 @@ namespace Content.Server.GameObjects
float _secondsSinceLastDamageUpdate = 0;
/// <inheritdoc />
public override void LoadParameters(YamlMappingNode mapping)
public override void ExposeData(ObjectSerializer serializer)
{
YamlNode node;
base.ExposeData(serializer);
if (mapping.TryGetNode("firedamagethreshold", out node))
{
_fireDamageThreshold = node.AsFloat();
}
if (mapping.TryGetNode("firedamagecoefficient", out node))
{
_fireDamageCoefficient = node.AsFloat();
}
serializer.DataField(ref _fireDamageThreshold, "firedamagethreshold", 0);
serializer.DataField(ref _fireDamageCoefficient, "firedamagecoefficient", 1);
}
/// <inheritdoc />