Revert "epic Respiration Rework" (#6524)

This commit is contained in:
Leon Friedrich
2022-02-07 20:13:14 +13:00
committed by GitHub
parent 35eb6f8576
commit 6e8c92d13e
32 changed files with 585 additions and 595 deletions

View File

@@ -12,6 +12,5 @@ public enum AlertCategory
Health,
Piloting,
Hunger,
Thirst,
Toxins
}
Thirst
}

View File

@@ -31,7 +31,6 @@
Pulled,
Pulling,
Magboots,
Toxins,
Debug1,
Debug2,
Debug3,

View File

@@ -255,10 +255,11 @@ namespace Content.Shared.Atmos
/// </summary>
public const float NormalBodyTemperature = 37f;
/// <summary>
/// I hereby decree. This is Arbitrary Suck my Dick
/// </summary>
public const float BreathMolesToReagentMultiplier = 1144;
public const float HumanNeededOxygen = MolesCellStandard * BreathPercentage * 0.16f;
public const float HumanProducedOxygen = HumanNeededOxygen * 0.75f;
public const float HumanProducedCarbonDioxide = HumanNeededOxygen * 0.25f;
#region Pipes

View File

@@ -1,7 +1,5 @@
using Content.Shared.Chemistry.Reagent;
using Robust.Shared.Prototypes;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.ViewVariables;
namespace Content.Shared.Atmos.Prototypes
@@ -72,12 +70,6 @@ namespace Content.Shared.Atmos.Prototypes
[DataField("overlayPath")]
public string OverlayPath { get; } = string.Empty;
/// <summary>
/// The reagent that this gas will turn into when inhaled.
/// </summary>
[DataField("reagent", customTypeSerializer:typeof(PrototypeIdSerializer<ReagentPrototype>))]
public string? Reagent { get; } = default!;
[DataField("color")] public string Color { get; } = string.Empty;
}
}