From 8aef4f3b573214aba7f749239480aeebba8fa314 Mon Sep 17 00:00:00 2001 From: nicbn Date: Wed, 1 Nov 2017 19:00:59 -0200 Subject: [PATCH] Rename brown gas to nitryl (#32271) --- .../atmospherics/gasmixtures/gas_types.dm | 8 ++--- .../atmospherics/gasmixtures/reactions.dm | 28 +++++++++--------- .../atmospherics/machinery/airalarm.dm | 10 +++---- .../components/unary_devices/vent_scrubber.dm | 8 ++--- .../machinery/portable/canister.dm | 8 ++--- .../machinery/portable/scrubber.dm | 2 +- code/modules/mob/living/carbon/life.dm | 8 ++--- .../chemistry/reagents/other_reagents.dm | 8 ++--- code/modules/surgery/organs/lungs.dm | 22 +++++++------- icons/effects/tile_effects.dmi | Bin 4199 -> 4194 bytes 10 files changed, 51 insertions(+), 51 deletions(-) diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm index 8296ab56f4..cab2e1d62d 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -84,11 +84,11 @@ GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, / moles_visible = 1 dangerous = TRUE -/datum/gas/brown_gas //This is nitric oxide, but given generic name to avoid confusion with nitrous oxide(N20 vs. NO2) - id = "browns" +/datum/gas/nitryl + id = "no2" specific_heat = 20 - name = "Brown Gas" - gas_overlay = "browns" + name = "Nitryl" + gas_overlay = "nitryl" moles_visible = MOLES_GAS_VISIBLE dangerous = TRUE diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index 63b84832af..c93183b40e 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -11,7 +11,7 @@ #define FIRE_PLASMA_ENERGY_RELEASED 3000000 //Amount of heat released per mole of burnt plasma into the tile //General assmos defines. #define WATER_VAPOR_FREEZE 200 -#define BROWNS_FORMATION_ENERGY 100000 +#define NITRYL_FORMATION_ENERGY 100000 #define TRITIUM_BURN_OXY_FACTOR 100 #define TRITIUM_BURN_TRIT_FACTOR 10 #define SUPER_SATURATION_THRESHOLD 96 @@ -216,7 +216,7 @@ var/waste_added = (plasma_fused-oxygen_added)-((air.total_moles()*air.heat_capacity())/PLASMA_BINDING_ENERGY) reaction_energy = max(reaction_energy+((catalyst_efficency*cached_gases[/datum/gas/plasma][MOLES])/((moles_impurities/catalyst_efficency)+2)*10)+((plasma_fused/((moles_impurities/catalyst_efficency)))*PLASMA_BINDING_ENERGY),0) - air.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/water_vapor, /datum/gas/nitrous_oxide, /datum/gas/brown_gas) + air.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/water_vapor, /datum/gas/nitrous_oxide, /datum/gas/nitryl) //Fusion produces an absurd amount of waste products now, requiring active filtration. cached_gases[/datum/gas/plasma][MOLES] = max(cached_gases[/datum/gas/plasma][MOLES] - plasma_fused,0) cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES] - tritium_catalyzed,0) @@ -224,7 +224,7 @@ cached_gases[/datum/gas/nitrogen][MOLES] += waste_added cached_gases[/datum/gas/water_vapor][MOLES] += waste_added cached_gases[/datum/gas/nitrous_oxide][MOLES] += waste_added - cached_gases[/datum/gas/brown_gas][MOLES] += waste_added + cached_gases[/datum/gas/nitryl][MOLES] += waste_added if(reaction_energy > 0) var/new_heat_capacity = air.heat_capacity() @@ -233,12 +233,12 @@ //Prevents whatever mechanism is causing it to hit negative temperatures. return REACTING -/datum/gas_reaction/brownsformation //The formation of brown gas. Endothermic. Requires N2O as a catalyst. +/datum/gas_reaction/nitrylformation //The formation of nitryl. Endothermic. Requires N2O as a catalyst. priority = 3 - name = "Brown Gas formation" - id = "brownsformation" + name = "Nitryl formation" + id = "nitrylformation" -/datum/gas_reaction/brownsformation/init_reqs() +/datum/gas_reaction/nitrylformation/init_reqs() min_requirements = list( /datum/gas/oxygen = 20, /datum/gas/nitrogen = 20, @@ -246,18 +246,18 @@ "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*400 ) -/datum/gas_reaction/brownsformation/react(datum/gas_mixture/air) +/datum/gas_reaction/nitrylormation/react(datum/gas_mixture/air) var/list/cached_gases = air.gases var/temperature = air.temperature var/old_heat_capacity = air.heat_capacity() var/heat_efficency = temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*100) - var/energy_used = heat_efficency*BROWNS_FORMATION_ENERGY - ASSERT_GAS(/datum/gas/brown_gas,air) + var/energy_used = heat_efficency*NITRYL_FORMATION_ENERGY + ASSERT_GAS(/datum/gas/nitryl,air) cached_gases[/datum/gas/oxygen][MOLES] -= heat_efficency cached_gases[/datum/gas/nitrogen][MOLES] -= heat_efficency - cached_gases[/datum/gas/brown_gas][MOLES] += heat_efficency*2 + cached_gases[/datum/gas/nitryl][MOLES] += heat_efficency*2 if(energy_used > 0) var/new_heat_capacity = air.heat_capacity() @@ -307,7 +307,7 @@ /datum/gas/tritium = 30, /datum/gas/plasma = 10, /datum/gas/bz = 20, - /datum/gas/brown_gas = 30, + /datum/gas/nitryl = 30, "TEMP" = STIMULUM_HEAT_SCALE/2) /datum/gas_reaction/stimformation/react(datum/gas_mixture/air) @@ -322,7 +322,7 @@ cached_gases[/datum/gas/stimulum][MOLES]+= heat_scale/10 cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES]- heat_scale,0) cached_gases[/datum/gas/plasma][MOLES] = max(cached_gases[/datum/gas/plasma][MOLES]- heat_scale,0) - cached_gases[/datum/gas/brown_gas][MOLES] = max(cached_gases[/datum/gas/brown_gas][MOLES]- heat_scale,0) + cached_gases[/datum/gas/nitryl][MOLES] = max(cached_gases[/datum/gas/nitryl][MOLES]- heat_scale,0) if(stim_energy_change) var/new_heat_capacity = air.heat_capacity() @@ -367,7 +367,7 @@ #undef FIRE_CARBON_ENERGY_RELEASED #undef FIRE_PLASMA_ENERGY_RELEASED #undef WATER_VAPOR_FREEZE -#undef BROWNS_FORMATION_ENERGY +#undef NITRYL_FORMATION_ENERGY #undef TRITIUM_BURN_OXY_FACTOR #undef SUPER_SATURATION_THRESHOLD #undef STIMULUM_HEAT_SCALE diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index d2603208e5..316f9f248d 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -93,11 +93,11 @@ /datum/gas/plasma = new/datum/tlv/dangerous, // Partial pressure, kpa /datum/gas/nitrous_oxide = new/datum/tlv/dangerous, // Partial pressure, kpa /datum/gas/bz = new/datum/tlv/dangerous, - /datum/gas/hypernoblium = new/datum/tlv/dangerous, + /datum/gas/hypernoblium = new/datum/tlv/dangerous, /datum/gas/water_vapor = new/datum/tlv/dangerous, /datum/gas/tritium = new/datum/tlv/dangerous, /datum/gas/stimulum = new/datum/tlv/dangerous, - /datum/gas/brown_gas = new/datum/tlv/dangerous, + /datum/gas/nitryl = new/datum/tlv/dangerous, /datum/gas/pluoxium = new/datum/tlv/dangerous ) @@ -111,11 +111,11 @@ /datum/gas/plasma = new/datum/tlv/no_checks, /datum/gas/nitrous_oxide = new/datum/tlv/no_checks, /datum/gas/bz = new/datum/tlv/no_checks, - /datum/gas/hypernoblium = new/datum/tlv/no_checks, + /datum/gas/hypernoblium = new/datum/tlv/no_checks, /datum/gas/water_vapor = new/datum/tlv/no_checks, /datum/gas/tritium = new/datum/tlv/no_checks, /datum/gas/stimulum = new/datum/tlv/no_checks, - /datum/gas/brown_gas = new/datum/tlv/no_checks, + /datum/gas/nitryl = new/datum/tlv/no_checks, /datum/gas/pluoxium = new/datum/tlv/no_checks ) @@ -133,7 +133,7 @@ /datum/gas/water_vapor = new/datum/tlv/dangerous, /datum/gas/tritium = new/datum/tlv/dangerous, /datum/gas/stimulum = new/datum/tlv/dangerous, - /datum/gas/brown_gas = new/datum/tlv/dangerous, + /datum/gas/nitryl = new/datum/tlv/dangerous, /datum/gas/pluoxium = new/datum/tlv/dangerous ) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index e0567ee967..7f74711367 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -230,10 +230,10 @@ filtered_gases[/datum/gas/pluoxium][MOLES] = removed_gases[/datum/gas/pluoxium][MOLES] removed_gases[/datum/gas/pluoxium][MOLES] = 0 - if(scrub_Rare && removed_gases[/datum/gas/brown_gas]) - ADD_GAS(/datum/gas/brown_gas, filtered_gases) - filtered_gases[/datum/gas/brown_gas][MOLES] = removed_gases[/datum/gas/brown_gas][MOLES] - removed_gases[/datum/gas/brown_gas][MOLES] = 0 + if(scrub_Rare && removed_gases[/datum/gas/nitryl]) + ADD_GAS(/datum/gas/nitryl, filtered_gases) + filtered_gases[/datum/gas/nitryl][MOLES] = removed_gases[/datum/gas/nitryl][MOLES] + removed_gases[/datum/gas/nitryl][MOLES] = 0 if(scrub_Rare && removed_gases[/datum/gas/tritium]) ADD_GAS(/datum/gas/tritium, filtered_gases) diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 0a7f43b383..5ed89de5b0 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -105,10 +105,10 @@ desc = "Hyper-Noblium. More noble than all other gases." gas_type = /datum/gas/hypernoblium -/obj/machinery/portable_atmospherics/canister/browns - name = "brown gas canister" - desc = "Browns gas. Feels great 'til the acid eats your lungs." - gas_type = /datum/gas/brown_gas +/obj/machinery/portable_atmospherics/canister/nitryl + name = "nitryl canister" + desc = "Nitryl gas. Feels great 'til the acid eats your lungs." + gas_type = /datum/gas/nitryl /obj/machinery/portable_atmospherics/canister/stimulum name = "stimulum canister" diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index bb203fd6ee..4fdd94c8e8 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -7,7 +7,7 @@ var/volume_rate = 1000 volume = 1000 - var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/brown_gas, /datum/gas/tritium, /datum/gas/hypernoblium, /datum/gas/water_vapor) + var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitryl, /datum/gas/tritium, /datum/gas/hypernoblium, /datum/gas/water_vapor) /obj/machinery/portable_atmospherics/scrubber/Destroy() var/turf/T = get_turf(src) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 0d50285859..f69a1973b3 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -207,10 +207,10 @@ if(breath_gases[/datum/gas/tritium]) var/tritium_partialpressure = (breath_gases[/datum/gas/tritium][MOLES]/breath.total_moles())*breath_pressure radiation += tritium_partialpressure/10 - //Brown Gas - if (breath_gases[/datum/gas/brown_gas]) - var/browns_partialpressure = (breath_gases[/datum/gas/brown_gas][MOLES]/breath.total_moles())*breath_pressure - adjustFireLoss(browns_partialpressure/4) + //NITRYL + if (breath_gases[/datum/gas/nitryl]) + var/nitryl_partialpressure = (breath_gases[/datum/gas/nitryl][MOLES]/breath.total_moles())*breath_pressure + adjustFireLoss(nitryl_partialpressure/4) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index c93ca30841..e2be37f46f 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1175,10 +1175,10 @@ M.AdjustUnconscious(-20, 0) M.adjustStaminaLoss(-0.5*REM, 0) -/datum/reagent/browngas - name = "Brown gas" - id = "brown_gas" - description = "A strange brown gas that makes you feel faster" +/datum/reagent/nitryl + name = "Nitryl" + id = "no2" + description = "A highly reactive gas that makes you feel faster" reagent_state = GAS metabolization_rate = REAGENTS_METABOLISM color = "90560B" diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 65c1e3e1fb..2ed2c2107e 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -95,7 +95,7 @@ var/list/breath_gases = breath.gases - breath.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitrogen, /datum/gas/tritium, /datum/gas/brown_gas, /datum/gas/pluoxium, /datum/gas/stimulum) + breath.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitrogen, /datum/gas/tritium, /datum/gas/nitryl, /datum/gas/pluoxium, /datum/gas/stimulum) //Partial pressures in our breath var/O2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/oxygen][MOLES])+(8*breath.get_breath_partial_pressure(breath_gases[/datum/gas/pluoxium][MOLES])) @@ -261,25 +261,25 @@ else H.radiation += trit_pp/10 - //Brown Gas - var/brown_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/brown_gas][MOLES]) - if (prob(brown_pp)) + // Nitryl + var/nitryl_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/nitryl][MOLES]) + if (prob(nitryl_pp)) to_chat(H, "Your mouth feels like it's burning!") - if (brown_pp >40) + if (nitryl_pp >40) H.emote("gasp") H.adjustFireLoss(10) - if (prob(brown_pp/2)) + if (prob(nitryl_pp/2)) to_chat(H, "Your throat closes up!") H.silent = max(H.silent, 3) else - H.adjustFireLoss(brown_pp/4) - gas_breathed = breath_gases[/datum/gas/brown_gas][MOLES] + H.adjustFireLoss(nitryl_pp/4) + gas_breathed = breath_gases[/datum/gas/nitryl][MOLES] if (gas_breathed > GAS_STIM_MINIMUM) - H.reagents.add_reagent("brown_gas",1) + H.reagents.add_reagent("nitryl_gas",1) - breath_gases[/datum/gas/brown_gas][MOLES]-=gas_breathed + breath_gases[/datum/gas/nitryl][MOLES]-=gas_breathed gas_breathed = 0 - //Stimulum + // Stimulum gas_breathed = breath_gases[/datum/gas/stimulum][MOLES] if (gas_breathed > GAS_STIM_MINIMUM) H.reagents.add_reagent("stimulum",1) diff --git a/icons/effects/tile_effects.dmi b/icons/effects/tile_effects.dmi index 8111fef6dbea5c4fe0221f7b913148c16662afdd..2b380bab5d69c19c0934de2d25e1a9929dca2fe1 100644 GIT binary patch delta 221 zcmV<303!eAAmSj9B!9?yR9JLGWpiV4X>fFDZ*Bkpc$}ThK?{OF5C!1#?ynf~Dp6+L z_7X;T$iE;AZ0 zan0zvd9<6*I(}uMqZQEB!A6%R9JLGWpiV4X>fFDZ*Bkpc$}Th%MOAt5QX7&`xFz{Hb(HW z>&9RV3w#Aq?I=wsHPZt6_AX376O5Of)hxb$V%ThV`5v+&=N*zat^okc31=r#7ClH95ic~zQ#sqS$FWuE> z{1u-FT{Df=BTB@uk@hMem7Tgc`WQ&XurY9~(3WTA|9gKR*EetMa?-wTECn*bw01hR c`XVI~9>aE@L007a4tuhPKPg87hq3i-586Fwt^fc4