diff --git a/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs b/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs index 176b783b91..55686eb4d5 100644 --- a/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs @@ -36,9 +36,6 @@ namespace Content.Server.GameObjects.Components.Atmos private const float MaxExplosionRange = 14f; private const float DefaultOutputPressure = Atmospherics.OneAtmosphere; - [DataField("pressureResistance")] - private float _pressureResistance = Atmospherics.OneAtmosphere * 5f; - private int _integrity = 3; [ComponentDependency] private readonly ItemActionsComponent? _itemActions = null; diff --git a/Content.Server/GameObjects/Components/Body/Behavior/LiverBehavior.cs b/Content.Server/GameObjects/Components/Body/Behavior/LiverBehavior.cs index af65dd2fd6..6d8c2dbce2 100644 --- a/Content.Server/GameObjects/Components/Body/Behavior/LiverBehavior.cs +++ b/Content.Server/GameObjects/Components/Body/Behavior/LiverBehavior.cs @@ -23,31 +23,31 @@ namespace Content.Server.GameObjects.Components.Body.Behavior /// /// Whether the liver is functional. /// - [ViewVariables] private bool _liverFailing = false; + //[ViewVariables] private bool _liverFailing = false; /// /// Modifier for alcohol damage. /// - [DataField("alcoholLethality")] - [ViewVariables] private float _alcoholLethality = 0.005f; + //[DataField("alcoholLethality")] + //[ViewVariables] private float _alcoholLethality = 0.005f; /// /// Modifier for alcohol damage. /// - [DataField("alcoholExponent")] - [ViewVariables] private float _alcoholExponent = 1.6f; + //[DataField("alcoholExponent")] + //[ViewVariables] private float _alcoholExponent = 1.6f; /// /// Toxin volume that can be purged without damage. /// - [DataField("toxinTolerance")] - [ViewVariables] private float _toxinTolerance = 3f; + //[DataField("toxinTolerance")] + //[ViewVariables] private float _toxinTolerance = 3f; /// /// Toxin damage modifier. /// - [DataField("toxinLethality")] - [ViewVariables] private float _toxinLethality = 0.01f; + //[DataField("toxinLethality")] + //[ViewVariables] private float _toxinLethality = 0.01f; /// /// Loops through each reagent in _internalSolution, diff --git a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs index a80bc237ab..9a0a743ec5 100644 --- a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs @@ -155,9 +155,9 @@ namespace Content.Server.GameObjects.Components.Doors /// private bool _beingWelded; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("canCrush")] - private bool _canCrush = true; + //[ViewVariables(VVAccess.ReadWrite)] + //[DataField("canCrush")] + //private bool _canCrush = true; // TODO implement door crushing protected override void Startup() { diff --git a/Content.Server/GameObjects/Components/Explosion/ClusterFlashComponent.cs b/Content.Server/GameObjects/Components/Explosion/ClusterFlashComponent.cs index aeb04c9a34..9295855b7f 100644 --- a/Content.Server/GameObjects/Components/Explosion/ClusterFlashComponent.cs +++ b/Content.Server/GameObjects/Components/Explosion/ClusterFlashComponent.cs @@ -51,7 +51,7 @@ namespace Content.Server.GameObjects.Components.Explosion /// Max distance grenades can be thrown. /// [ViewVariables(VVAccess.ReadWrite)] [DataField("distance")] - private float _throwDistance = 3; + private float _throwDistance = 50; /// /// This is the end. @@ -113,7 +113,7 @@ namespace Content.Server.GameObjects.Components.Explosion thrownCount++; // TODO: Suss out throw strength - grenade.TryThrow(angle.ToVec().Normalized * 50); + grenade.TryThrow(angle.ToVec().Normalized * _throwDistance); grenade.SpawnTimer(delay, () => { diff --git a/Content.Server/GameObjects/Components/Nutrition/SmokingComponent.cs b/Content.Server/GameObjects/Components/Nutrition/SmokingComponent.cs index eced150ed7..4dd2824382 100644 --- a/Content.Server/GameObjects/Components/Nutrition/SmokingComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/SmokingComponent.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System.Threading.Tasks; using Content.Server.GameObjects.Components.Items.Clothing; using Content.Shared.GameObjects.Components; @@ -47,8 +47,8 @@ namespace Content.Server.GameObjects.Components.Nutrition /// For a regular cigar, the temp approaches around 400°C or 580°C /// dependant on where you measure. /// - [ViewVariables] [DataField("temperature")] - private float _temperature = 673.15f; + //[ViewVariables] [DataField("temperature")] + //private float _temperature = 673.15f; [ViewVariables] private SharedBurningStates CurrentState diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/ChemicalAmmoComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/ChemicalAmmoComponent.cs index 45ea80d83f..df7ec6ef76 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/ChemicalAmmoComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/ChemicalAmmoComponent.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Chemistry; using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; @@ -12,9 +12,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition { public override string Name => "ChemicalAmmo"; - [DataField("fractionTransfered")] - private float _fractionTransfered = 1; - public override void HandleMessage(ComponentMessage message, IComponent? component) { base.HandleMessage(message, component);