From 2dcbcd13d849bebf8f5bbdf93e9e4e93b7680eb5 Mon Sep 17 00:00:00 2001 From: halicopter Date: Thu, 20 Jul 2023 22:10:43 +0300 Subject: [PATCH] actually fix hypernob --- .../Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs | 4 ++-- Content.Server/Atmos/Reactions/BZProductionReaction.cs | 2 +- Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs | 2 +- Content.Server/Atmos/Reactions/FrezonProductionReaction.cs | 2 +- .../Atmos/Reactions/HalonOxygenAbsorptionReaction.cs | 2 +- Content.Server/Atmos/Reactions/HealiumProductionReaction.cs | 2 +- Content.Server/Atmos/Reactions/HydrogenFireReaction.cs | 2 +- .../Atmos/Reactions/HyperNobliumProductionReaction.cs | 2 +- Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs | 2 +- .../Atmos/Reactions/NitriumDecompositionReaction.cs | 2 +- Content.Server/Atmos/Reactions/NitriumProductionReaction.cs | 2 +- Content.Server/Atmos/Reactions/PlasmaFireReaction.cs | 2 +- Content.Server/Atmos/Reactions/PluoxiumProductionReaction.cs | 2 +- .../Atmos/Reactions/ProtoNitrateBZaseActionReaction.cs | 2 +- .../Atmos/Reactions/ProtoNitrateHydrogenConversionReaction.cs | 2 +- .../Atmos/Reactions/ProtoNitrateProductionReaction.cs | 2 +- .../Reactions/ProtoNitrateTritiumDeirradiationReaction.cs | 2 +- Content.Server/Atmos/Reactions/TritiumFireReaction.cs | 2 +- Content.Server/Atmos/Reactions/ZaukerDecompositionReaction.cs | 2 +- Content.Server/Atmos/Reactions/ZaukerProductionReaction.cs | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs index 01250d59e75c26..f0d8ee16a5a014 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs @@ -115,7 +115,7 @@ private void HotspotExpose(GridAtmosphereComponent gridAtmosphere, TileAtmospher { if (soh) { - if (plasma > 0.5f && hypernoblium < 5f|| tritium > 0.5f && hypernoblium < 5f|| hydrogen > 0.5f && hypernoblium < 5f) + if (plasma > 0.5f && hypernoblium < 5f || tritium > 0.5f && hypernoblium < 5f || hydrogen > 0.5f && hypernoblium < 5f) { if (tile.Hotspot.Temperature < exposedTemperature) tile.Hotspot.Temperature = exposedTemperature; @@ -127,7 +127,7 @@ private void HotspotExpose(GridAtmosphereComponent gridAtmosphere, TileAtmospher return; } - if ((exposedTemperature > Atmospherics.PlasmaMinimumBurnTemperature) && (plasma > 0.5f || tritium > 0.5f || hydrogen > 0.5f && hypernoblium < 5f)) + if ((exposedTemperature > Atmospherics.PlasmaMinimumBurnTemperature) && (plasma > 0.5f && hypernoblium < 5f || tritium > 0.5f && hypernoblium < 5f || hydrogen > 0.5f && hypernoblium < 5f)) { if (sparkSourceUid.HasValue) _adminLog.Add(LogType.Flammable, LogImpact.High, $"Heat/spark of {ToPrettyString(sparkSourceUid.Value)} caused atmos ignition of gas: {tile.Air.Temperature.ToString():temperature}K - {oxygen}mol Oxygen, {plasma}mol Plasma, {tritium}mol Tritium, {hydrogen}mol Hydrogen"); diff --git a/Content.Server/Atmos/Reactions/BZProductionReaction.cs b/Content.Server/Atmos/Reactions/BZProductionReaction.cs index 643737bcd0499c..06b22015f3c5b6 100644 --- a/Content.Server/Atmos/Reactions/BZProductionReaction.cs +++ b/Content.Server/Atmos/Reactions/BZProductionReaction.cs @@ -10,7 +10,7 @@ public sealed class BZProductionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialNitrousOxide = mixture.GetMoles(Gas.NitrousOxide); diff --git a/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs b/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs index 886b38eaf69cb7..439ae6176fb8f1 100644 --- a/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs +++ b/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs @@ -13,7 +13,7 @@ public sealed class FrezonCoolantReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); diff --git a/Content.Server/Atmos/Reactions/FrezonProductionReaction.cs b/Content.Server/Atmos/Reactions/FrezonProductionReaction.cs index 05d8d1c03fb8b5..a21648a460e643 100644 --- a/Content.Server/Atmos/Reactions/FrezonProductionReaction.cs +++ b/Content.Server/Atmos/Reactions/FrezonProductionReaction.cs @@ -14,7 +14,7 @@ public sealed class FrezonProductionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialN2 = mixture.GetMoles(Gas.Nitrogen); diff --git a/Content.Server/Atmos/Reactions/HalonOxygenAbsorptionReaction.cs b/Content.Server/Atmos/Reactions/HalonOxygenAbsorptionReaction.cs index bcc653eb91f259..e3b717d1c419e7 100644 --- a/Content.Server/Atmos/Reactions/HalonOxygenAbsorptionReaction.cs +++ b/Content.Server/Atmos/Reactions/HalonOxygenAbsorptionReaction.cs @@ -10,7 +10,7 @@ public sealed class HalonOxygenAbsorptionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialHalon = mixture.GetMoles(Gas.Halon); diff --git a/Content.Server/Atmos/Reactions/HealiumProductionReaction.cs b/Content.Server/Atmos/Reactions/HealiumProductionReaction.cs index e4e20ab42d411f..8e2d5c5c080b07 100644 --- a/Content.Server/Atmos/Reactions/HealiumProductionReaction.cs +++ b/Content.Server/Atmos/Reactions/HealiumProductionReaction.cs @@ -10,7 +10,7 @@ public sealed class HealiumProductionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialBZ = mixture.GetMoles(Gas.BZ); diff --git a/Content.Server/Atmos/Reactions/HydrogenFireReaction.cs b/Content.Server/Atmos/Reactions/HydrogenFireReaction.cs index 134133fe704e19..e89c22c1421603 100644 --- a/Content.Server/Atmos/Reactions/HydrogenFireReaction.cs +++ b/Content.Server/Atmos/Reactions/HydrogenFireReaction.cs @@ -11,7 +11,7 @@ public sealed class HydrogenFireReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var energyReleased = 0f; diff --git a/Content.Server/Atmos/Reactions/HyperNobliumProductionReaction.cs b/Content.Server/Atmos/Reactions/HyperNobliumProductionReaction.cs index da13da9091f48d..d72a5b6f1778e1 100644 --- a/Content.Server/Atmos/Reactions/HyperNobliumProductionReaction.cs +++ b/Content.Server/Atmos/Reactions/HyperNobliumProductionReaction.cs @@ -10,7 +10,7 @@ public sealed class HyperNobliumProductionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialNitrogen = mixture.GetMoles(Gas.Nitrogen); diff --git a/Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs b/Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs index 0f27df0a3ff657..2ef0f550e9c0b1 100644 --- a/Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs +++ b/Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs @@ -13,7 +13,7 @@ public sealed class MiasmicSubsumationReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialMiasma = mixture.GetMoles(Gas.Miasma); diff --git a/Content.Server/Atmos/Reactions/NitriumDecompositionReaction.cs b/Content.Server/Atmos/Reactions/NitriumDecompositionReaction.cs index 11177f4c84a0fc..6ebda1afcac5c1 100644 --- a/Content.Server/Atmos/Reactions/NitriumDecompositionReaction.cs +++ b/Content.Server/Atmos/Reactions/NitriumDecompositionReaction.cs @@ -10,7 +10,7 @@ public sealed class NitriumDecompositionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialNitrium = mixture.GetMoles(Gas.Nitrium); diff --git a/Content.Server/Atmos/Reactions/NitriumProductionReaction.cs b/Content.Server/Atmos/Reactions/NitriumProductionReaction.cs index cf2370816c2712..a78950f7e01be8 100644 --- a/Content.Server/Atmos/Reactions/NitriumProductionReaction.cs +++ b/Content.Server/Atmos/Reactions/NitriumProductionReaction.cs @@ -10,7 +10,7 @@ public sealed class NitriumProductionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialTritium = mixture.GetMoles(Gas.Tritium); diff --git a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs index a63bc29e49a036..a34826aba5f08f 100644 --- a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs +++ b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs @@ -11,7 +11,7 @@ public sealed class PlasmaFireReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var energyReleased = 0f; diff --git a/Content.Server/Atmos/Reactions/PluoxiumProductionReaction.cs b/Content.Server/Atmos/Reactions/PluoxiumProductionReaction.cs index 9398810bcbe77f..3673c589b25d5e 100644 --- a/Content.Server/Atmos/Reactions/PluoxiumProductionReaction.cs +++ b/Content.Server/Atmos/Reactions/PluoxiumProductionReaction.cs @@ -10,7 +10,7 @@ public sealed class PluoxiumProductionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialCarbonDioxide = mixture.GetMoles(Gas.CarbonDioxide); diff --git a/Content.Server/Atmos/Reactions/ProtoNitrateBZaseActionReaction.cs b/Content.Server/Atmos/Reactions/ProtoNitrateBZaseActionReaction.cs index 6fd64c9f65f7c7..7a4b97dd1bdf70 100644 --- a/Content.Server/Atmos/Reactions/ProtoNitrateBZaseActionReaction.cs +++ b/Content.Server/Atmos/Reactions/ProtoNitrateBZaseActionReaction.cs @@ -10,7 +10,7 @@ public sealed class ProtoNitrateBZaseConversionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialProtoNitrate = mixture.GetMoles(Gas.ProtoNitrate); diff --git a/Content.Server/Atmos/Reactions/ProtoNitrateHydrogenConversionReaction.cs b/Content.Server/Atmos/Reactions/ProtoNitrateHydrogenConversionReaction.cs index 8c03229634c98c..78021899fe17a6 100644 --- a/Content.Server/Atmos/Reactions/ProtoNitrateHydrogenConversionReaction.cs +++ b/Content.Server/Atmos/Reactions/ProtoNitrateHydrogenConversionReaction.cs @@ -10,7 +10,7 @@ public sealed class ProtoNitrateHydrogenConversionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialProtoNitrate = mixture.GetMoles(Gas.ProtoNitrate); diff --git a/Content.Server/Atmos/Reactions/ProtoNitrateProductionReaction.cs b/Content.Server/Atmos/Reactions/ProtoNitrateProductionReaction.cs index 44d8aa0c5fde53..835c2eedbf8c00 100644 --- a/Content.Server/Atmos/Reactions/ProtoNitrateProductionReaction.cs +++ b/Content.Server/Atmos/Reactions/ProtoNitrateProductionReaction.cs @@ -10,7 +10,7 @@ public sealed class ProtoNitrateProductionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialPluoxium = mixture.GetMoles(Gas.Pluoxium); diff --git a/Content.Server/Atmos/Reactions/ProtoNitrateTritiumDeirradiationReaction.cs b/Content.Server/Atmos/Reactions/ProtoNitrateTritiumDeirradiationReaction.cs index 1b4ee5ac2d9ee3..246d719ea6f3f9 100644 --- a/Content.Server/Atmos/Reactions/ProtoNitrateTritiumDeirradiationReaction.cs +++ b/Content.Server/Atmos/Reactions/ProtoNitrateTritiumDeirradiationReaction.cs @@ -10,7 +10,7 @@ public sealed class ProtoNitrateTritiumConversionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialProtoNitrate = mixture.GetMoles(Gas.ProtoNitrate); diff --git a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs index a30d6e18adaeff..a2111f02cc144f 100644 --- a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs +++ b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs @@ -11,7 +11,7 @@ public sealed class TritiumFireReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var energyReleased = 0f; diff --git a/Content.Server/Atmos/Reactions/ZaukerDecompositionReaction.cs b/Content.Server/Atmos/Reactions/ZaukerDecompositionReaction.cs index 721edd9a73f0fe..c5243fed78cfc7 100644 --- a/Content.Server/Atmos/Reactions/ZaukerDecompositionReaction.cs +++ b/Content.Server/Atmos/Reactions/ZaukerDecompositionReaction.cs @@ -10,7 +10,7 @@ public sealed class ZaukerDecompositionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialZauker = mixture.GetMoles(Gas.Zauker); diff --git a/Content.Server/Atmos/Reactions/ZaukerProductionReaction.cs b/Content.Server/Atmos/Reactions/ZaukerProductionReaction.cs index f83db294321aaf..1535e3fde5bb46 100644 --- a/Content.Server/Atmos/Reactions/ZaukerProductionReaction.cs +++ b/Content.Server/Atmos/Reactions/ZaukerProductionReaction.cs @@ -10,7 +10,7 @@ public sealed class ZaukerProductionReaction : IGasReactionEffect public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) { var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); - if (initialHyperNoblium >= 5.0f) + if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; var initialHypernoblium = mixture.GetMoles(Gas.HyperNoblium);