diff --git a/Content.Server/Atmos/Portable/PortableScrubberComponent.cs b/Content.Server/Atmos/Portable/PortableScrubberComponent.cs index 5cb84439b5..7ded9beb01 100644 --- a/Content.Server/Atmos/Portable/PortableScrubberComponent.cs +++ b/Content.Server/Atmos/Portable/PortableScrubberComponent.cs @@ -28,7 +28,7 @@ namespace Content.Server.Atmos.Portable Gas.Plasma, Gas.Tritium, Gas.WaterVapor, - Gas.Miasma, + Gas.Ammonia, Gas.NitrousOxide, Gas.Frezon }; diff --git a/Content.Server/Atmos/Reactions/MiasmaOxygenReaction.cs b/Content.Server/Atmos/Reactions/AmmoniaOxygenReaction.cs similarity index 63% rename from Content.Server/Atmos/Reactions/MiasmaOxygenReaction.cs rename to Content.Server/Atmos/Reactions/AmmoniaOxygenReaction.cs index 0d4e1ef71f..197034ce54 100644 --- a/Content.Server/Atmos/Reactions/MiasmaOxygenReaction.cs +++ b/Content.Server/Atmos/Reactions/AmmoniaOxygenReaction.cs @@ -5,25 +5,25 @@ using JetBrains.Annotations; namespace Content.Server.Atmos.Reactions; [UsedImplicitly] -public sealed partial class MiasmaOxygenReaction : IGasReactionEffect +public sealed partial class AmmoniaOxygenReaction : IGasReactionEffect { public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem, float heatScale) { - var nMiasma = mixture.GetMoles(Gas.Miasma); + var nAmmonia = mixture.GetMoles(Gas.Ammonia); var nOxygen = mixture.GetMoles(Gas.Oxygen); var nTotal = mixture.TotalMoles; // Concentration-dependent reaction rate - var fMiasma = nMiasma/nTotal; + var fAmmonia = nAmmonia/nTotal; var fOxygen = nOxygen/nTotal; - var rate = MathF.Pow(fMiasma, 2) * MathF.Pow(fOxygen, 2); + var rate = MathF.Pow(fAmmonia, 2) * MathF.Pow(fOxygen, 2); - var deltaMoles = nMiasma / Atmospherics.MiasmaOxygenReactionRate * 2 * rate; + var deltaMoles = nAmmonia / Atmospherics.AmmoniaOxygenReactionRate * 2 * rate; - if (deltaMoles <= 0 || nMiasma - deltaMoles < 0) + if (deltaMoles <= 0 || nAmmonia - deltaMoles < 0) return ReactionResult.NoReaction; - mixture.AdjustMoles(Gas.Miasma, -deltaMoles); + mixture.AdjustMoles(Gas.Ammonia, -deltaMoles); mixture.AdjustMoles(Gas.Oxygen, -deltaMoles); mixture.AdjustMoles(Gas.NitrousOxide, deltaMoles / 2); mixture.AdjustMoles(Gas.WaterVapor, deltaMoles * 1.5f); diff --git a/Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs b/Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs deleted file mode 100644 index f9e8cbdf77..0000000000 --- a/Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Content.Server.Atmos.EntitySystems; -using Content.Shared.Atmos; -using JetBrains.Annotations; - -namespace Content.Server.Atmos.Reactions; - -/// -/// Converts frezon into miasma when the two come into contact. Does not occur at very high temperatures. -/// -[UsedImplicitly] -public sealed partial class MiasmicSubsumationReaction : IGasReactionEffect -{ - public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem, float heatScale) - { - var initialMiasma = mixture.GetMoles(Gas.Miasma); - var initialFrezon = mixture.GetMoles(Gas.Frezon); - - var convert = Math.Min(Math.Min(initialFrezon, initialMiasma), Atmospherics.MiasmicSubsumationMaxConversionRate); - - mixture.AdjustMoles(Gas.Miasma, convert); - mixture.AdjustMoles(Gas.Frezon, -convert); - - return ReactionResult.Reacting; - } -} diff --git a/Content.Server/Atmos/Miasma/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs similarity index 95% rename from Content.Server/Atmos/Miasma/RottingSystem.cs rename to Content.Server/Atmos/Rotting/RottingSystem.cs index 698faa93c1..2d430a74ac 100644 --- a/Content.Server/Atmos/Miasma/RottingSystem.cs +++ b/Content.Server/Atmos/Rotting/RottingSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Atmos; using Content.Server.Atmos.EntitySystems; using Content.Server.Body.Components; using Content.Server.Temperature.Components; -using Content.Shared.Atmos.Miasma; +using Content.Shared.Atmos.Rotting; using Content.Shared.Examine; using Content.Shared.Mobs; using Content.Shared.Mobs.Components; @@ -14,7 +14,7 @@ using Robust.Server.GameObjects; using Robust.Shared.Physics.Components; using Robust.Shared.Timing; -namespace Content.Server.Atmos.Miasma; +namespace Content.Server.Atmos.Rotting; public sealed class RottingSystem : EntitySystem { @@ -119,7 +119,7 @@ public sealed class RottingSystem : EntitySystem var molsToDump = perishable.MolsPerSecondPerUnitMass * physics.FixturesMass * (float) component.TotalRotTime.TotalSeconds; var tileMix = _atmosphere.GetTileMixture(uid, excite: true); - tileMix?.AdjustMoles(Gas.Miasma, molsToDump); + tileMix?.AdjustMoles(Gas.Ammonia, molsToDump); } private void OnExamined(EntityUid uid, RottingComponent component, ExaminedEvent args) @@ -127,9 +127,9 @@ public sealed class RottingSystem : EntitySystem var stage = RotStage(uid, component); var description = stage switch { - >= 2 => "miasma-extremely-bloated", - >= 1 => "miasma-bloated", - _ => "miasma-rotting" + >= 2 => "rotting-extremely-bloated", + >= 1 => "rotting-bloated", + _ => "rotting-rotting" }; args.PushMarkup(Loc.GetString(description)); } @@ -213,7 +213,7 @@ public sealed class RottingSystem : EntitySystem // or just remove the mass mechanics altogether because they aren't good. var molRate = perishable.MolsPerSecondPerUnitMass * (float) rotting.RotUpdateRate.TotalSeconds; var tileMix = _atmosphere.GetTileMixture(uid, excite: true); - tileMix?.AdjustMoles(Gas.Miasma, molRate * physics.FixturesMass); + tileMix?.AdjustMoles(Gas.Ammonia, molRate * physics.FixturesMass); } } } diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs index f8395c1080..97575c2d32 100644 --- a/Content.Server/Cloning/CloningSystem.cs +++ b/Content.Server/Cloning/CloningSystem.cs @@ -353,7 +353,7 @@ namespace Content.Server.Cloning var i = 0; while (i < 1) { - tileMix?.AdjustMoles(Gas.Miasma, 6f); + tileMix?.AdjustMoles(Gas.Ammonia, 6f); bloodSolution.AddReagent("Blood", 50); if (_robustRandom.Prob(0.2f)) i++; diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs index e2bd1926d4..f85ad8d1bf 100644 --- a/Content.Server/Medical/DefibrillatorSystem.cs +++ b/Content.Server/Medical/DefibrillatorSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Atmos.Miasma; +using Content.Server.Atmos.Rotting; using Content.Server.Chat.Systems; using Content.Server.DoAfter; using Content.Server.Electrocution; diff --git a/Content.Server/RatKing/RatKingSystem.cs b/Content.Server/RatKing/RatKingSystem.cs index b678652ab2..f676e89ac3 100644 --- a/Content.Server/RatKing/RatKingSystem.cs +++ b/Content.Server/RatKing/RatKingSystem.cs @@ -67,7 +67,7 @@ namespace Content.Server.RatKing } /// - /// uses hunger to release a specific amount of miasma into the air. This heals the rat king + /// uses hunger to release a specific amount of ammonia into the air. This heals the rat king /// and his servants through a specific metabolism. /// private void OnDomain(EntityUid uid, RatKingComponent component, RatKingDomainActionEvent args) @@ -89,7 +89,7 @@ namespace Content.Server.RatKing _popup.PopupEntity(Loc.GetString("rat-king-domain-popup"), uid); var tileMix = _atmos.GetTileMixture(uid, excite: true); - tileMix?.AdjustMoles(Gas.Miasma, component.MolesMiasmaPerDomain); + tileMix?.AdjustMoles(Gas.Ammonia, component.MolesAmmoniaPerDomain); } private void OnPointedAt(EntityUid uid, RatKingComponent component, ref AfterPointedAtEvent args) diff --git a/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs b/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs index 066b14e918..f92da0af19 100644 --- a/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs +++ b/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs @@ -9,7 +9,7 @@ public sealed partial class GasLeakRuleComponent : Component { public readonly Gas[] LeakableGases = { - Gas.Miasma, + Gas.Ammonia, Gas.Plasma, Gas.Tritium, Gas.Frezon, diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs index a8c7a3dba3..ee12326df3 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs @@ -27,7 +27,7 @@ public sealed partial class GasArtifactComponent : Component Gas.Nitrogen, Gas.CarbonDioxide, Gas.Tritium, - Gas.Miasma, + Gas.Ammonia, Gas.NitrousOxide, Gas.Frezon }; diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs index 8762637d52..77cb86f47f 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs @@ -18,7 +18,7 @@ public sealed partial class ArtifactGasTriggerComponent : Component Gas.Plasma, Gas.Nitrogen, Gas.CarbonDioxide, - Gas.Miasma, + Gas.Ammonia, Gas.NitrousOxide }; diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs index 148f03e2d9..7765832ee4 100644 --- a/Content.Shared/Atmos/Atmospherics.cs +++ b/Content.Shared/Atmos/Atmospherics.cs @@ -242,14 +242,9 @@ namespace Content.Shared.Atmos public const float N2ODecompositionRate = 2f; /// - /// How many mol of frezon can be converted into miasma in one cycle. + /// Divisor for Ammonia Oxygen reaction so that it doesn't happen instantaneously. /// - public const float MiasmicSubsumationMaxConversionRate = 5f; - - /// - /// Divisor for Miasma Oxygen reaction so that it doesn't happen instantaneously. - /// - public const float MiasmaOxygenReactionRate = 10f; + public const float AmmoniaOxygenReactionRate = 10f; /// /// Determines at what pressure the ultra-high pressure red icon is displayed. @@ -334,7 +329,7 @@ namespace Content.Shared.Atmos Plasma = 3, Tritium = 4, WaterVapor = 5, - Miasma = 6, + Ammonia = 6, NitrousOxide = 7, Frezon = 8 } diff --git a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs index 2ef5cebba5..2a33306245 100644 --- a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs +++ b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs @@ -20,7 +20,7 @@ namespace Content.Shared.Atmos.Piping.Unary.Components Gas.Plasma, Gas.Tritium, Gas.WaterVapor, - Gas.Miasma, + Gas.Ammonia, Gas.NitrousOxide, Gas.Frezon }; diff --git a/Content.Shared/Atmos/Miasma/AntiRottingContainerComponent.cs b/Content.Shared/Atmos/Rotting/AntiRottingContainerComponent.cs similarity index 81% rename from Content.Shared/Atmos/Miasma/AntiRottingContainerComponent.cs rename to Content.Shared/Atmos/Rotting/AntiRottingContainerComponent.cs index 0557ec9133..1a5ebccb2d 100644 --- a/Content.Shared/Atmos/Miasma/AntiRottingContainerComponent.cs +++ b/Content.Shared/Atmos/Rotting/AntiRottingContainerComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Atmos.Miasma; +namespace Content.Shared.Atmos.Rotting; /// /// Entities inside this container will not rot. diff --git a/Content.Shared/Atmos/Miasma/PerishableComponent.cs b/Content.Shared/Atmos/Rotting/PerishableComponent.cs similarity index 97% rename from Content.Shared/Atmos/Miasma/PerishableComponent.cs rename to Content.Shared/Atmos/Rotting/PerishableComponent.cs index e7f1438bf6..5a984c39ff 100644 --- a/Content.Shared/Atmos/Miasma/PerishableComponent.cs +++ b/Content.Shared/Atmos/Rotting/PerishableComponent.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; -namespace Content.Shared.Atmos.Miasma; +namespace Content.Shared.Atmos.Rotting; /// /// This makes mobs eventually start rotting when they die. diff --git a/Content.Shared/Atmos/Miasma/RotIntoComponent.cs b/Content.Shared/Atmos/Rotting/RotIntoComponent.cs similarity index 95% rename from Content.Shared/Atmos/Miasma/RotIntoComponent.cs rename to Content.Shared/Atmos/Rotting/RotIntoComponent.cs index 5f4a472c2e..14697e112f 100644 --- a/Content.Shared/Atmos/Miasma/RotIntoComponent.cs +++ b/Content.Shared/Atmos/Rotting/RotIntoComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.GameStates; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Atmos.Miasma; +namespace Content.Shared.Atmos.Rotting; /// /// Lets an entity rot into another entity. diff --git a/Content.Shared/Atmos/Miasma/RottingComponent.cs b/Content.Shared/Atmos/Rotting/RottingComponent.cs similarity index 95% rename from Content.Shared/Atmos/Miasma/RottingComponent.cs rename to Content.Shared/Atmos/Rotting/RottingComponent.cs index c5485eba6d..4314d22440 100644 --- a/Content.Shared/Atmos/Miasma/RottingComponent.cs +++ b/Content.Shared/Atmos/Rotting/RottingComponent.cs @@ -2,7 +2,7 @@ using Content.Shared.Damage; using Robust.Shared.GameStates; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; -namespace Content.Shared.Atmos.Miasma; +namespace Content.Shared.Atmos.Rotting; /// /// Tracking component for stuff that has started to rot. @@ -17,7 +17,7 @@ public sealed partial class RottingComponent : Component public bool DealDamage = true; /// - /// When the next check will happen for rot progression + effects like damage and miasma + /// When the next check will happen for rot progression + effects like damage and ammonia /// [DataField("nextRotUpdate", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)] public TimeSpan NextRotUpdate = TimeSpan.Zero; diff --git a/Content.Shared/RatKing/RatKingComponent.cs b/Content.Shared/RatKing/RatKingComponent.cs index f2b06344c1..712d4ae3a1 100644 --- a/Content.Shared/RatKing/RatKingComponent.cs +++ b/Content.Shared/RatKing/RatKingComponent.cs @@ -46,10 +46,10 @@ public sealed partial class RatKingComponent : Component public float HungerPerDomainUse = 50f; /// - /// How many moles of Miasma are released after one us of Domain + /// How many moles of ammonia are released after one us of Domain /// - [DataField("molesMiasmaPerDomain"), ViewVariables(VVAccess.ReadWrite)] - public float MolesMiasmaPerDomain = 200f; + [DataField("molesAmmoniaPerDomain"), ViewVariables(VVAccess.ReadWrite)] + public float MolesAmmoniaPerDomain = 200f; /// /// The current order that the Rat King assigned. diff --git a/Resources/Locale/en-US/animals/rat-king/rat-king.ftl b/Resources/Locale/en-US/animals/rat-king/rat-king.ftl index f6235a2708..bc06ab2ddd 100644 --- a/Resources/Locale/en-US/animals/rat-king/rat-king.ftl +++ b/Resources/Locale/en-US/animals/rat-king/rat-king.ftl @@ -1,4 +1,4 @@ -rat-king-domain-popup = A cloud of miasma is released into the air! +rat-king-domain-popup = A cloud of ammonia is released into the air! rat-king-too-hungry = You are too hungry to use this ability! diff --git a/Resources/Locale/en-US/disease/miasma.ftl b/Resources/Locale/en-US/disease/miasma.ftl index ecb162683e..cc0c4117e5 100644 --- a/Resources/Locale/en-US/disease/miasma.ftl +++ b/Resources/Locale/en-US/disease/miasma.ftl @@ -1,4 +1,4 @@ -miasma-smell = Something smells foul! -miasma-rotting = [color=orange]It's rotting![/color] -miasma-bloated = [color=orangered]It's bloated![/color] -miasma-extremely-bloated = [color=red]It's extremely bloated![/color] +ammonia-smell = Something smells pungent! +rotting-rotting = [color=orange]It's rotting![/color] +rotting-bloated = [color=orangered]It's bloated![/color] +rotting-extremely-bloated = [color=red]It's extremely bloated![/color] diff --git a/Resources/Locale/en-US/gases/gases.ftl b/Resources/Locale/en-US/gases/gases.ftl index 3166cd059b..e41aa4fc99 100644 --- a/Resources/Locale/en-US/gases/gases.ftl +++ b/Resources/Locale/en-US/gases/gases.ftl @@ -4,6 +4,6 @@ gases-co2 = Carbon Dioxide gases-plasma = Plasma gases-tritium = Tritium gases-water-vapor = Water Vapor -gases-miasma = Miasma +gases-ammonia = Ammonia gases-n2o = Nitrous Oxide gases-frezon = Frezon diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index 37cc3d4d56..5b989c1d53 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -11,7 +11,7 @@ job-description-cargotech = Deal with requisitions and deliveries for emergencie job-description-ce = Manage the engineering department to ensure power, atmospherics, and the hull are in perfect shape. job-description-centcomoff = Act as an ambassador to the newest state-of-the-art space station in Nanotrasen's fleet. job-description-chaplain = Preach the good word of your deity and religion, and conduct spiritual healing. -job-description-chef = Keep the station fed with a variety of food items, butcher dead animals to ensure miasma doesn't leak, and help keep the bar lively. +job-description-chef = Keep the station fed with a variety of food items, butcher dead animals to ensure ammonia doesn't leak, and help keep the bar lively. job-description-chemist = Produce medicinal drugs for the doctors to use, research ethically dubious rare chemicals, and produce weapons of war when enemies of the station arrive. job-description-clown = Entertain the crew through elaborate slapstick routines or terrible jokes. job-description-cmo = Manage the resources and personnel of the medical department to keep the crew alive. diff --git a/Resources/Locale/en-US/prototypes/entities/structures/storage/canisters/gas-canisters.ftl b/Resources/Locale/en-US/prototypes/entities/structures/storage/canisters/gas-canisters.ftl index 43358e3e6c..a07dda9676 100644 --- a/Resources/Locale/en-US/prototypes/entities/structures/storage/canisters/gas-canisters.ftl +++ b/Resources/Locale/en-US/prototypes/entities/structures/storage/canisters/gas-canisters.ftl @@ -34,8 +34,8 @@ ent-TritiumCanister = Tritium canister ent-WaterVaporCanister = Water vapor canister .desc = A canister that can contain any type of gas. This one is supposed to contain water vapor. It can be attached to connector ports using a wrench. -ent-MiasmaCanister = Miasma canister - .desc = A canister that can contain any type of gas. This one is supposed to contain miasma. It can be attached to connector ports using a wrench. +ent-AmmoniaCanister = Ammonia canister + .desc = A canister that can contain any type of gas. This one is supposed to contain ammonia. It can be attached to connector ports using a wrench. ent-NitrousOxideCanister = Nitrous oxide canister .desc = A canister that can contain any type of gas. This one is supposed to contain nitrous oxide. It can be attached to connector ports using a wrench. @@ -70,7 +70,7 @@ ent-TritiumCanisterBroken = { ent-GasCanisterBrokenBase } ent-WaterVaporCanisterBroken = { ent-GasCanisterBrokenBase } .desc = { ent-GasCanisterBrokenBase.desc } -ent-MiasmaCanisterBroken = { ent-GasCanisterBrokenBase } +ent-AmmoniaCanisterBroken = { ent-GasCanisterBrokenBase } .desc = { ent-GasCanisterBrokenBase.desc } ent-NitrousOxideCanisterBroken = { ent-GasCanisterBrokenBase } diff --git a/Resources/Locale/en-US/reagents/meta/gases.ftl b/Resources/Locale/en-US/reagents/meta/gases.ftl index f003da6d2d..5460757be7 100644 --- a/Resources/Locale/en-US/reagents/meta/gases.ftl +++ b/Resources/Locale/en-US/reagents/meta/gases.ftl @@ -13,9 +13,6 @@ reagent-desc-carbon-dioxide = You have genuinely no idea what this is. reagent-name-nitrogen = nitrogen reagent-desc-nitrogen = A colorless, odorless unreactive gas. Highly stable. -reagent-name-miasma = miasma -reagent-desc-miasma = Uh oh, stinky! - reagent-name-nitrous-oxide = nitrous oxide reagent-desc-nitrous-oxide = You know how everything seems funnier when you're tired? Well... diff --git a/Resources/Maps/Shuttles/emergency_meta.yml b/Resources/Maps/Shuttles/emergency_meta.yml index 32453ab12a..ee96df11aa 100644 --- a/Resources/Maps/Shuttles/emergency_meta.yml +++ b/Resources/Maps/Shuttles/emergency_meta.yml @@ -4198,7 +4198,7 @@ entities: threshold: 1.5 enabled: True ignore: False - Miasma: + Ammonia: lowerWarnAround: threshold: 0 enabled: False @@ -4364,7 +4364,7 @@ entities: threshold: 1.5 enabled: True ignore: False - Miasma: + Ammonia: lowerWarnAround: threshold: 0 enabled: False @@ -4530,7 +4530,7 @@ entities: threshold: 1.5 enabled: True ignore: False - Miasma: + Ammonia: lowerWarnAround: threshold: 0 enabled: False @@ -4696,7 +4696,7 @@ entities: threshold: 1.5 enabled: True ignore: False - Miasma: + Ammonia: lowerWarnAround: threshold: 0 enabled: False @@ -4866,7 +4866,7 @@ entities: threshold: 1.5 enabled: True ignore: False - Miasma: + Ammonia: lowerWarnAround: threshold: 0 enabled: False diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml index fc257adfde..c2b14c5177 100644 --- a/Resources/Prototypes/Atmospherics/gases.yml +++ b/Resources/Prototypes/Atmospherics/gases.yml @@ -66,7 +66,7 @@ - type: gas id: 6 - name: gases-miasma + name: gases-ammonia specificHeat: 20 heatCapacityRatio: 1.4 molarMass: 44 @@ -75,7 +75,7 @@ gasMolesVisible: 2 gasVisbilityFactor: 3.5 color: 56941E - reagent: Miasma + reagent: Ammonia pricePerMole: 0.15 - type: gas diff --git a/Resources/Prototypes/Atmospherics/reactions.yml b/Resources/Prototypes/Atmospherics/reactions.yml index 22ca8b66f9..d226c81f6c 100644 --- a/Resources/Prototypes/Atmospherics/reactions.yml +++ b/Resources/Prototypes/Atmospherics/reactions.yml @@ -34,7 +34,7 @@ - 0 # plasma - 0 # tritium - 0 # vapor - - 0 # miasma + - 0 # ammonia - 0 # n2o - 0.01 # frezon effects: @@ -51,31 +51,14 @@ - 0 # plasma - 0.01 # tritium - 0 # vapor - - 0 # miasma + - 0 # ammonia - 0 # n2o - 0 # frezon effects: - !type:FrezonProductionReaction {} - type: gasReaction - id: MiasmicSubsumation - priority: 0 - maximumTemperature: 5066.25 - minimumRequirements: - - 0 # oxygen - - 0 # nitrogen - - 0 # carbon dioxide - - 0 # plasma - - 0 # tritium - - 0 # vapor - - 0.01 # miasma - - 0 # n2o - - 0.01 # frezon - effects: - - !type:MiasmicSubsumationReaction {} - -- type: gasReaction - id: MiasmaOxygenReaction + id: AmmoniaOxygenReaction priority: 2 minimumTemperature: 323.149 minimumRequirements: @@ -85,11 +68,11 @@ - 0 # plasma - 0 # tritium - 0 # vapor - - 0.01 # miasma + - 0.01 # ammonia - 0 # n2o - 0 # frezon effects: - - !type:MiasmaOxygenReaction {} + - !type:AmmoniaOxygenReaction {} - type: gasReaction id: N2ODecomposition @@ -102,7 +85,7 @@ - 0 # plasma - 0 # tritium - 0 # vapor - - 0 # miasma + - 0 # ammonia - 0.01 # n2o - 0 # frezon effects: diff --git a/Resources/Prototypes/Atmospherics/thresholds.yml b/Resources/Prototypes/Atmospherics/thresholds.yml index b93174a39a..462a0c8942 100644 --- a/Resources/Prototypes/Atmospherics/thresholds.yml +++ b/Resources/Prototypes/Atmospherics/thresholds.yml @@ -54,7 +54,7 @@ threshold: 0.5 - type: alarmThreshold - id: stationMiasma + id: stationAmmonia upperBound: !type:AlarmThresholdSetting threshold: 0.05 upperWarnAround: !type:AlarmThresholdSetting diff --git a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml index 71f6e53b24..8614319bf2 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml @@ -68,7 +68,7 @@ - 0 # oxygen - 0.615413715 #nitrogen temperature: 293.15 - + - type: entity id: ExtendedEmergencyOxygenTankFilled parent: ExtendedEmergencyOxygenTank @@ -82,7 +82,7 @@ moles: - 0.615413715 # oxygen temperature: 293.15 - + - type: entity id: ExtendedEmergencyNitrogenTankFilled parent: ExtendedEmergencyNitrogenTank @@ -182,7 +182,7 @@ - 0 # plasma - 0 # tritium - 0 # water vapor - - 0 # miasma + - 0 # ammonia - 0.615413715 # 30% N2O # 2.051379050 total temperature: 293.15 diff --git a/Resources/Prototypes/Datasets/Names/regalrat.yml b/Resources/Prototypes/Datasets/Names/regalrat.yml index 99f78a8696..e69c056843 100644 --- a/Resources/Prototypes/Datasets/Names/regalrat.yml +++ b/Resources/Prototypes/Datasets/Names/regalrat.yml @@ -2,7 +2,7 @@ id: RegalRatNameKingdom values: - Plague - - Miasma + - Ammonia - Maintenance - Trash - Garbage @@ -36,4 +36,4 @@ - Mayor - Boss - Prophet - - Cheese \ No newline at end of file + - Cheese diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index b3f09b999d..dd507e9516 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -289,7 +289,7 @@ - type: entity id: ActionRatKingDomain name: Rat King's Domain - description: Spend some hunger to release a cloud of miasma into the air. + description: Spend some hunger to release a cloud of ammonia into the air. noSpawn: true components: - type: InstantAction diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 6017616ed9..a2db895c5c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -62,7 +62,7 @@ - type: Perishable # raw meat rots in 5 minutes, get it into the freezer fast rotAfter: 300 - # don't want meat giving off miasma only bodies + # don't want meat giving off ammonia only bodies molsPerSecondPerUnitMass: 0 - type: RotInto entity: FoodMeatRotten diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index fb2f44158c..637d0b56ca 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -13,7 +13,7 @@ - Plasma - Tritium - WaterVapor - - Miasma + - Ammonia - NitrousOxide - Frezon #- Helium3 TODO: fusion @@ -24,7 +24,7 @@ - Plasma - Tritium - WaterVapor - - Miasma + - Ammonia - NitrousOxide - Frezon #- Helium3 TODO: fusion diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml index 9db1eee927..61c04130bb 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml @@ -131,14 +131,14 @@ spawnGas: WaterVapor - type: entity - name: Miasma gas miner + name: Ammonia gas miner parent: GasMinerBase - id: GasMinerMiasma + id: GasMinerAmmonia placement: mode: SnapgridCenter components: - type: GasMiner - spawnGas: Miasma + spawnGas: Ammonia - type: entity name: Nitrous Oxide gas miner diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index 05135da0ce..83fe7d206e 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml @@ -50,7 +50,7 @@ Plasma: danger # everything below is usually bad Tritium: danger WaterVapor: stationWaterVapor - Miasma: stationMiasma + Ammonia: stationAmmonia NitrousOxide: stationNO Frezon: danger - type: Tag @@ -141,7 +141,7 @@ Plasma: danger # everything below is usually bad Tritium: danger WaterVapor: stationWaterVapor - Miasma: stationMiasma + Ammonia: stationAmmonia NitrousOxide: stationNO Frezon: danger - type: Tag diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml index 4466b21b44..34ae4d946f 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml @@ -55,7 +55,7 @@ Plasma: danger # everything below is usually bad Tritium: danger WaterVapor: stationWaterVapor - Miasma: stationMiasma + Ammonia: stationAmmonia NitrousOxide: stationNO Frezon: danger - type: Tag diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index 458f7178ea..65eb217549 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -120,7 +120,7 @@ - 0 # Plasma - 0 # Tritium - 0 # Water vapor - - 0 # Miasma + - 0 # Ammonia - 0 # N2O - 0 # Frezon temperature: 293.15 @@ -475,7 +475,7 @@ - type: entity parent: GasCanister - id: MiasmaCanister + id: AmmoniaCanister components: - type: Sprite layers: @@ -490,7 +490,7 @@ - 0 # Plasma - 0 # Tritium - 0 # Water vapor - - 1871.71051 # Miasma + - 1871.71051 # Ammonia temperature: 293.15 - type: Destructible thresholds: @@ -509,7 +509,7 @@ path: /Audio/Effects/metalbreak.ogg - !type:SpawnEntitiesBehavior spawn: - MiasmaCanisterBroken: + AmmoniaCanisterBroken: min: 1 max: 1 - !type:DoActsBehavior @@ -535,7 +535,7 @@ - 0 # Plasma - 0 # Tritium - 0 # Water vapor - - 0 # Miasma + - 0 # Ammonia - 1871.71051 # N2O temperature: 293.15 - type: Destructible @@ -578,8 +578,8 @@ - 0 # CO2 - 0 # Plasma - 0 # Tritium - - 0 # Water vapor - - 0 # Miasma + - 0 # Water vapor + - 0 # Ammonia - 0 # N2O - 1871.71051 # Frezon temperature: 293.15 @@ -730,7 +730,7 @@ - type: entity parent: GasCanisterBrokenBase - id: MiasmaCanisterBroken + id: AmmoniaCanisterBroken noSpawn: true components: - type: Sprite diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml index 4929dc1cec..f6c55cf394 100644 --- a/Resources/Prototypes/Reagents/botany.yml +++ b/Resources/Prototypes/Reagents/botany.yml @@ -202,6 +202,52 @@ damage: types: Caustic: 1 + Gas: + effects: + - !type:HealthChange + conditions: + - !type:OrganType + type: Rat + shouldHave: false + - !type:ReagentThreshold + reagent: Ammonia + min: 1 + ignoreResistances: true + damage: + types: + Poison: 0.25 + - !type:ChemVomit + probability: 0.12 + conditions: + - !type:OrganType + type: Rat + shouldHave: false + - !type:ReagentThreshold + reagent: Ammonia + min: 0.8 + - !type:PopupMessage + type: Local + visualType: Medium + messages: [ "ammonia-smell" ] + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Ammonia + min: 0.25 + - !type:HealthChange + conditions: + - !type:OrganType + type: Rat + - !type:ReagentThreshold + reagent: Ammonia + min: 1 + scaleByQuantity: true + ignoreResistances: true + damage: + groups: + Brute: -5 + Burn: -5 + - type: reagent id: Diethylamine diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 22873ab2d7..54bdbf3a40 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -188,62 +188,6 @@ NitrousOxide: 1.0 Nitrogen: -1.0 -- type: reagent - id: Miasma - name: reagent-name-miasma - desc: reagent-desc-miasma - physicalDesc: reagent-physical-desc-gaseous - flavor: bitter - color: "#56941E" - boilingPoint: -195.8 - meltingPoint: -210.0 - metabolisms: - Gas: - effects: - - !type:HealthChange - conditions: - - !type:OrganType - type: Rat - shouldHave: false - - !type:ReagentThreshold - reagent: Miasma - min: 1 - ignoreResistances: true - damage: - types: - Poison: 0.25 - - !type:ChemVomit - probability: 0.12 - conditions: - - !type:OrganType - type: Rat - shouldHave: false - - !type:ReagentThreshold - reagent: Miasma - min: 0.8 - - !type:PopupMessage - type: Local - visualType: Medium - messages: [ "miasma-smell" ] - probability: 0.1 - conditions: - - !type:ReagentThreshold - reagent: Miasma - min: 0.25 - - !type:HealthChange - conditions: - - !type:OrganType - type: Rat - - !type:ReagentThreshold - reagent: Miasma - min: 1 - scaleByQuantity: true - ignoreResistances: true - damage: - groups: - Brute: -5 - Burn: -5 - - type: reagent id: NitrousOxide name: reagent-name-nitrous-oxide diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index 05a7021e4e..40fb951b5d 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -346,7 +346,7 @@ - CarbonDioxide - Plasma - Tritium - - Miasma + - Ammonia - NitrousOxide - Frezon @@ -570,7 +570,7 @@ maxRange: 3 baseRadialAcceleration: 1 baseTangentialAcceleration: 3 - + - type: artifactEffect id: EffectAntiMagnet targetDepth: 1 @@ -580,7 +580,7 @@ maxRange: 3 baseRadialAcceleration: -1 baseTangentialAcceleration: -3 - + - type: artifactEffect id: EffectSingulo targetDepth: 10 diff --git a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml index 4fc9d6c152..64802c235a 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml @@ -2,7 +2,7 @@ # Minor Antagonists Most if not all Minor Antagonists are ghost-controlled roles that gives dead people new ways to cause chaos around the station. They are spawned by random events. - + # Revenant @@ -42,7 +42,7 @@ - Raise an Army of [color=#a4885c]Rat Servants[/color]. - - Conjure a cloud of miasma. + - Conjure a cloud of ammonia. # Space Dragon @@ -53,9 +53,9 @@ A Space Dragon is a giant dragon that creates space carp rifts and eat the crew. ## Abilities - + - Devour critical or dead victims. - +