diff --git a/code/modules/atmospherics/auxgm/gas_types.dm b/code/modules/atmospherics/auxgm/gas_types.dm index 9347a0c9fe..828af0e8ea 100644 --- a/code/modules/atmospherics/auxgm/gas_types.dm +++ b/code/modules/atmospherics/auxgm/gas_types.dm @@ -135,12 +135,13 @@ id = GAS_NITRIC specific_heat = 20 name = "Nitric oxide" - flags = GAS_FLAG_DANGEROUS odor = "sharp sweetness" odor_strength = 1 fusion_power = 15 enthalpy = 91290 heat_resistance = 2 + powermix = -1 + heat_penalty = -1 /datum/gas/nitryl id = GAS_NITRYL diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index 607274f71b..b104c51fb7 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -729,11 +729,11 @@ /datum/gas_reaction/nitric_oxide/react(datum/gas_mixture/air, datum/holder) var/nitric = air.get_moles(GAS_NITRIC) var/oxygen = air.get_moles(GAS_O2) - var/max_amount = max(nitric / 10, MINIMUM_MOLE_COUNT) - var/enthalpy = air.return_temperature() * (air.heat_capacity() + R_IDEAL_GAS_EQUATION * air.total_moles()); + var/max_amount = max(nitric / 8, MINIMUM_MOLE_COUNT) + var/enthalpy = air.return_temperature() * (air.heat_capacity() + R_IDEAL_GAS_EQUATION * air.total_moles()) var/list/enthalpies = GLOB.gas_data.enthalpies if(oxygen > MINIMUM_MOLE_COUNT) - var/reaction_amount = min(max_amount, oxygen) + var/reaction_amount = min(max_amount, oxygen)/4 air.adjust_moles(GAS_NITRIC, -reaction_amount*2) air.adjust_moles(GAS_O2, -reaction_amount) air.adjust_moles(GAS_NITRYL, reaction_amount*2) diff --git a/tgui/packages/tgui/constants.js b/tgui/packages/tgui/constants.js index bc20e9ac9c..a5ac6aceb0 100644 --- a/tgui/packages/tgui/constants.js +++ b/tgui/packages/tgui/constants.js @@ -181,6 +181,12 @@ const GASES = [ 'label': 'N₂O', 'color': 'red', }, + { + 'id': 'no', + 'name': 'Nitric Oxide', + 'label': 'NO', + 'color': 'red', + }, { 'id': 'no2', 'name': 'Nitryl', @@ -223,6 +229,24 @@ const GASES = [ 'label': 'H₂', 'color': 'white', }, + { + 'id': 'methane', + 'name': 'Methane', + 'label': 'CH₄', + 'color': 'grey', + }, + { + 'id': 'methyl_bromide', + 'name': 'Methyl Bromide', + 'label': 'CH₃Br', + 'color': 'brown', + }, + { + 'id': 'qcd', + 'name': 'Quark Matter', + 'label': 'QGP', + 'color': 'pink', + }, ]; export const getGasLabel = (gasId, fallbackValue) => {