diff --git a/Content.Server/Atmos/GasMixture.cs b/Content.Server/Atmos/GasMixture.cs index 7981d85ffe7b..8ab8993d5d00 100644 --- a/Content.Server/Atmos/GasMixture.cs +++ b/Content.Server/Atmos/GasMixture.cs @@ -536,10 +536,10 @@ public void Multiply(float multiplier) public void ExposeData(ObjectSerializer serializer) { - serializer.DataField(this, x => Immutable, "immutable", false); - serializer.DataField(this, x => Volume, "volume", 0f); - serializer.DataField(this, x => LastShare, "lastShare", 0f); - serializer.DataField(this, x => TemperatureArchived, "temperatureArchived", 0f); + serializer.DataField(this, x => x.Immutable, "immutable", false); + serializer.DataField(this, x => x.Volume, "volume", 0f); + serializer.DataField(this, x => x.LastShare, "lastShare", 0f); + serializer.DataField(this, x => x.TemperatureArchived, "temperatureArchived", 0f); serializer.DataField(ref _moles, "moles", new float[Atmospherics.AdjustedNumberOfGases]); serializer.DataField(ref _molesArchived, "molesArchived", new float[Atmospherics.AdjustedNumberOfGases]); serializer.DataField(ref _temperature, "temperature", Atmospherics.TCMB); diff --git a/Content.Server/Atmos/Reactions/GasReactionPrototype.cs b/Content.Server/Atmos/Reactions/GasReactionPrototype.cs index 4259f3f3aeee..ceb3c0bbb8bd 100644 --- a/Content.Server/Atmos/Reactions/GasReactionPrototype.cs +++ b/Content.Server/Atmos/Reactions/GasReactionPrototype.cs @@ -58,11 +58,11 @@ public void LoadFrom(YamlMappingNode mapping) { var serializer = YamlObjectSerializer.NewReader(mapping); - serializer.DataField(this, x => ID, "id", string.Empty); - serializer.DataField(this, x => Priority, "priority", 100); - serializer.DataField(this, x => MinimumRequirements, "minimumRequirements", new float[Atmospherics.TotalNumberOfGases]); - serializer.DataField(this, x => MinimumTemperatureRequirement, "minimumTemperature", Atmospherics.TCMB); - serializer.DataField(this, x => MinimumEnergyRequirement, "minimumEnergy", 0f); + serializer.DataField(this, x => x.ID, "id", string.Empty); + serializer.DataField(this, x => x.Priority, "priority", 100); + serializer.DataField(this, x => x.MinimumRequirements, "minimumRequirements", new float[Atmospherics.TotalNumberOfGases]); + serializer.DataField(this, x => x.MinimumTemperatureRequirement, "minimumTemperature", Atmospherics.TCMB); + serializer.DataField(this, x => x.MinimumEnergyRequirement, "minimumEnergy", 0f); serializer.DataField(ref _effects, "effects", new List()); } diff --git a/Content.Server/GameObjects/Components/Atmos/PressureProtectionComponent.cs b/Content.Server/GameObjects/Components/Atmos/PressureProtectionComponent.cs index 6c4ea57a3846..054617b4b217 100644 --- a/Content.Server/GameObjects/Components/Atmos/PressureProtectionComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/PressureProtectionComponent.cs @@ -20,8 +20,8 @@ public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); - serializer.DataField(this, x => HighPressureMultiplier, "highPressureMultiplier", 1f); - serializer.DataField(this, x => LowPressureMultiplier, "lowPressureMultiplier", 1f); + serializer.DataField(this, x => x.HighPressureMultiplier, "highPressureMultiplier", 1f); + serializer.DataField(this, x => x.LowPressureMultiplier, "lowPressureMultiplier", 1f); } } } diff --git a/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs b/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs index e8cc275d8046..db8079cf51f6 100644 --- a/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs +++ b/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs @@ -39,15 +39,15 @@ public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); - serializer.DataField(this, x => Damage, "damage", DamageType.Blunt); - serializer.DataField(this, x => MinimumSpeed, "minimumSpeed", 20f); - serializer.DataField(this, x => BaseDamage, "baseDamage", 5); - serializer.DataField(this, x => Factor, "factor", 1f); - serializer.DataField(this, x => SoundHit, "soundHit", ""); - serializer.DataField(this, x => StunChance, "stunChance", 0.25f); - serializer.DataField(this, x => StunSeconds, "stunSeconds", 1f); - serializer.DataField(this, x => DamageCooldown, "damageCooldown", 2f); - serializer.DataField(this, x => StunMinimumDamage, "stunMinimumDamage", 10); + serializer.DataField(this, x => x.Damage, "damage", DamageType.Blunt); + serializer.DataField(this, x => x.MinimumSpeed, "minimumSpeed", 20f); + serializer.DataField(this, x => x.BaseDamage, "baseDamage", 5); + serializer.DataField(this, x => x.Factor, "factor", 1f); + serializer.DataField(this, x => x.SoundHit, "soundHit", ""); + serializer.DataField(this, x => x.StunChance, "stunChance", 0.25f); + serializer.DataField(this, x => x.StunSeconds, "stunSeconds", 1f); + serializer.DataField(this, x => x.DamageCooldown, "damageCooldown", 2f); + serializer.DataField(this, x => x.StunMinimumDamage, "stunMinimumDamage", 10); } public void CollideWith(IEntity collidedWith) diff --git a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs b/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs index 40fde3d0e9cc..c8f67ec62acd 100644 --- a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs @@ -36,7 +36,7 @@ public class ToolEntry : IExposeData public void ExposeData(ObjectSerializer serializer) { - serializer.DataField(this, x => Behavior, "behavior", ToolQuality.None); + serializer.DataField(this, x => x.Behavior, "behavior", ToolQuality.None); serializer.DataField(ref _state, "state", string.Empty); serializer.DataField(ref _sprite, "sprite", string.Empty); serializer.DataField(ref _texture, "texture", string.Empty); diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs index 04ba61e313cb..79f360cb0700 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs @@ -152,8 +152,8 @@ public override void ExposeData(ObjectSerializer serializer) serializer.DataField(ref _open, "open", false); serializer.DataField(this, a => a.IsWeldedShut, "IsWeldedShut", false); serializer.DataField(this, a => a.CanWeldShut, "CanWeldShut", true); - serializer.DataField(this, x => _closeSound, "closeSound", "/Audio/Machines/closetclose.ogg"); - serializer.DataField(this, x => _openSound, "openSound", "/Audio/Machines/closetopen.ogg"); + serializer.DataField(this, x => x._closeSound, "closeSound", "/Audio/Machines/closetclose.ogg"); + serializer.DataField(this, x => x._openSound, "openSound", "/Audio/Machines/closetopen.ogg"); } public virtual void Activate(ActivateEventArgs eventArgs) diff --git a/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs b/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs index 07f7f29a3950..91be22ebab12 100644 --- a/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs @@ -46,9 +46,9 @@ public IEnumerable GameRules public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); - serializer.DataField(this, x => Prototypes, "prototypes", new List()); - serializer.DataField(this, x => Chance, "chance", 1.0f); - serializer.DataField(this, x => _gameRules, "gameRules", new List()); + serializer.DataField(this, x => x.Prototypes, "prototypes", new List()); + serializer.DataField(this, x => x.Chance, "chance", 1.0f); + serializer.DataField(this, x => x._gameRules, "gameRules", new List()); } private void RuleAdded(GameRuleAddedEventArgs obj) diff --git a/Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs b/Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs index 46d50ca25f6f..c96f9637e02c 100644 --- a/Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs @@ -53,11 +53,11 @@ public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); - serializer.DataField(this, x => Prototypes, "prototypes", new List()); - serializer.DataField(this, x => Chance, "chance", 1.0f); - serializer.DataField(this, x => IntervalSeconds, "intervalSeconds", 60); - serializer.DataField(this, x => MinimumEntitiesSpawned, "minimumEntitiesSpawned", 1); - serializer.DataField(this, x => MaximumEntitiesSpawned, "maximumEntitiesSpawned", 1); + serializer.DataField(this, x => x.Prototypes, "prototypes", new List()); + serializer.DataField(this, x => x.Chance, "chance", 1.0f); + serializer.DataField(this, x => x.IntervalSeconds, "intervalSeconds", 60); + serializer.DataField(this, x => x.MinimumEntitiesSpawned, "minimumEntitiesSpawned", 1); + serializer.DataField(this, x => x.MaximumEntitiesSpawned, "maximumEntitiesSpawned", 1); if(MinimumEntitiesSpawned > MaximumEntitiesSpawned) throw new ArgumentException("MaximumEntitiesSpawned can't be lower than MinimumEntitiesSpawned!"); diff --git a/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs b/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs index 6d2b0c1c894b..384fbb38a5aa 100644 --- a/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs @@ -30,9 +30,9 @@ public class TrashSpawnerComponent : ConditionalSpawnerComponent public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); - serializer.DataField(this, x => RarePrototypes, "rarePrototypes", new List()); - serializer.DataField(this, x => RareChance, "rareChance", 0.05f); - serializer.DataField(this, x => Offset, "offset", 0.2f); + serializer.DataField(this, x => x.RarePrototypes, "rarePrototypes", new List()); + serializer.DataField(this, x => x.RareChance, "rareChance", 0.05f); + serializer.DataField(this, x => x.Offset, "offset", 0.2f); } public override void Spawn() { diff --git a/Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs b/Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs index 54d99cc8950b..d6f81a0ebf60 100644 --- a/Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs @@ -91,7 +91,7 @@ public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); - serializer.DataField(this, x => SlipSound, "slipSound", "/Audio/Effects/slip.ogg"); + serializer.DataField(this, x => x.SlipSound, "slipSound", "/Audio/Effects/slip.ogg"); } protected override void OnSlip() diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs index e5135703371a..6e2420da7add 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs @@ -50,7 +50,7 @@ public abstract class Node : IExposeData public virtual void ExposeData(ObjectSerializer serializer) { - serializer.DataField(this, x => NodeGroupID, "nodeGroupID", NodeGroupID.Default); + serializer.DataField(this, x => x.NodeGroupID, "nodeGroupID", NodeGroupID.Default); } public virtual void Initialize(IEntity owner) diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs index f1063a01da86..46ed4f00c4fb 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs @@ -70,7 +70,7 @@ public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); serializer.DataField(ref _pipeDirection, "pipeDirection", PipeDirection.None); - serializer.DataField(this, x => LocalAir, "gasMixture", new GasMixture(DefaultVolume)); + serializer.DataField(this, x => x.LocalAir, "gasMixture", new GasMixture(DefaultVolume)); serializer.DataField(ref _conduitLayer, "conduitLayer", ConduitLayer.Two); }