Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ public sealed partial class PortableScrubberComponent : Component
Gas.Frezon,
// Funkystation Start: Funky atmos - /tg/ gases
Gas.BZ,
Gas.Healium,
Gas.Nitrium,
Gas.Hydrogen,
Gas.HyperNoblium,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public sealed partial class GasLeakRuleComponent : Component
Gas.WaterVapor, // the fog
// Funkystation Start: Funky atmos - /tg/ gases
Gas.BZ,
Gas.Healium,
Gas.Nitrium,
Gas.Pluoxium,
Gas.HyperNoblium,
Expand Down

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion Content.Server/_Starlight/Energy/Supermatter/Const.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ internal static class Const
new (0.13f, 2.19f, 2.2f, 0f, -0.02f, 0f, 0f), // nitrous oxide
new (1.00f, 0.01f, 1.1f, 0f, -0.1f, 0f, 0f), // frezon
new (0.25f, 1.20f, 1.80f, 0f, 0f, 0f, 0f), // BZ (catalist so an not competing gas) //FUNKY GASES
new (0.40f, 0.50f, 1.8f, 1f, -0.1f, -0.1f, 0f), // Healium (support gas) {Special effect: increase passive}
new (0.30f, 0.50f, 1.2f, 0f, 0.75f, 0.5f, 0f), // Nitrium {Special effect: SM reacts more, cost of stability}
new (0.30f, 1.0f, 1.7f, 0f, 0f, 0f, 0f), // Pluoxium better then o2 not insane
new (0.35f, 0.35f, 1.1f, 0f, 0.25f, 0f, 0f), // Hydrogen Better heatT than Trit but "ignites" faster
Expand Down
30 changes: 11 additions & 19 deletions Content.Shared/Atmos/Atmospherics.cs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ public static class Atmospherics
[Gas.WaterVapor] = Loc.GetString("gas-water-vapor-abbreviation"),
// Funkystation Start: Funky atmos - /tg/ gases
[Gas.BZ] = Loc.GetString("gas-bz-abbreviation"),
[Gas.Healium] = Loc.GetString("gas-healium-abbreviation"),
[Gas.Nitrium] = Loc.GetString("gas-nitrium-abbreviation"),
[Gas.Pluoxium] = Loc.GetString("gas-pluoxium-abbreviation"),
[Gas.Hydrogen] = Loc.GetString("gas-hydrogen-abbreviation"),
Expand Down Expand Up @@ -310,12 +309,6 @@ public static class Atmospherics
/// </summary>
public const float BZProductionEnergy = 80e3f;

/// <summary>
/// Funky Atmos - /tg/ gases
/// The amount of energy 1 mol of Healium forming from BZ and frezon releases.
/// </summary>
public const float HealiumProductionEnergy = 9e3f;

/// <summary>
/// Funky Atmos - /tg/ gases
/// The amount of energy 1 mol of Nitrium forming from Tritium, Nitrogen and BZ releases.
Expand Down Expand Up @@ -492,21 +485,20 @@ public enum Gas : sbyte
Frezon = 8,
// Funkystation Start: Funky atmos - /tg/ gases
BZ = 9,
Healium = 10,
Nitrium = 11,
Pluoxium = 12,
Hydrogen = 13,
HyperNoblium = 14,
ProtoNitrate = 15,
Zauker = 16,
Halon = 17,
Helium = 18,
AntiNoblium = 19,
Nitrium = 10,
Comment thread
OrangeJuiceGoose marked this conversation as resolved.
Pluoxium = 11,
Hydrogen = 12,
HyperNoblium = 13,
ProtoNitrate = 14,
Zauker = 15,
Halon = 16,
Helium = 17,
AntiNoblium = 18,
Comment thread
OrangeJuiceGoose marked this conversation as resolved.
// Funkystation End: Funky atmos - /tg/ gases
#region Starlight
// Starlight gases!
Ulnitranium = 20,
ZXA = 21,
Ulnitranium = 19,
ZXA = 20,
#endregion
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public sealed class GasVentScrubberData : IAtmosDeviceData
Gas.Frezon,
// Funkystation Start: Funky atmos - /tg/ gases
Gas.BZ,
Gas.Healium,
Gas.Nitrium,
Gas.Hydrogen,
Gas.HyperNoblium,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@
upperWarnAround: !type:AlarmThresholdSetting
threshold: 0.08

- type: alarmThreshold
id: stationHealium
upperBound: !type:AlarmThresholdSetting
threshold: 0.08
upperWarnAround: !type:AlarmThresholdSetting
threshold: 0.5

- type: alarmThreshold
id: stationPluoxium
upperBound: !type:AlarmThresholdSetting
Expand Down
14 changes: 2 additions & 12 deletions Resources/Prototypes/_Funkystation/Atmospherics/gases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,7 @@
reagent: BZ
pricePerMole: 1.2

- type: gas
id: Healium
name: gases-healium
specificHeat: 10
heatCapacityRatio: 1.4
molarMass: 15
gasOverlaySprite: /Textures/_Funkystation/Effects/atmospherics.rsi
gasOverlayState: healium
color: fa8072
reagent: Healium
pricePerMole: 2.7
# Starlight: Healium removed

- type: gas
id: Nitrium
Expand All @@ -30,7 +20,7 @@
gasOverlaySprite: /Textures/_Funkystation/Effects/atmospherics.rsi
gasOverlayState: nitrium
molarMass: 8
color: a52a2a
color: fa8072
reagent: Nitrium
pricePerMole: 4

Expand Down
49 changes: 0 additions & 49 deletions Resources/Prototypes/_Funkystation/Atmospherics/reactions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,6 @@
effects:
- !type:BZProductionReaction {}

- type: gasReaction
id: HealiumProduction
priority: 2
maximumTemperature: 300.0
minimumTemperature: 22.0
minimumRequirements:
- 0 # oxygen
- 0 # nitrogen
- 0 # carbon dioxide
- 0 # plasma
- 0 # tritium
- 0 # vapor
- 0 # miasma
- 0 # n2o
- 5 # frezon
- 5 # bz
effects:
- !type:HealiumProductionReaction {}

- type: gasReaction
id: NitriumProduction
priority: 2
Expand All @@ -52,26 +33,6 @@
effects:
- !type:NitriumProductionReaction {}

- type: gasReaction
id: NitriumDecomposition
priority: 2
maximumTemperature: 343.15
minimumRequirements:
- 0.01 # oxygen
- 0 # nitrogen
- 0 # carbon dioxide
- 0 # plasma
- 0 # tritium
- 0 # vapor
- 0 # miasma
- 0 # n2o
- 0 # frezon
- 0 # bz
- 0 # healium
- 0.01 # nitrium
effects:
- !type:NitriumDecompositionReaction {}

- type: gasReaction
id: PluoxiumProduction
priority: 3
Expand All @@ -88,7 +49,6 @@
- 0 # n2o
- 0 # frezon
- 0 # bz
- 0 # healium
- 0 # nitrium
effects:
- !type:PluoxiumTritiumProductionReaction {}
Expand All @@ -109,7 +69,6 @@
- 0 # n2o
- 0 # frezon
- 0 # bz
- 0 # healium
- 0 # nitrium
effects:
- !type:PluoxiumRadiationProductionReaction {}
Expand All @@ -129,7 +88,6 @@
- 0 # n2o
- 0 # frezon
- 50 # bz
- 0 # healium
- 0 # nitrium
- 0 # pluox
- 300 # hydrogen
Expand All @@ -151,7 +109,6 @@
- 0 # n2o
- 0 # frezon
- 0 # bz
- 0 # healium
- 0 # nitrium
- 0 # pluox
- 0.01 # hydrogen
Expand All @@ -174,7 +131,6 @@
- 0 # n2o
- 0 # frezon
- 0 # bz
- 0 # healium
- 0 # nitrium
- 0 # pluox
- 0 # hydrogen
Expand All @@ -196,7 +152,6 @@
- 0 # n2o
- 0 # frezon
- 0 # bz
- 0 # healium
- 0 # nitrium
- 0 # pluox
- 0 # hydrogen
Expand Down Expand Up @@ -225,7 +180,6 @@
- 0 # n2o
- 0 # frezon
- 0 # bz
- 0 # healium
- 0.01 # nitrium
- 0 # pluox
- 0 # hydrogen
Expand All @@ -252,7 +206,6 @@
- 0 # n2o
- 0 # frezon
- 0 # bz
- 0 # healium
- 0 # nitrium
- 0 # pluox
- 0 # hydrogen
Expand Down Expand Up @@ -281,7 +234,6 @@
- 0 # n2o
- 0 # frezon
- 0 # bz
- 0 # healium
- 0 # nitrium
- 0.01 # pluox
- 0.01 # hydrogen
Expand Down Expand Up @@ -310,7 +262,6 @@
- 0 # n2o
- 0 # frezon
- 0.01 # bz
- 0 # healium
- 0 # nitrium
- 0 # pluox
- 0 # hydrogen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,48 +41,6 @@
- type: Lock
locked: true

- type: entity
parent: GasCanister
id: HealiumCanister
name: healium canister
components:
- type: Sprite
layers:
- state: healium
- type: GasCanister
gasMixture:
# Starlight-start: Canister volume
volume: 1500
moles:
Healium: 2769.36
# Starlight-end
temperature: 293.15
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 600
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 300
behaviors:
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:SpawnEntitiesBehavior
spawn:
HealiumCanisterBroken:
min: 1
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:DumpCanisterBehavior
- type: Lock
locked: true

- type: entity
parent: GasCanister
id: NitriumCanister
Expand Down
Loading
Loading