diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index a564de2836..ed24af6b87 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -25,7 +25,7 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh) if(locate(/obj/fire) in src) return 1 var/datum/gas_mixture/air_contents = return_air() - if(!air_contents || exposed_temperature < PLASMA_MINIMUM_BURN_TEMPERATURE) + if(!air_contents || exposed_temperature < PHORON_MINIMUM_BURN_TEMPERATURE) return 0 var/igniting = 0 @@ -139,7 +139,7 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh) //Ensure flow temperature is higher than minimum fire temperatures. //this creates some energy ex nihilo but is necessary to get a fire started //lets just pretend this energy comes from the ignition source and dont mention this again - //flow.temperature = max(PLASMA_MINIMUM_BURN_TEMPERATURE+0.1,flow.temperature) + //flow.temperature = max(PHORON_MINIMUM_BURN_TEMPERATURE+0.1,flow.temperature) //burn baby burn! @@ -188,7 +188,7 @@ turf/simulated/apply_fire_protection() datum/gas_mixture/proc/zburn(obj/effect/decal/cleanable/liquid_fuel/liquid, force_burn) var/value = 0 - if((temperature > PLASMA_MINIMUM_BURN_TEMPERATURE || force_burn) && check_recombustability(liquid)) + if((temperature > PHORON_MINIMUM_BURN_TEMPERATURE || force_burn) && check_recombustability(liquid)) var/total_fuel = 0 var/datum/gas/volatile_fuel/fuel = locate() in trace_gases diff --git a/code/ZAS/Plasma.dm b/code/ZAS/Phoron.dm similarity index 86% rename from code/ZAS/Plasma.dm rename to code/ZAS/Phoron.dm index 716ea21640..64751e1e8c 100644 --- a/code/ZAS/Plasma.dm +++ b/code/ZAS/Phoron.dm @@ -1,17 +1,17 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') /pl_control - var/PLASMA_DMG = 3 - var/PLASMA_DMG_NAME = "Plasma Damage Amount" - var/PLASMA_DMG_DESC = "Self Descriptive" + var/PHORON_DMG = 3 + var/PHORON_DMG_NAME = "Plasma Damage Amount" + var/PHORON_DMG_DESC = "Self Descriptive" var/CLOTH_CONTAMINATION = 1 var/CLOTH_CONTAMINATION_NAME = "Cloth Contamination" var/CLOTH_CONTAMINATION_DESC = "If this is on, plasma does damage by getting into cloth." - var/PLASMAGUARD_ONLY = 0 - var/PLASMAGUARD_ONLY_NAME = "\"PlasmaGuard Only\"" - var/PLASMAGUARD_ONLY_DESC = "If this is on, only biosuits and spacesuits protect against contamination and ill effects." + var/PHORONGUARD_ONLY = 0 + var/PHORONGUARD_ONLY_NAME = "\"PlasmaGuard Only\"" + var/PHORONGUARD_ONLY_DESC = "If this is on, only biosuits and spacesuits protect against contamination and ill effects." var/GENETIC_CORRUPTION = 0 var/GENETIC_CORRUPTION_NAME = "Genetic Corruption Chance" @@ -29,9 +29,9 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') var/CONTAMINATION_LOSS_NAME = "Contamination Loss" var/CONTAMINATION_LOSS_DESC = "How much toxin damage is dealt from contaminated clothing" //Per tick? ASK ARYN - var/PLASMA_HALLUCINATION = 0 - var/PLASMA_HALLUCINATION_NAME = "Plasma Hallucination" - var/PLASMA_HALLUCINATION_DESC = "Does being in plasma cause you to hallucinate?" + var/PHORON_HALLUCINATION = 0 + var/PHORON_HALLUCINATION_NAME = "Plasma Hallucination" + var/PHORON_HALLUCINATION_DESC = "Does being in plasma cause you to hallucinate?" var/N2O_HALLUCINATION = 1 var/N2O_HALLUCINATION_NAME = "N2O Hallucination" @@ -43,7 +43,7 @@ obj/var/contaminated = 0 /obj/item/proc/can_contaminate() //Clothing and backpacks can be contaminated. - if(flags & PLASMAGUARD) return 0 + if(flags & PHORONGUARD) return 0 else if(istype(src,/obj/item/weapon/storage/backpack)) return 0 //Cannot be washed :( else if(istype(src,/obj/item/clothing)) return 1 @@ -128,8 +128,8 @@ obj/var/contaminated = 0 /mob/living/carbon/human/proc/pl_head_protected() //Checks if the head is adequately sealed. if(head) - if(vsc.plc.PLASMAGUARD_ONLY) - if(head.flags & PLASMAGUARD) + if(vsc.plc.PHORONGUARD_ONLY) + if(head.flags & PHORONGUARD) return 1 else if(head.flags & HEADCOVERSEYES) return 1 @@ -138,8 +138,8 @@ obj/var/contaminated = 0 /mob/living/carbon/human/proc/pl_suit_protected() //Checks if the suit is adequately sealed. if(wear_suit) - if(vsc.plc.PLASMAGUARD_ONLY) - if(wear_suit.flags & PLASMAGUARD) return 1 + if(vsc.plc.PHORONGUARD_ONLY) + if(wear_suit.flags & PHORONGUARD) return 1 else if(wear_suit.flags_inv & HIDEJUMPSUIT) return 1 return 0 @@ -158,6 +158,6 @@ turf/Entered(obj/item/I) var/datum/gas_mixture/env = return_air(1) if(!env) return - if(env.toxins > MOLES_PLASMA_VISIBLE + 1) + if(env.toxins > MOLES_PHORON_VISIBLE + 1) if(I.can_contaminate()) I.contaminate() \ No newline at end of file diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index 92841a02dc..d19eb8230c 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -199,38 +199,38 @@ var/global/vs_control/vsc = new switch(def) if("Plasma - Standard") plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. - plc.PLASMAGUARD_ONLY = 0 + plc.PHORONGUARD_ONLY = 0 plc.GENETIC_CORRUPTION = 0 //Chance of genetic corruption as well as toxic damage, X in 1000. plc.SKIN_BURNS = 0 //Plasma has an effect similar to mustard gas on the un-suited. plc.EYE_BURNS = 1 //Plasma burns the eyes of anyone not wearing eye protection. - plc.PLASMA_HALLUCINATION = 0 + plc.PHORON_HALLUCINATION = 0 plc.CONTAMINATION_LOSS = 0.02 if("Plasma - Low Hazard") plc.CLOTH_CONTAMINATION = 0 //If this is on, plasma does damage by getting into cloth. - plc.PLASMAGUARD_ONLY = 0 + plc.PHORONGUARD_ONLY = 0 plc.GENETIC_CORRUPTION = 0 //Chance of genetic corruption as well as toxic damage, X in 1000 plc.SKIN_BURNS = 0 //Plasma has an effect similar to mustard gas on the un-suited. plc.EYE_BURNS = 1 //Plasma burns the eyes of anyone not wearing eye protection. - plc.PLASMA_HALLUCINATION = 0 + plc.PHORON_HALLUCINATION = 0 plc.CONTAMINATION_LOSS = 0.01 if("Plasma - High Hazard") plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. - plc.PLASMAGUARD_ONLY = 0 + plc.PHORONGUARD_ONLY = 0 plc.GENETIC_CORRUPTION = 0 //Chance of genetic corruption as well as toxic damage, X in 1000. plc.SKIN_BURNS = 1 //Plasma has an effect similar to mustard gas on the un-suited. plc.EYE_BURNS = 1 //Plasma burns the eyes of anyone not wearing eye protection. - plc.PLASMA_HALLUCINATION = 1 + plc.PHORON_HALLUCINATION = 1 plc.CONTAMINATION_LOSS = 0.05 if("Plasma - Oh Shit!") plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. - plc.PLASMAGUARD_ONLY = 1 + plc.PHORONGUARD_ONLY = 1 plc.GENETIC_CORRUPTION = 5 //Chance of genetic corruption as well as toxic damage, X in 1000. plc.SKIN_BURNS = 1 //Plasma has an effect similar to mustard gas on the un-suited. plc.EYE_BURNS = 1 //Plasma burns the eyes of anyone not wearing eye protection. - plc.PLASMA_HALLUCINATION = 1 + plc.PHORON_HALLUCINATION = 1 plc.CONTAMINATION_LOSS = 0.075 if("ZAS - Normal") diff --git a/code/ZAS/_gas_mixture.dm b/code/ZAS/_gas_mixture.dm index 9a829633e2..f3aea593ba 100644 --- a/code/ZAS/_gas_mixture.dm +++ b/code/ZAS/_gas_mixture.dm @@ -206,7 +206,7 @@ What are the archived variables for? //Outputs: 1 if graphic changed, 0 if unchanged graphic = 0 - if(toxins > MOLES_PLASMA_VISIBLE) + if(toxins > MOLES_PHORON_VISIBLE) graphic = 1 else if(length(trace_gases)) var/datum/gas/sleeping_agent = locate(/datum/gas/sleeping_agent) in trace_gases diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 7cdfe57af3..a221ab4ed7 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -171,7 +171,7 @@ update_flag else can_label = 0 - if(air_contents.temperature > PLASMA_FLASHPOINT) + if(air_contents.temperature > PHORON_FLASHPOINT) air_contents.zburn() return diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index 1d59701bb7..8025b270e2 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -136,12 +136,12 @@ PT.master = V OT.master = V - PT.air_contents.temperature = PLASMA_FLASHPOINT + PT.air_contents.temperature = PHORON_FLASHPOINT PT.air_contents.toxins = 3 PT.air_contents.carbon_dioxide = 17 PT.air_contents.update_values() - OT.air_contents.temperature = PLASMA_FLASHPOINT + OT.air_contents.temperature = PHORON_FLASHPOINT OT.air_contents.oxygen = 20 OT.air_contents.update_values() diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 01e009232d..298e4134dd 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -2,7 +2,7 @@ #define ORE_PROC_SILVER 2 #define ORE_PROC_DIAMOND 4 #define ORE_PROC_GLASS 8 -#define ORE_PROC_PLASMA 16 +#define ORE_PROC_PHORON 16 #define ORE_PROC_URANIUM 32 #define ORE_PROC_IRON 64 #define ORE_PROC_CLOWN 128 @@ -61,13 +61,13 @@ //plasma if(machine.ore_plasma) - if (machine.selected & ORE_PROC_PLASMA) + if (machine.selected & ORE_PROC_PHORON) dat += text("Smelting ") else dat += text("Not smelting ") dat += text("Plasma: [machine.ore_plasma]
") else - machine.selected &= ~ORE_PROC_PLASMA + machine.selected &= ~ORE_PROC_PHORON //uranium if(machine.ore_uranium) @@ -150,9 +150,9 @@ machine.selected &= ~ORE_PROC_GLASS if(href_list["sel_plasma"]) if (href_list["sel_plasma"] == "yes") - machine.selected |= ORE_PROC_PLASMA + machine.selected |= ORE_PROC_PHORON else - machine.selected &= ~ORE_PROC_PLASMA + machine.selected &= ~ORE_PROC_PHORON if(href_list["sel_uranium"]) if (href_list["sel_uranium"] == "yes") machine.selected |= ORE_PROC_URANIUM @@ -280,7 +280,7 @@ else on = 0 continue - if (selected == ORE_PROC_PLASMA) + if (selected == ORE_PROC_PHORON) if (ore_plasma > 0) ore_plasma--; new /obj/item/stack/sheet/mineral/plasma(output.loc) @@ -301,7 +301,7 @@ else on = 0 continue - if (selected == ORE_PROC_IRON + ORE_PROC_PLASMA) + if (selected == ORE_PROC_IRON + ORE_PROC_PHORON) if (ore_iron > 0 && ore_plasma > 0) ore_iron--; ore_plasma--; @@ -317,7 +317,7 @@ on = 0 continue /* - if (selected == ORE_PROC_GLASS + ORE_PROC_PLASMA) + if (selected == ORE_PROC_GLASS + ORE_PROC_PHORON) if (ore_glass > 0 && ore_plasma > 0) ore_glass--; ore_plasma--; @@ -325,7 +325,7 @@ else on = 0 continue - if (selected == ORE_PROC_GLASS + ORE_PROC_IRON + ORE_PROC_PLASMA) + if (selected == ORE_PROC_GLASS + ORE_PROC_IRON + ORE_PROC_PHORON) if (ore_glass > 0 && ore_plasma > 0 && ore_iron > 0) ore_glass--; ore_iron--; @@ -345,7 +345,7 @@ else on = 0 continue - if (selected == ORE_PROC_SILVER + ORE_PROC_PLASMA) + if (selected == ORE_PROC_SILVER + ORE_PROC_PHORON) if (ore_silver >= 1 && ore_plasma >= 3) ore_silver -= 1 ore_plasma -= 3 @@ -375,7 +375,7 @@ if (selected & ORE_PROC_URANIUM) if (ore_uranium <= 0) b = 0 - if (selected & ORE_PROC_PLASMA) + if (selected & ORE_PROC_PHORON) if (ore_plasma <= 0) b = 0 if (selected & ORE_PROC_IRON) @@ -397,7 +397,7 @@ ore_diamond-- if (selected & ORE_PROC_URANIUM) ore_uranium-- - if (selected & ORE_PROC_PLASMA) + if (selected & ORE_PROC_PHORON) ore_plasma-- if (selected & ORE_PROC_IRON) ore_iron-- diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 867ccc72bc..9a43480138 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -508,13 +508,13 @@ if(Toxins_pp > safe_toxins_max) // Too much toxins var/ratio = (breath.toxins/safe_toxins_max) * 10 - //adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) //Limit amount of damage toxin exposure can do per second + //adjustToxLoss(Clamp(ratio, MIN_PHORON_DAMAGE, MAX_PHORON_DAMAGE)) //Limit amount of damage toxin exposure can do per second if(reagents) - reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) + reagents.add_reagent("plasma", Clamp(ratio, MIN_PHORON_DAMAGE, MAX_PHORON_DAMAGE)) toxins_alert = max(toxins_alert, 1) else if(O2_pp > vox_oxygen_max && species.name == "Vox") //Oxygen is toxic to vox. var/ratio = (breath.oxygen/vox_oxygen_max) * 1000 - adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) + adjustToxLoss(Clamp(ratio, MIN_PHORON_DAMAGE, MAX_PHORON_DAMAGE)) toxins_alert = max(toxins_alert, 1) else toxins_alert = 0 @@ -578,7 +578,7 @@ else loc_temp = environment.temperature - if(abs(loc_temp - 293.15) < 20 && abs(bodytemperature - 310.14) < 0.5 && environment.toxins < MOLES_PLASMA_VISIBLE) + if(abs(loc_temp - 293.15) < 20 && abs(bodytemperature - 310.14) < 0.5 && environment.toxins < MOLES_PHORON_VISIBLE) return // Temperatures are within normal ranges, fuck all this processing. ~Ccomp //Body temperature is adjusted in two steps. Firstly your body tries to stabilize itself a bit. @@ -659,7 +659,7 @@ else pressure_alert = -1 - if(environment.toxins > MOLES_PLASMA_VISIBLE) + if(environment.toxins > MOLES_PHORON_VISIBLE) pl_effects() return diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 87404b7a21..3985f70536 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -1027,7 +1027,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 /obj/item/weapon/reagent_containers/food/snacks/egg/slime/process() var/turf/location = get_turf(src) var/datum/gas_mixture/environment = location.return_air() - if (environment.toxins > MOLES_PLASMA_VISIBLE)//plasma exposure causes the egg to hatch + if (environment.toxins > MOLES_PHORON_VISIBLE)//plasma exposure causes the egg to hatch src.Hatch() /obj/item/weapon/reagent_containers/food/snacks/egg/slime/attackby(obj/item/weapon/W as obj, mob/user as mob) diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 7e2d73abe4..709632a90e 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -364,7 +364,7 @@ var/ratio = (breath.toxins/safe_toxins_max) * 10 //adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) //Limit amount of damage toxin exposure can do per second if(reagents) - reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) + reagents.add_reagent("plasma", Clamp(ratio, MIN_PHORON_DAMAGE, MAX_PHORON_DAMAGE)) toxins_alert = max(toxins_alert, 1) else toxins_alert = 0 @@ -397,7 +397,7 @@ if(!environment) return - if(abs(environment.temperature - 293.15) < 20 && abs(bodytemperature - 310.14) < 0.5 && environment.toxins < MOLES_PLASMA_VISIBLE) + if(abs(environment.temperature - 293.15) < 20 && abs(bodytemperature - 310.14) < 0.5 && environment.toxins < MOLES_PHORON_VISIBLE) return // Temperatures are within normal ranges, fuck all this processing. ~Ccomp var/environment_heat_capacity = environment.heat_capacity() diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm index a0762ff51e..a81886b6c3 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm @@ -13,7 +13,7 @@ #define TRIGGER_ENERGY 6 #define TRIGGER_HEAT 7 #define TRIGGER_COLD 8 -#define TRIGGER_PLASMA 9 +#define TRIGGER_PHORON 9 #define TRIGGER_OXY 10 #define TRIGGER_CO2 11 #define TRIGGER_NITRO 12 @@ -108,7 +108,7 @@ var/list/valid_secondary_effect_types = list(\ if(prob(25)) my_effect.trigger = rand(1,4) -#define TRIGGER_PLASMA 9 +#define TRIGGER_PHORON 9 #define TRIGGER_OXY 10 #define TRIGGER_CO2 11 #define TRIGGER_NITRO 12 @@ -176,16 +176,16 @@ var/list/valid_secondary_effect_types = list(\ if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && !secondary_effect.activated) secondary_effect.ToggleActivate(0) - //PLASMA GAS ACTIVATION + //PHORON GAS ACTIVATION if(trigger_plasma) - if(my_effect.trigger == TRIGGER_PLASMA && !my_effect.activated) + if(my_effect.trigger == TRIGGER_PHORON && !my_effect.activated) my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_PLASMA && !secondary_effect.activated) + if(secondary_effect && secondary_effect.trigger == TRIGGER_PHORON && !secondary_effect.activated) secondary_effect.ToggleActivate(0) else - if(my_effect.trigger == TRIGGER_PLASMA && my_effect.activated) + if(my_effect.trigger == TRIGGER_PHORON && my_effect.activated) my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_PLASMA && !secondary_effect.activated) + if(secondary_effect && secondary_effect.trigger == TRIGGER_PHORON && !secondary_effect.activated) secondary_effect.ToggleActivate(0) //OXYGEN GAS ACTIVATION diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index f1ca0acc79..f1ecc0f659 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -1,7 +1,7 @@ #define NITROGEN_RETARDATION_FACTOR 4 //Higher == N2 slows reaction more #define THERMAL_RELEASE_MODIFIER 10 //Higher == less heat released during reaction -#define PLASMA_RELEASE_MODIFIER 1500 //Higher == less plasma released by reaction +#define PHORON_RELEASE_MODIFIER 1500 //Higher == less plasma released by reaction #define OXYGEN_RELEASE_MODIFIER 750 //Higher == less oxygen released at high temperature/power #define REACTION_POWER_MODIFIER 1.1 //Higher == more overall power @@ -172,7 +172,7 @@ removed.temperature = max(0, min(removed.temperature, 2500)) //Calculate how much gas to release - removed.toxins += max(device_energy / PLASMA_RELEASE_MODIFIER, 0) + removed.toxins += max(device_energy / PHORON_RELEASE_MODIFIER, 0) removed.oxygen += max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0) diff --git a/code/setup.dm b/code/setup.dm index c56aefde1d..9c3ef88a69 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -16,9 +16,9 @@ #define MOLES_O2STANDARD MOLES_CELLSTANDARD*O2STANDARD // O2 standard value (21%) #define MOLES_N2STANDARD MOLES_CELLSTANDARD*N2STANDARD // N2 standard value (79%) -#define MOLES_PLASMA_VISIBLE 0.7 //Moles in a standard cell after which plasma is visible -#define MIN_PLASMA_DAMAGE 1 -#define MAX_PLASMA_DAMAGE 10 +#define MOLES_PHORON_VISIBLE 0.7 //Moles in a standard cell after which plasma is visible +#define MIN_PHORON_DAMAGE 1 +#define MAX_PHORON_DAMAGE 10 #define BREATH_VOLUME 0.5 //liters in a normal breath #define BREATH_MOLES (ONE_ATMOSPHERE * BREATH_VOLUME /(T20C*R_IDEAL_GAS_EQUATION)) @@ -112,7 +112,7 @@ #define FIRE_MINIMUM_TEMPERATURE_TO_EXIST 100+T0C #define FIRE_SPREAD_RADIOSITY_SCALE 0.85 #define FIRE_CARBON_ENERGY_RELEASED 500000 //Amount of heat released per mole of burnt carbon into the tile -#define FIRE_PLASMA_ENERGY_RELEASED 3000000 //Amount of heat released per mole of burnt plasma into the tile +#define FIRE_PHORON_ENERGY_RELEASED 3000000 //Amount of heat released per mole of burnt plasma into the tile #define FIRE_GROWTH_RATE 40000 //For small fires #define WATER_BOIL_TEMP 393 */ @@ -122,12 +122,12 @@ #define CARBON_LIFEFORM_FIRE_DAMAGE 4 //Plasma fire properties -#define PLASMA_MINIMUM_BURN_TEMPERATURE 100+T0C -#define PLASMA_FLASHPOINT 246+T0C -#define PLASMA_UPPER_TEMPERATURE 1370+T0C -#define PLASMA_MINIMUM_OXYGEN_NEEDED 2 -#define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO 20 -#define PLASMA_OXYGEN_FULLBURN 10 +#define PHORON_MINIMUM_BURN_TEMPERATURE 100+T0C +#define PHORON_FLASHPOINT 246+T0C +#define PHORON_UPPER_TEMPERATURE 1370+T0C +#define PHORON_MINIMUM_OXYGEN_NEEDED 2 +#define PHORON_MINIMUM_OXYGEN_PHORON_RATIO 20 +#define PHORON_OXYGEN_FULLBURN 10 #define T0C 273.15 // 0degC #define T20C 293.15 // 20degC @@ -205,7 +205,7 @@ var/MAX_EXPLOSION_RANGE = 14 #define BLOCK_GAS_SMOKE_EFFECT 8192 // blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! (NOTE: flag shared with ONESIZEFITSALL) #define ONESIZEFITSALL 8192 -#define PLASMAGUARD 16384 //Does not get contaminated by plasma. +#define PHORONGUARD 16384 //Does not get contaminated by plasma. #define NOREACT 16384 //Reagents dont' react inside this container.