From 7a553781cc24196ef2054d82f1f2bceec97a1d0a Mon Sep 17 00:00:00 2001 From: Kara Date: Wed, 27 Jul 2022 02:55:28 -0700 Subject: [PATCH] Frezon (#9980) * stuff i'll have to fix anyway when n2o gets merged * everything except the finished reactions * freon coolant reaction but with bad curve * miasmic subsumation * freon production * nitrogen and diff temp scaling * uhh meant to change that * # * hitting that frezon boof --- Content.Server/Atmos/GasMixture.cs | 12 ++-- Content.Server/Atmos/IGasReactionEffect.cs | 1 + .../Portable/PortableScrubberComponent.cs | 3 +- .../Atmos/Reactions/FrezonCoolantReaction.cs | 58 ++++++++++++++++++ .../Reactions/FrezonProductionReaction.cs | 40 ++++++++++++ .../Reactions/MiasmicSubsumationReaction.cs | 25 ++++++++ .../StationEvents/Events/GasLeak.cs | 4 +- .../Components/GasArtifactComponent.cs | 1 + .../Components/ArtifactGasTriggerComponent.cs | 1 + Content.Shared/Atmos/Atmospherics.cs | 35 ++++++++++- .../Components/SharedVentScrubberComponent.cs | 3 +- Resources/Locale/en-US/reagents/frezon.ftl | 2 + .../Locale/en-US/reagents/meta/gases.ftl | 3 + Resources/Prototypes/Atmospherics/gases.yml | 12 ++++ .../Prototypes/Atmospherics/reactions.yml | 48 +++++++++++++++ .../Entities/Objects/Tools/jetpacks.yml | 2 +- .../Storage/Canisters/gas_canisters.yml | 47 ++++++++++++++ Resources/Prototypes/Reagents/gases.yml | 54 ++++++++++++++++ .../{freon.png => frezon.png} | Bin .../{freon_old.png => frezon_old.png} | Bin .../Effects/atmospherics.rsi/meta.json | 2 +- .../{freon-1.png => frezon-1.png} | Bin .../canister.rsi/{freon.png => frezon.png} | Bin .../Structures/Storage/canister.rsi/meta.json | 4 +- 24 files changed, 344 insertions(+), 13 deletions(-) create mode 100644 Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs create mode 100644 Content.Server/Atmos/Reactions/FrezonProductionReaction.cs create mode 100644 Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs create mode 100644 Resources/Locale/en-US/reagents/frezon.ftl rename Resources/Textures/Effects/atmospherics.rsi/{freon.png => frezon.png} (100%) rename Resources/Textures/Effects/atmospherics.rsi/{freon_old.png => frezon_old.png} (100%) rename Resources/Textures/Structures/Storage/canister.rsi/{freon-1.png => frezon-1.png} (100%) rename Resources/Textures/Structures/Storage/canister.rsi/{freon.png => frezon.png} (100%) diff --git a/Content.Server/Atmos/GasMixture.cs b/Content.Server/Atmos/GasMixture.cs index 84f896fe39..4278520fa5 100644 --- a/Content.Server/Atmos/GasMixture.cs +++ b/Content.Server/Atmos/GasMixture.cs @@ -18,13 +18,16 @@ namespace Content.Server.Atmos public static GasMixture SpaceGas => new() {Volume = Atmospherics.CellVolume, Temperature = Atmospherics.TCMB, Immutable = true}; // This must always have a length that is a multiple of 4 for SIMD acceleration. - [DataField("moles")] [ViewVariables] + [DataField("moles")] + [ViewVariables(VVAccess.ReadWrite)] public float[] Moles = new float[Atmospherics.AdjustedNumberOfGases]; - [DataField("temperature")] [ViewVariables] + [DataField("temperature")] + [ViewVariables(VVAccess.ReadWrite)] private float _temperature = Atmospherics.TCMB; - [DataField("immutable")] [ViewVariables] + [DataField("immutable")] + [ViewVariables] public bool Immutable { get; private set; } [ViewVariables] @@ -62,7 +65,8 @@ namespace Content.Server.Atmos } } - [DataField("volume")] [ViewVariables] + [DataField("volume")] + [ViewVariables(VVAccess.ReadWrite)] public float Volume { get; set; } public GasMixture() diff --git a/Content.Server/Atmos/IGasReactionEffect.cs b/Content.Server/Atmos/IGasReactionEffect.cs index 3431897920..cc0798100b 100644 --- a/Content.Server/Atmos/IGasReactionEffect.cs +++ b/Content.Server/Atmos/IGasReactionEffect.cs @@ -3,6 +3,7 @@ using Content.Server.Atmos.Reactions; namespace Content.Server.Atmos { + [ImplicitDataDefinitionForInheritors] public interface IGasReactionEffect { ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem); diff --git a/Content.Server/Atmos/Portable/PortableScrubberComponent.cs b/Content.Server/Atmos/Portable/PortableScrubberComponent.cs index a3764da8a2..822022e2bb 100644 --- a/Content.Server/Atmos/Portable/PortableScrubberComponent.cs +++ b/Content.Server/Atmos/Portable/PortableScrubberComponent.cs @@ -29,7 +29,8 @@ namespace Content.Server.Atmos.Portable Gas.Tritium, Gas.WaterVapor, Gas.Miasma, - Gas.NitrousOxide + Gas.NitrousOxide, + Gas.Frezon }; /// diff --git a/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs b/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs new file mode 100644 index 0000000000..f9ed19472d --- /dev/null +++ b/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs @@ -0,0 +1,58 @@ +using Content.Server.Atmos.EntitySystems; +using Content.Shared.Atmos; +using JetBrains.Annotations; + +namespace Content.Server.Atmos.Reactions; + +/// +/// Takes in nitrogen and frezon and cools down the surrounding area. +/// +[UsedImplicitly] +public sealed class FrezonCoolantReaction : IGasReactionEffect +{ + public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) + { + var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); + var temperature = mixture.Temperature; + + var energyModifier = 1f; + var scale = (temperature - Atmospherics.FrezonCoolLowerTemperature) / + (Atmospherics.FrezonCoolMidTemperature - Atmospherics.FrezonCoolLowerTemperature); + + if (scale > 1f) + { + // Scale energy but not frezon usage if we're in a very, very hot place + energyModifier = Math.Min(scale, Atmospherics.FrezonCoolMaximumEnergyModifier); + scale = 1f; + } + + if (scale <= 0) + return ReactionResult.NoReaction; + + var initialNit = mixture.GetMoles(Gas.Nitrogen); + var initialFrezon = mixture.GetMoles(Gas.Frezon); + + var burnRate = initialFrezon * scale / Atmospherics.FrezonCoolRateModifier; + + var energyReleased = 0f; + if (burnRate > Atmospherics.MinimumHeatCapacity) + { + var nitAmt = Math.Min(burnRate * Atmospherics.FrezonNitrogenCoolRatio, initialNit); + var frezonAmt = Math.Min(burnRate, initialFrezon); + mixture.AdjustMoles(Gas.Nitrogen, -nitAmt); + mixture.AdjustMoles(Gas.Frezon, -frezonAmt); + // TODO nitrous oxide + mixture.AdjustMoles(Gas.CarbonDioxide, nitAmt + frezonAmt); + energyReleased = burnRate * Atmospherics.FrezonCoolEnergyReleased * energyModifier; + } + + if (energyReleased >= 0f) + return ReactionResult.NoReaction; + + var newHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture); + if (newHeatCapacity > Atmospherics.MinimumHeatCapacity) + mixture.Temperature = (temperature * oldHeatCapacity + energyReleased) / newHeatCapacity; + + return ReactionResult.Reacting; + } +} diff --git a/Content.Server/Atmos/Reactions/FrezonProductionReaction.cs b/Content.Server/Atmos/Reactions/FrezonProductionReaction.cs new file mode 100644 index 0000000000..1bb48d76a0 --- /dev/null +++ b/Content.Server/Atmos/Reactions/FrezonProductionReaction.cs @@ -0,0 +1,40 @@ +using Content.Server.Atmos.EntitySystems; +using Content.Shared.Atmos; +using JetBrains.Annotations; + +namespace Content.Server.Atmos.Reactions; + +/// +/// Produces frezon from oxygen and tritium, with nitrogen as a catalyst that also acts as a stopper if too much is present. +/// Has a max temperature, but paradoxically gets more efficient the hotter it is. +/// +[UsedImplicitly] +public sealed class FrezonProductionReaction : IGasReactionEffect +{ + public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) + { + var initialN2 = mixture.GetMoles(Gas.Nitrogen); + var initialOxy = mixture.GetMoles(Gas.Oxygen); + var initialTrit = mixture.GetMoles(Gas.Tritium); + + var efficiency = mixture.Temperature / Atmospherics.FrezonProductionMaxEfficiencyTemperature; + var loss = 1 - efficiency; + + // Less N2 is required the more efficient it is. + var minimumN2 = (initialOxy + initialTrit) / (Atmospherics.FrezonProductionNitrogenRatio * efficiency); + + if (initialN2 < minimumN2) + return ReactionResult.NoReaction; + + var oxyConversion = initialOxy / Atmospherics.FrezonProductionConversionRate; + var tritConversion = initialTrit / Atmospherics.FrezonProductionConversionRate; + var total = oxyConversion + tritConversion; + + mixture.AdjustMoles(Gas.Oxygen, -oxyConversion); + mixture.AdjustMoles(Gas.Tritium, -tritConversion); + mixture.AdjustMoles(Gas.Frezon, total * efficiency); + mixture.AdjustMoles(Gas.Nitrogen, total * loss); + + return ReactionResult.Reacting; + } +} diff --git a/Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs b/Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs new file mode 100644 index 0000000000..6d0c8b01fe --- /dev/null +++ b/Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs @@ -0,0 +1,25 @@ +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 class MiasmicSubsumationReaction : IGasReactionEffect +{ + public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, AtmosphereSystem atmosphereSystem) + { + 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/StationEvents/Events/GasLeak.cs b/Content.Server/StationEvents/Events/GasLeak.cs index e90ca6f20d..5469407896 100644 --- a/Content.Server/StationEvents/Events/GasLeak.cs +++ b/Content.Server/StationEvents/Events/GasLeak.cs @@ -15,10 +15,12 @@ namespace Content.Server.StationEvents.Events public override string Prototype => "GasLeak"; - private static readonly Gas[] LeakableGases = { + private static readonly Gas[] LeakableGases = + { Gas.Miasma, 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 e99e3d078c..2239b8b9e2 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs @@ -29,6 +29,7 @@ public sealed class GasArtifactComponent : Component Gas.Tritium, Gas.Miasma, 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 a5d0503ed0..5338f19f88 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs @@ -20,6 +20,7 @@ public sealed class ArtifactGasTriggerComponent : Component Gas.CarbonDioxide, Gas.Miasma, Gas.NitrousOxide, + Gas.Frezon }; /// diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs index 6f977662a9..3c3fbdeef0 100644 --- a/Content.Shared/Atmos/Atmospherics.cs +++ b/Content.Shared/Atmos/Atmospherics.cs @@ -168,7 +168,7 @@ namespace Content.Shared.Atmos /// /// Total number of gases. Increase this if you want to add more! /// - public const int TotalNumberOfGases = 8; + public const int TotalNumberOfGases = 9; /// /// This is the actual length of the gases arrays in mixtures. @@ -202,6 +202,36 @@ namespace Content.Shared.Atmos public const float TritiumBurnOxyFactor = 100f; public const float TritiumBurnTritFactor = 10f; + public const float FrezonCoolLowerTemperature = 23.15f; + + /// + /// Frezon cools better at higher temperatures. + /// + public const float FrezonCoolMidTemperature = 373.15f; + + public const float FrezonCoolMaximumEnergyModifier = 10f; + + /// + /// Remove X mol of nitrogen for each mol of frezon. + /// + public const float FrezonNitrogenCoolRatio = 5; + public const float FrezonCoolEnergyReleased = -3000000f; + public const float FrezonCoolRateModifier = 20f; + + public const float FrezonProductionMaxEfficiencyTemperature = 73.15f; + + /// + /// 1 mol of N2 is required per X mol of tritium and oxygen. + /// + public const float FrezonProductionNitrogenRatio = 10f; + + public const float FrezonProductionConversionRate = 50f; + + /// + /// How many mol of frezon can be converted into miasma in one cycle. + /// + public const float MiasmicSubsumationMaxConversionRate = 5f; + /// /// Determines at what pressure the ultra-high pressure red icon is displayed. /// @@ -286,6 +316,7 @@ namespace Content.Shared.Atmos Tritium = 4, WaterVapor = 5, Miasma = 6, - NitrousOxide = 7 + 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 ee5d5774b3..d95ef117f0 100644 --- a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs +++ b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentScrubberComponent.cs @@ -21,7 +21,8 @@ namespace Content.Shared.Atmos.Piping.Unary.Components Gas.Tritium, Gas.WaterVapor, Gas.Miasma, - Gas.NitrousOxide + Gas.NitrousOxide, + Gas.Frezon }; // Presets for 'dumb' air alarm modes diff --git a/Resources/Locale/en-US/reagents/frezon.ftl b/Resources/Locale/en-US/reagents/frezon.ftl new file mode 100644 index 0000000000..edb7311017 --- /dev/null +++ b/Resources/Locale/en-US/reagents/frezon.ftl @@ -0,0 +1,2 @@ +frezon-lungs-cold = Your lungs feel colder.. +frezon-euphoric = You feel chilly, but euphoric.. diff --git a/Resources/Locale/en-US/reagents/meta/gases.ftl b/Resources/Locale/en-US/reagents/meta/gases.ftl index 9eedb29bc0..f003da6d2d 100644 --- a/Resources/Locale/en-US/reagents/meta/gases.ftl +++ b/Resources/Locale/en-US/reagents/meta/gases.ftl @@ -18,3 +18,6 @@ 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... + +reagent-name-frezon = frezon +reagent-desc-frezon = A highly effective coolant.. and hallucinogenic. diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml index 05873f245c..3f08f867b1 100644 --- a/Resources/Prototypes/Atmospherics/gases.yml +++ b/Resources/Prototypes/Atmospherics/gases.yml @@ -77,3 +77,15 @@ molarMass: 44 color: 2887E8 reagent: NitrousOxide + +- type: gas + id: 8 + name: Frezon + specificHeat: 600 # Strongest by far + heatCapacityRatio: 1.33 + molarMass: 50 + gasOverlaySprite: /Textures/Effects/atmospherics.rsi + gasOverlayState: frezon + gasMolesVisible: 0.6 + color: 3a758c + reagent: Frezon diff --git a/Resources/Prototypes/Atmospherics/reactions.yml b/Resources/Prototypes/Atmospherics/reactions.yml index c7b8bec964..ddbf47e49c 100644 --- a/Resources/Prototypes/Atmospherics/reactions.yml +++ b/Resources/Prototypes/Atmospherics/reactions.yml @@ -23,6 +23,54 @@ effects: - !type:TritiumFireReaction {} +- type: gasReaction + id: FrezonCoolant + priority: 1 + minimumTemperature: 23.15 + minimumRequirements: + - 0 # oxygen + - 0.01 # nitrogen + - 0 # carbon dioxide + - 0 # plasma + - 0 # tritium + - 0 # vapor + - 0 # miasma + - 0.01 # frezon + effects: + - !type:FrezonCoolantReaction {} + +- type: gasReaction + id: FrezonProduction + priority: 2 + maximumTemperature: 73.15 # Cold tritium fire, basically. + minimumRequirements: + - 0.01 # oxygen + - 0.01 # nitrogen + - 0 # carbon dioxide + - 0 # plasma + - 0.01 # tritium + - 0 # vapor + - 0 # miasma + - 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.01 # frezon + effects: + - !type:MiasmicSubsumationReaction {} + #- type: gasReaction # id: WaterVaporPuddle # priority: 1 diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index 8187dc4298..e84809caa0 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -12,7 +12,7 @@ - shader: unshaded map: ["enum.EffectLayers.Unshaded"] sprite: Effects/atmospherics.rsi - state: freon_old + state: frezon_old - type: EffectVisuals - type: AnimationPlayer diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index ea927374ad..d7a40a2e21 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -428,6 +428,44 @@ - !type:DoActsBehavior acts: [ "Destruction" ] +- type: entity + parent: GasCanister + id: FrezonCanister + name: frezon canister + description: A coolant with light hallucinogenic properties. Proceed. + components: + - type: Sprite + layers: + - state: frezon + - type: GasCanister + gasMixture: + volume: 1000 + moles: + - 0 # oxygen + - 0 # nitrogen + - 0 # CO2 + - 0 # Plasma + - 0 # Tritium + - 0 # Water vapor + - 0 # Miasma + - 1871.71051 # Frezon + temperature: 293.15 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/metalbreak.ogg + - !type:SpawnEntitiesBehavior + spawn: + FrezonCanisterBroken: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] # Broke Entities @@ -562,3 +600,12 @@ components: - type: Sprite state: redws-1 + +- type: entity + parent: GasCanisterBrokenBase + id: FrezonCanisterBroken + name: broken frezon canister + noSpawn: true + components: + - type: Sprite + state: frezon-1 diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 6e87919bf0..2a83db4f7d 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -280,3 +280,57 @@ damage: types: Poison: 0.25 + +- type: reagent + id: Frezon + name: reagent-name-frezon + desc: reagent-desc-frezon + physicalDesc: reagent-physical-desc-gaseous + color: "#3a758c" + boilingPoint: -195.8 + meltingPoint: -210.0 + metabolisms: + Gas: + effects: + - !type:HealthChange + conditions: + - !type:ReagentThreshold + reagent: Frezon + min: 0.5 + scaleByQuantity: true + ignoreResistances: true + damage: + types: + Cellular: 0.01 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + reagent: Frezon + min: 1 + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false + - !type:Drunk + conditions: + - !type:ReagentThreshold + reagent: Frezon + min: 1 + - !type:PopupMessage + type: Local + messages: [ "frezon-lungs-cold" ] + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Frezon + min: 0.5 + - !type:PopupMessage + type: Local + visualType: Medium + messages: [ "frezon-euphoric" ] + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Frezon + min: 1 diff --git a/Resources/Textures/Effects/atmospherics.rsi/freon.png b/Resources/Textures/Effects/atmospherics.rsi/frezon.png similarity index 100% rename from Resources/Textures/Effects/atmospherics.rsi/freon.png rename to Resources/Textures/Effects/atmospherics.rsi/frezon.png diff --git a/Resources/Textures/Effects/atmospherics.rsi/freon_old.png b/Resources/Textures/Effects/atmospherics.rsi/frezon_old.png similarity index 100% rename from Resources/Textures/Effects/atmospherics.rsi/freon_old.png rename to Resources/Textures/Effects/atmospherics.rsi/frezon_old.png diff --git a/Resources/Textures/Effects/atmospherics.rsi/meta.json b/Resources/Textures/Effects/atmospherics.rsi/meta.json index c543c2d30e..bb9798c1e9 100644 --- a/Resources/Textures/Effects/atmospherics.rsi/meta.json +++ b/Resources/Textures/Effects/atmospherics.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", "states": [{"name": "chem_gas_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "freon", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "freon_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "fusion_gas", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "miasma", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "miasma_old", "delays": [[0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998]]}, {"name": "nitrous_oxide", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "nitrous_oxide_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "nitryl", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "nitryl_old", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "plasma", "delays": [[0.1, 0.1, 0.1]]}, {"name": "plasma_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "tritium", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "tritium_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "water_vapor", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "water_vapor_old", "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]}]} +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", "states": [{"name": "chem_gas_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "frezon", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "frezon_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "fusion_gas", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "miasma", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "miasma_old", "delays": [[0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998, 0.22999999999999998]]}, {"name": "nitrous_oxide", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "nitrous_oxide_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "nitryl", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "nitryl_old", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "plasma", "delays": [[0.1, 0.1, 0.1]]}, {"name": "plasma_old", "delays": [[0.2, 0.2, 0.2]]}, {"name": "tritium", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "tritium_old", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "water_vapor", "delays": [[0.2, 0.2, 0.2, 0.3, 0.3, 0.2, 0.2, 0.2]]}, {"name": "water_vapor_old", "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]}]} diff --git a/Resources/Textures/Structures/Storage/canister.rsi/freon-1.png b/Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png similarity index 100% rename from Resources/Textures/Structures/Storage/canister.rsi/freon-1.png rename to Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png diff --git a/Resources/Textures/Structures/Storage/canister.rsi/freon.png b/Resources/Textures/Structures/Storage/canister.rsi/frezon.png similarity index 100% rename from Resources/Textures/Structures/Storage/canister.rsi/freon.png rename to Resources/Textures/Structures/Storage/canister.rsi/frezon.png diff --git a/Resources/Textures/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json index 50ebcaa08b..a9565d3aec 100644 --- a/Resources/Textures/Structures/Storage/canister.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/canister.rsi/meta.json @@ -95,10 +95,10 @@ "name": "darkblue-1" }, { - "name": "freon" + "name": "frezon" }, { - "name": "freon-1" + "name": "frezon-1" }, { "name": "water_vapor"