]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Rename Miasma to Ammonia (#22791)
authorKara <lunarautomaton6@gmail.com>
Thu, 21 Dec 2023 04:19:50 +0000 (21:19 -0700)
committerGitHub <noreply@github.com>
Thu, 21 Dec 2023 04:19:50 +0000 (21:19 -0700)
* Rename Miasma to Ammonia

* Namespace changes

* Map change????? why

40 files changed:
Content.Server/Atmos/Portable/PortableScrubberComponent.cs
Content.Server/Atmos/Reactions/AmmoniaOxygenReaction.cs [moved from Content.Server/Atmos/Reactions/MiasmaOxygenReaction.cs with 63% similarity]
Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs [deleted file]
Content.Server/Atmos/Rotting/RottingSystem.cs [moved from Content.Server/Atmos/Miasma/RottingSystem.cs with 95% similarity]
Content.Server/Cloning/CloningSystem.cs
Content.Server/Medical/DefibrillatorSystem.cs
Content.Server/RatKing/RatKingSystem.cs
Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs
Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs
Content.Shared/Atmos/Atmospherics.cs
Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs
Content.Shared/Atmos/Rotting/AntiRottingContainerComponent.cs [moved from Content.Shared/Atmos/Miasma/AntiRottingContainerComponent.cs with 81% similarity]
Content.Shared/Atmos/Rotting/PerishableComponent.cs [moved from Content.Shared/Atmos/Miasma/PerishableComponent.cs with 97% similarity]
Content.Shared/Atmos/Rotting/RotIntoComponent.cs [moved from Content.Shared/Atmos/Miasma/RotIntoComponent.cs with 95% similarity]
Content.Shared/Atmos/Rotting/RottingComponent.cs [moved from Content.Shared/Atmos/Miasma/RottingComponent.cs with 95% similarity]
Content.Shared/RatKing/RatKingComponent.cs
Resources/Locale/en-US/animals/rat-king/rat-king.ftl
Resources/Locale/en-US/disease/miasma.ftl
Resources/Locale/en-US/gases/gases.ftl
Resources/Locale/en-US/job/job-description.ftl
Resources/Locale/en-US/prototypes/entities/structures/storage/canisters/gas-canisters.ftl
Resources/Locale/en-US/reagents/meta/gases.ftl
Resources/Maps/Shuttles/emergency_meta.yml
Resources/Prototypes/Atmospherics/gases.yml
Resources/Prototypes/Atmospherics/reactions.yml
Resources/Prototypes/Atmospherics/thresholds.yml
Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
Resources/Prototypes/Datasets/Names/regalrat.yml
Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
Resources/Prototypes/Reagents/botany.yml
Resources/Prototypes/Reagents/gases.yml
Resources/Prototypes/XenoArch/Effects/normal_effects.yml
Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml

index 5cb84439b5ae52dbabc4f801d697cfc5c2284cb3..7ded9beb01c2ff189d6ed8e6256d72a8540dcdfb 100644 (file)
@@ -28,7 +28,7 @@ namespace Content.Server.Atmos.Portable
             Gas.Plasma,
             Gas.Tritium,
             Gas.WaterVapor,
-            Gas.Miasma,
+            Gas.Ammonia,
             Gas.NitrousOxide,
             Gas.Frezon
         };
similarity index 63%
rename from Content.Server/Atmos/Reactions/MiasmaOxygenReaction.cs
rename to Content.Server/Atmos/Reactions/AmmoniaOxygenReaction.cs
index 0d4e1ef71f1abc516ef90555788b1063323af0a2..197034ce5457f17086e61c39053e3ec66ba5e5cf 100644 (file)
@@ -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 (file)
index f9e8cbd..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Atmos;
-using JetBrains.Annotations;
-
-namespace Content.Server.Atmos.Reactions;
-
-/// <summary>
-///     Converts frezon into miasma when the two come into contact. Does not occur at very high temperatures.
-/// </summary>
-[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;
-    }
-}
similarity index 95%
rename from Content.Server/Atmos/Miasma/RottingSystem.cs
rename to Content.Server/Atmos/Rotting/RottingSystem.cs
index 698faa93c161f059b3fd6fe1e8152b21ecb6ac51..2d430a74ac60b4d1a533e8599be1b2fd530fb4fa 100644 (file)
@@ -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);
         }
     }
 }
index f8395c1080a479d12ee72e217ef147038ea0540b..97575c2d32fa468fefde0e95bd37cac5a41d536f 100644 (file)
@@ -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++;
index e2bd1926d445284d2efb2b83fc4b267f3388d238..f85ad8d1bf6f994e694c81fbd6ea317967a7612e 100644 (file)
@@ -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;
index b678652ab283148f9a167eb3cd656dbf3579160c..f676e89ac3f4875e5284ca6af02b72300121825d 100644 (file)
@@ -67,7 +67,7 @@ namespace Content.Server.RatKing
         }
 
         /// <summary>
-        /// 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.
         /// </summary>
         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)
index 066b14e91865005cd117d4e70e10902c6199f5cb..f92da0af19ec25175855f3843b5ee9ccd99ffcbe 100644 (file)
@@ -9,7 +9,7 @@ public sealed partial class GasLeakRuleComponent : Component
 {
     public readonly Gas[] LeakableGases =
     {
-        Gas.Miasma,
+        Gas.Ammonia,
         Gas.Plasma,
         Gas.Tritium,
         Gas.Frezon,
index a8c7a3dba361a50eef8d262786986bd9b2e56359..ee12326df3f744bb782b75768af6759a25a88ad1 100644 (file)
@@ -27,7 +27,7 @@ public sealed partial class GasArtifactComponent : Component
         Gas.Nitrogen,
         Gas.CarbonDioxide,
         Gas.Tritium,
-        Gas.Miasma,
+        Gas.Ammonia,
         Gas.NitrousOxide,
         Gas.Frezon
     };
index 8762637d52018a7e2cd3236dd3e63a6b06d42bd2..77cb86f47f3b785a5e7ecf4c8d96c7cf36580b74 100644 (file)
@@ -18,7 +18,7 @@ public sealed partial class ArtifactGasTriggerComponent : Component
         Gas.Plasma,
         Gas.Nitrogen,
         Gas.CarbonDioxide,
-        Gas.Miasma,
+        Gas.Ammonia,
         Gas.NitrousOxide
     };
 
index 148f03e2d9576ec5cbd8afb3d77c70396871a262..7765832ee43ee79195e43739d88976e4aff8a94a 100644 (file)
@@ -242,14 +242,9 @@ namespace Content.Shared.Atmos
         public const float N2ODecompositionRate = 2f;
 
         /// <summary>
-        ///     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.
         /// </summary>
-        public const float MiasmicSubsumationMaxConversionRate = 5f;
-
-        /// <summary>
-        ///     Divisor for Miasma Oxygen reaction so that it doesn't happen instantaneously.
-        /// </summary>
-        public const float MiasmaOxygenReactionRate = 10f;
+        public const float AmmoniaOxygenReactionRate = 10f;
 
         /// <summary>
         ///     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
     }
index 2ef5cebba506611bce968c652d63f710720b2a17..2a33306245035eea648eb582d8d0dd6ee20d5325 100644 (file)
@@ -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
         };
similarity index 81%
rename from Content.Shared/Atmos/Miasma/AntiRottingContainerComponent.cs
rename to Content.Shared/Atmos/Rotting/AntiRottingContainerComponent.cs
index 0557ec91336ba69b1de42e81213ff0afa669bc37..1a5ebccb2dd9a38bf3e40bbf584b6e8d8e6fa068 100644 (file)
@@ -1,4 +1,4 @@
-namespace Content.Shared.Atmos.Miasma;
+namespace Content.Shared.Atmos.Rotting;
 
 /// <summary>
 /// Entities inside this container will not rot.
similarity index 97%
rename from Content.Shared/Atmos/Miasma/PerishableComponent.cs
rename to Content.Shared/Atmos/Rotting/PerishableComponent.cs
index e7f1438bf6e353e529cca501c496c6b998f4632e..5a984c39fff83ba5ec58606d0e29214459fb77ab 100644 (file)
@@ -1,6 +1,6 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Shared.Atmos.Miasma;
+namespace Content.Shared.Atmos.Rotting;
 
 /// <summary>
 /// This makes mobs eventually start rotting when they die.
similarity index 95%
rename from Content.Shared/Atmos/Miasma/RotIntoComponent.cs
rename to Content.Shared/Atmos/Rotting/RotIntoComponent.cs
index 5f4a472c2e2cde2ee7cfe383c8e7056b63b675a1..14697e112f1b5b28acfcdfd9d999f9f25d63dd60 100644 (file)
@@ -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;
 
 /// <summary>
 /// Lets an entity rot into another entity.
similarity index 95%
rename from Content.Shared/Atmos/Miasma/RottingComponent.cs
rename to Content.Shared/Atmos/Rotting/RottingComponent.cs
index c5485eba6d3b48c713ba9646dd51f47a98f8a955..4314d22440a00e02eba69198869f66b094db0ca9 100644 (file)
@@ -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;
 
 /// <summary>
 /// Tracking component for stuff that has started to rot.
@@ -17,7 +17,7 @@ public sealed partial class RottingComponent : Component
     public bool DealDamage = true;
 
     /// <summary>
-    /// 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
     /// </summary>
     [DataField("nextRotUpdate", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan NextRotUpdate = TimeSpan.Zero;
index f2b06344c153dc1a81df626adbf288e3be2eae0b..712d4ae3a130a695495a7cfb1bff316ede37b8e3 100644 (file)
@@ -46,10 +46,10 @@ public sealed partial class RatKingComponent : Component
     public float HungerPerDomainUse = 50f;
 
     /// <summary>
-    ///     How many moles of Miasma are released after one us of Domain
+    ///     How many moles of ammonia are released after one us of Domain
     /// </summary>
-    [DataField("molesMiasmaPerDomain"), ViewVariables(VVAccess.ReadWrite)]
-    public float MolesMiasmaPerDomain = 200f;
+    [DataField("molesAmmoniaPerDomain"), ViewVariables(VVAccess.ReadWrite)]
+    public float MolesAmmoniaPerDomain = 200f;
 
     /// <summary>
     /// The current order that the Rat King assigned.
index f6235a2708962f3e45864904f5c277b89b847da5..bc06ab2ddd759f233f4aff1467e5c4394cce1685 100644 (file)
@@ -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!
 
index ecb162683e4c80e40f02b9d0a2cac4a431559a77..cc0c4117e5d458a7f809dbd1f14dba5549d0e647 100644 (file)
@@ -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]
index 3166cd059b3da6c0e8823dcbd4255bc1b0e82a88..e41aa4fc996b6cfc7ee27aaf8f643332fafa58fa 100644 (file)
@@ -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
index 37cc3d4d563c240dde24149f4478ad73a17e7ef2..5b989c1d5392c9688de449249550024e2870cbee 100644 (file)
@@ -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.
index 43358e3e6cc97980741e46cd6ff79c948449e696..a07dda96764acba945da8e45ef015f8e4b8028d4 100644 (file)
@@ -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 }
index f003da6d2d60fdeb0dcf09a9893f81e2633c508e..5460757be7378ecbac4630065912b99b16369118 100644 (file)
@@ -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...
 
index 32453ab12a880805dae3477af8bd42b4fb8a71aa..ee96df11aa03776ca09feae20b28ef39be63b13f 100644 (file)
@@ -4198,7 +4198,7 @@ entities:
             threshold: 1.5\r
             enabled: True\r
           ignore: False\r
-        Miasma:\r
+        Ammonia:\r
           lowerWarnAround:\r
             threshold: 0\r
             enabled: False\r
@@ -4364,7 +4364,7 @@ entities:
             threshold: 1.5\r
             enabled: True\r
           ignore: False\r
-        Miasma:\r
+        Ammonia:\r
           lowerWarnAround:\r
             threshold: 0\r
             enabled: False\r
@@ -4530,7 +4530,7 @@ entities:
             threshold: 1.5\r
             enabled: True\r
           ignore: False\r
-        Miasma:\r
+        Ammonia:\r
           lowerWarnAround:\r
             threshold: 0\r
             enabled: False\r
@@ -4696,7 +4696,7 @@ entities:
             threshold: 1.5\r
             enabled: True\r
           ignore: False\r
-        Miasma:\r
+        Ammonia:\r
           lowerWarnAround:\r
             threshold: 0\r
             enabled: False\r
@@ -4866,7 +4866,7 @@ entities:
             threshold: 1.5\r
             enabled: True\r
           ignore: False\r
-        Miasma:\r
+        Ammonia:\r
           lowerWarnAround:\r
             threshold: 0\r
             enabled: False\r
index fc257adfde0e35cf2d0c6e680ef35fb21010481a..c2b14c51776145cdddea3a79e92827c693672cba 100644 (file)
@@ -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
index 22ca8b66f9907df31f363154c4bc040d1dd9a0fa..d226c81f6cc5fef04616cace99ee47089c5d6f9c 100644 (file)
@@ -34,7 +34,7 @@
   - 0     # plasma
   - 0     # tritium
   - 0     # vapor
-  - 0     # miasma
+  - 0     # ammonia
   - 0     # n2o
   - 0.01  # frezon
   effects:
   - 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:
   - 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
   - 0     # plasma
   - 0     # tritium
   - 0     # vapor
-  - 0     # miasma
+  - 0     # ammonia
   - 0.01  # n2o
   - 0     # frezon
   effects:
index b93174a39a08db11283f97279eeff479c75e6221..462a0c8942cad51160e05a9601503f465ba76664 100644 (file)
@@ -54,7 +54,7 @@
     threshold: 0.5
 
 - type: alarmThreshold
-  id: stationMiasma
+  id: stationAmmonia
   upperBound: !type:AlarmThresholdSetting
     threshold: 0.05
   upperWarnAround: !type:AlarmThresholdSetting
index 71f6e53b248aeb933e2d4f708a20e93c6862c59c..8614319bf2b7b4d1b38c15b36e89a200c45139d1 100644 (file)
@@ -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
         - 0 # plasma
         - 0 # tritium
         - 0 # water vapor
-        - 0 # miasma
+        - 0 # ammonia
         - 0.615413715 # 30% N2O
         # 2.051379050       total
       temperature: 293.15
index 99f78a8696566e4e42e1b4b5cd583ba21ee02b30..e69c056843da0dd42e3cad9633ce1b6be70bd810 100644 (file)
@@ -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
index b3f09b999d93d005fb4ec01426f26d0cfc904f56..dd507e9516e5e3fa3e740fe9ade038d274101639 100644 (file)
 - 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
index 6017616ed95fa8df765ca2270e145886e8ae23ca..a2db895c5cfeab57857b07b64810c5ddf05c54a9 100644 (file)
@@ -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
index fb2f44158c8b5246d330f16874cf2a8433fe865e..637d0b56caf100bd21d307911a7f8ddbce82733f 100644 (file)
@@ -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
index 9db1eee927830ca4246633df2a4eab8771680186..61c04130bba9fc9efec46a4e41d241f2b770691a 100644 (file)
       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
index 05135da0ce96f2df65ac2e5a7f7a52cc6d700518..83fe7d206e06e1caaf7e54b4806e1af725d9540a 100644 (file)
@@ -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
         Plasma: danger # everything below is usually bad
         Tritium: danger
         WaterVapor: stationWaterVapor
-        Miasma: stationMiasma
+        Ammonia: stationAmmonia
         NitrousOxide: stationNO
         Frezon: danger
     - type: Tag
index 4466b21b4455deec12dcbd1ca199279ce0463f9c..34ae4d946faafcfd5fd4a57bba92438418193d60 100644 (file)
@@ -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
index 458f7178eaff1d4eca68a0f5d3bb32508a753573..65eb217549dbd11f3eee48e571fec909cd6a03ad 100644 (file)
           - 0 # Plasma
           - 0 # Tritium
           - 0 # Water vapor
-          - 0 # Miasma
+          - 0 # Ammonia
           - 0 # N2O
           - 0 # Frezon
         temperature: 293.15
 
 - type: entity
   parent: GasCanister
-  id: MiasmaCanister
+  id: AmmoniaCanister
   components:
     - type: Sprite
       layers:
           - 0 # Plasma
           - 0 # Tritium
           - 0 #  Water vapor
-          - 1871.71051 # Miasma
+          - 1871.71051 # Ammonia
         temperature: 293.15
     - type: Destructible
       thresholds:
             path: /Audio/Effects/metalbreak.ogg
         - !type:SpawnEntitiesBehavior
           spawn:
-            MiasmaCanisterBroken:
+            AmmoniaCanisterBroken:
               min: 1
               max: 1
         - !type:DoActsBehavior
           - 0 # Plasma
           - 0 # Tritium
           - 0 #  Water vapor
-          - 0 # Miasma
+          - 0 # Ammonia
           - 1871.71051 # N2O
         temperature: 293.15
     - type: Destructible
       - 0 # CO2
       - 0 # Plasma
       - 0 # Tritium
-      - 0 #  Water vapor
-      - 0 # Miasma
+      - 0 # Water vapor
+      - 0 # Ammonia
       - 0 # N2O
       - 1871.71051 # Frezon
       temperature: 293.15
 
 - type: entity
   parent: GasCanisterBrokenBase
-  id: MiasmaCanisterBroken
+  id: AmmoniaCanisterBroken
   noSpawn: true
   components:
     - type: Sprite
index 4929dc1cec5a4cbab914b322f0e6529f90730545..f6c55cf39464411105249efbea1213003d234435 100644 (file)
         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
index 22873ab2d7aa68268c03b40a8546998b83658f69..54bdbf3a4051f3af24d9abe19c2bf5aba644a521 100644 (file)
           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
index 05a7021e4e383dafcca7d2a102ee39c4eee8633c..40fb951b5d253a5fbc405eec3a4bca3404ba70c1 100644 (file)
     - CarbonDioxide
     - Plasma
     - Tritium
-    - Miasma
+    - Ammonia
     - NitrousOxide
     - Frezon
 
     maxRange: 3
     baseRadialAcceleration: 1
     baseTangentialAcceleration: 3
-  
+
 - type: artifactEffect
   id: EffectAntiMagnet
   targetDepth: 1
     maxRange: 3
     baseRadialAcceleration: -1
     baseTangentialAcceleration: -3
-  
+
 - type: artifactEffect
   id: EffectSingulo
   targetDepth: 10
index 4fc9d6c152086146d319d48a12efcf505bf12e38..64802c235a4a2b557da1948c618db5d1edc489c9 100644 (file)
@@ -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
 
   <Box>
@@ -42,7 +42,7 @@
    <GuideEntityEmbed Entity="MobRatServant" Caption="Rat Servant"/>
   </Box>
   - 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.
-  
+
   <Box>
     <GuideEntityEmbed Entity="MobCarp" Caption=""/>
     <GuideEntityEmbed Entity="CarpRift" Caption=""/>