tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename Miasma to Ammonia (#22791)

Browse Source 
* Rename Miasma to Ammonia

* Namespace changes

* Map change????? why
This commit is contained in:
Kara
2023-12-20 21:19:50 -07:00
committed by GitHub
parent bf7c788099
commit ad97580727
40 changed files with 134 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Atmos/Portable/PortableScrubberComponent.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Server.Atmos.Portable
Gas.Plasma,
Gas.Tritium,
Gas.WaterVapor,
Gas.Miasma,
Gas.Ammonia,
Gas.NitrousOxide,
Gas.Frezon
};

14
Content.Server/Atmos/Reactions/MiasmaOxygenReaction.cs → Content.Server/Atmos/Reactions/AmmoniaOxygenReaction.cs
View 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);

25
Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs
View File

@@ -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;
}
}

14
Content.Server/Atmos/Miasma/RottingSystem.cs → Content.Server/Atmos/Rotting/RottingSystem.cs
View 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);
}
}
}

2
Content.Server/Cloning/CloningSystem.cs
View 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++;

2
Content.Server/Medical/DefibrillatorSystem.cs
View 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;

4
Content.Server/RatKing/RatKingSystem.cs
View 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)

2
Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
View 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,

2
Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs
View 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
};

2
Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs
View File

@@ -18,7 +18,7 @@ public sealed partial class ArtifactGasTriggerComponent : Component
Gas.Plasma,
Gas.Nitrogen,
Gas.CarbonDioxide,
Gas.Miasma,
Gas.Ammonia,
Gas.NitrousOxide
};

11
Content.Shared/Atmos/Atmospherics.cs
View 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
}

2
Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs
View 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
};

2
Content.Shared/Atmos/Miasma/AntiRottingContainerComponent.cs → Content.Shared/Atmos/Rotting/AntiRottingContainerComponent.cs
View File

@@ -1,4 +1,4 @@
namespace Content.Shared.Atmos.Miasma;
namespace Content.Shared.Atmos.Rotting;
/// <summary>
/// Entities inside this container will not rot.

2
Content.Shared/Atmos/Miasma/PerishableComponent.cs → Content.Shared/Atmos/Rotting/PerishableComponent.cs
View 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.

2
Content.Shared/Atmos/Miasma/RotIntoComponent.cs → Content.Shared/Atmos/Rotting/RotIntoComponent.cs
View 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.

4
Content.Shared/Atmos/Miasma/RottingComponent.cs → Content.Shared/Atmos/Rotting/RottingComponent.cs
View 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;

6
Content.Shared/RatKing/RatKingComponent.cs
View 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.

2
Resources/Locale/en-US/animals/rat-king/rat-king.ftl
View 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!

8
Resources/Locale/en-US/disease/miasma.ftl
View 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]

2
Resources/Locale/en-US/gases/gases.ftl
View 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

2
Resources/Locale/en-US/job/job-description.ftl
View 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.

6
Resources/Locale/en-US/prototypes/entities/structures/storage/canisters/gas-canisters.ftl
View 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 }

3
Resources/Locale/en-US/reagents/meta/gases.ftl
View 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...

10
Resources/Maps/Shuttles/emergency_meta.yml
View File

@@ -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

4
Resources/Prototypes/Atmospherics/gases.yml
View 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

29
Resources/Prototypes/Atmospherics/reactions.yml
View File

@@ -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:

2
Resources/Prototypes/Atmospherics/thresholds.yml
View File

@@ -54,7 +54,7 @@
threshold: 0.5
- type: alarmThreshold
id: stationMiasma
id: stationAmmonia
upperBound: !type:AlarmThresholdSetting
threshold: 0.05
upperWarnAround: !type:AlarmThresholdSetting

2
Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
View File

@@ -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

2
Resources/Prototypes/Datasets/Names/regalrat.yml
View File

@@ -2,7 +2,7 @@
id: RegalRatNameKingdom
values:
- Plague
- Miasma
- Ammonia
- Maintenance
- Trash
- Garbage

2
Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
View File

@@ -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

2
Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
View 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

4
Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
View 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

6
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
View File

@@ -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

4
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
View 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
@@ -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

2
Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
View 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

14
Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
View File

@@ -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
@@ -579,7 +579,7 @@
- 0 # Plasma
- 0 # Tritium
- 0 # Water vapor
- 0 # Miasma
- 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

46
Resources/Prototypes/Reagents/botany.yml
View File

@@ -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

56
Resources/Prototypes/Reagents/gases.yml
View File

@@ -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

2
Resources/Prototypes/XenoArch/Effects/normal_effects.yml
View File

@@ -346,7 +346,7 @@
- CarbonDioxide
- Plasma
- Tritium
- Miasma
- Ammonia
- NitrousOxide
- Frezon

2
Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
View File

@@ -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