This commit is contained in:
Exxion
2018-09-27 17:50:54 -04:00
committed by Intigracy
parent 8807e3dc60
commit c6a7e5098e
26 changed files with 57 additions and 57 deletions

View File

@@ -52,7 +52,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
if(stat >= 2) if(stat >= 2)
return return
if(species.breath_type != "toxins") if(species.breath_type != GAS_PLASMA)
//Burn skin if exposed. //Burn skin if exposed.
if(zas_settings.Get(/datum/ZAS_Setting/SKIN_BURNS)) if(zas_settings.Get(/datum/ZAS_Setting/SKIN_BURNS))

View File

@@ -37,8 +37,8 @@ var/datum/subsystem/plant/SSplant
if(survive_on_station) if(survive_on_station)
if(seed.consume_gasses) if(seed.consume_gasses)
seed.consume_gasses["plasma"] = null //PHORON DOES NOT EXIST seed.consume_gasses[GAS_PLASMA] = null //PHORON DOES NOT EXIST
seed.consume_gasses["carbon_dioxide"] = null seed.consume_gasses[GAS_CARBON] = null
if(seed.chems) if(seed.chems)
seed.chems.Remove(PHENOL) // Eating through the hull will make these plants completely inviable, albeit very dangerous. seed.chems.Remove(PHENOL) // Eating through the hull will make these plants completely inviable, albeit very dangerous.
seed.ideal_heat = initial(seed.ideal_heat) seed.ideal_heat = initial(seed.ideal_heat)

View File

@@ -142,7 +142,7 @@
if(ishuman(M)) if(ishuman(M))
var/mob/living/carbon/human/vamp_H = M var/mob/living/carbon/human/vamp_H = M
if(H.check_body_part_coverage(MOUTH)) if(H.check_body_part_coverage(MOUTH))
if(vamp_H.species.breath_type == "oxygen") if(vamp_H.species.breath_type == GAS_OXYGEN)
to_chat(H, "<span class='warning'>Remove your mask!</span>") to_chat(H, "<span class='warning'>Remove your mask!</span>")
return FALSE return FALSE
else else

View File

@@ -439,7 +439,7 @@
if(ishuman(src)) if(ishuman(src))
var/mob/living/carbon/human/M = src var/mob/living/carbon/human/M = src
if(M.check_body_part_coverage(MOUTH)) if(M.check_body_part_coverage(MOUTH))
if(M.species.breath_type == "oxygen") if(M.species.breath_type == GAS_OXYGEN)
to_chat(src, "<span class='warning'>Remove your mask!</span>") to_chat(src, "<span class='warning'>Remove your mask!</span>")
return 0 return 0
else else

View File

@@ -479,7 +479,7 @@ var/global/list/cryo_health_indicator = list( "full" = image("icon" = 'icons/obj
occupant.sleeping = max(5, (1/occupant.bodytemperature)*2000) occupant.sleeping = max(5, (1/occupant.bodytemperature)*2000)
occupant.Paralyse(max(5, (1/occupant.bodytemperature)*3000)) occupant.Paralyse(max(5, (1/occupant.bodytemperature)*3000))
var/mob/living/carbon/human/guy = occupant //Gotta cast to read this guy's species var/mob/living/carbon/human/guy = occupant //Gotta cast to read this guy's species
if(istype(guy) && guy.species && guy.species.breath_type != "oxygen") if(istype(guy) && guy.species && guy.species.breath_type != GAS_OXYGEN)
occupant.nobreath = 15 //Prevent them from suffocating until someone can get them internals. Also prevents plasmamen from combusting. occupant.nobreath = 15 //Prevent them from suffocating until someone can get them internals. Also prevents plasmamen from combusting.
if(air_contents[GAS_OXYGEN] > 2) if(air_contents[GAS_OXYGEN] > 2)
if(occupant.getOxyLoss()) if(occupant.getOxyLoss())

View File

@@ -41,7 +41,7 @@
wax-- wax--
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
var/datum/gas_mixture/env = T.return_air() var/datum/gas_mixture/env = T.return_air()
if(env.molar_density("oxygen") < (5 / CELL_VOLUME)) if(env.molar_density(GAS_OXYGEN) < (5 / CELL_VOLUME))
src.lit = 0 src.lit = 0
set_light(0) set_light(0)
processing_objects.Remove(src) processing_objects.Remove(src)

View File

@@ -94,7 +94,7 @@ MATCHBOXES ARE ALSO IN FANCY.DM
lit = -1 lit = -1
update_brightness() update_brightness()
return return
if(env.molar_density("oxygen") < (5 / CELL_VOLUME)) if(env.molar_density(GAS_OXYGEN) < (5 / CELL_VOLUME))
lit = -1 lit = -1
update_brightness() update_brightness()
if(M) if(M)
@@ -701,7 +701,7 @@ MATCHBOXES ARE ALSO IN FANCY.DM
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
var/datum/gas_mixture/env = T.return_air() var/datum/gas_mixture/env = T.return_air()
user.delayNextAttack(5) //Hold on there cowboy user.delayNextAttack(5) //Hold on there cowboy
if(!fuel | env.molar_density("oxygen") < (5 / CELL_VOLUME)) if(!fuel | env.molar_density(GAS_OXYGEN) < (5 / CELL_VOLUME))
user.visible_message("<span class='rose'>[user] attempts to light \the [src] to no avail.</span>", \ user.visible_message("<span class='rose'>[user] attempts to light \the [src] to no avail.</span>", \
"<span class='notice'>You try to light \the [src], but no flame appears.</span>") "<span class='notice'>You try to light \the [src], but no flame appears.</span>")
return return
@@ -758,7 +758,7 @@ MATCHBOXES ARE ALSO IN FANCY.DM
visible_message("<span class='warning'>Without warning, \the [src] suddenly shuts off.</span>") visible_message("<span class='warning'>Without warning, \the [src] suddenly shuts off.</span>")
fueltime = null fueltime = null
var/datum/gas_mixture/env = location.return_air() var/datum/gas_mixture/env = location.return_air()
if(env.molar_density("oxygen") < (5 / CELL_VOLUME)) if(env.molar_density(GAS_OXYGEN) < (5 / CELL_VOLUME))
lit = 0 lit = 0
update_brightness() update_brightness()
visible_message("<span class='warning'>Without warning, the flame on \the [src] suddenly goes out in a weak fashion.</span>") visible_message("<span class='warning'>Without warning, the flame on \the [src] suddenly goes out in a weak fashion.</span>")
@@ -781,7 +781,7 @@ MATCHBOXES ARE ALSO IN FANCY.DM
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
var/datum/gas_mixture/env = T.return_air() var/datum/gas_mixture/env = T.return_air()
user.delayNextAttack(5) //Hold on there cowboy user.delayNextAttack(5) //Hold on there cowboy
if(!fuel | env.molar_density("oxygen") < (5 / CELL_VOLUME)) if(!fuel | env.molar_density(GAS_OXYGEN) < (5 / CELL_VOLUME))
user.visible_message("<span class='rose'>[user] attempts to light \the [src] to no avail.</span>", \ user.visible_message("<span class='rose'>[user] attempts to light \the [src] to no avail.</span>", \
"<span class='notice'>You try to light \the [src], but no flame appears.</span>") "<span class='notice'>You try to light \the [src], but no flame appears.</span>")
return return

View File

@@ -78,8 +78,8 @@ obj/structure/transit_tube_pod/ex_act(severity)
/obj/structure/transit_tube_pod/New() /obj/structure/transit_tube_pod/New()
. = ..() . = ..()
air_contents.adjust_multi_temp( air_contents.adjust_multi_temp(
"oxygen", MOLES_O2STANDARD, T20C, GAS_OXYGEN, MOLES_O2STANDARD, T20C,
"nitrogen", MOLES_N2STANDARD, T20C) GAS_NITROGEN, MOLES_N2STANDARD, T20C)
// Give auto tubes time to align before trying to start moving // Give auto tubes time to align before trying to start moving
spawn (5) spawn (5)

View File

@@ -46,41 +46,41 @@
SendSignal(COMSIG_ADJUST_BODYTEMP, list("temp"=((Environment.temperature - controller.getBodyTemperature()) / 5))) SendSignal(COMSIG_ADJUST_BODYTEMP, list("temp"=((Environment.temperature - controller.getBodyTemperature()) / 5)))
if(min_oxy) if(min_oxy)
if(Environment.molar_density("oxygen") < min_oxy) if(Environment.molar_density(GAS_OXYGEN) < min_oxy)
atmos_suitable = 0 atmos_suitable = 0
oxygen_alert = 1 oxygen_alert = 1
else else
oxygen_alert = 0 oxygen_alert = 0
if(max_oxy) if(max_oxy)
if(Environment.molar_density("oxygen") > max_oxy) if(Environment.molar_density(GAS_OXYGEN) > max_oxy)
atmos_suitable = 0 atmos_suitable = 0
if(min_tox) if(min_tox)
if(Environment.molar_density("toxins") < min_tox) if(Environment.molar_density(GAS_PLASMA) < min_tox)
atmos_suitable = 0 atmos_suitable = 0
if(max_tox) if(max_tox)
if(Environment.molar_density("toxins") > max_tox) if(Environment.molar_density(GAS_PLASMA) > max_tox)
atmos_suitable = 0 atmos_suitable = 0
toxins_alert = 1 toxins_alert = 1
else else
toxins_alert = 0 toxins_alert = 0
if(min_n2) if(min_n2)
if(Environment.molar_density("nitrogen") < min_n2) if(Environment.molar_density(GAS_NITROGEN) < min_n2)
atmos_suitable = 0 atmos_suitable = 0
if(max_n2) if(max_n2)
if(Environment.molar_density("nitrogen") > max_n2) if(Environment.molar_density(GAS_NITROGEN) > max_n2)
atmos_suitable = 0 atmos_suitable = 0
if(min_co2) if(min_co2)
if(Environment.molar_density("carbon_dioxide") < min_co2) if(Environment.molar_density(GAS_CARBON) < min_co2)
atmos_suitable = 0 atmos_suitable = 0
if(max_co2) if(max_co2)
if(Environment.molar_density("carbon_dioxide") > max_co2) if(Environment.molar_density(GAS_CARBON) > max_co2)
atmos_suitable = 0 atmos_suitable = 0
//Atmos effect //Atmos effect

View File

@@ -293,12 +293,12 @@
generic_mutation_message("shakes!") generic_mutation_message("shakes!")
if("breathe_aliengas") //This is honestly awful and pretty unfun. It just guarantees that the user will have to apply a new enviro gene. But for now I'm leaving it in if("breathe_aliengas") //This is honestly awful and pretty unfun. It just guarantees that the user will have to apply a new enviro gene. But for now I'm leaving it in
var/gas = pick("oxygen","nitrogen","plasma","carbon_dioxide") var/gas = pick(GAS_OXYGEN, GAS_NITROGEN, GAS_PLASMA, GAS_CARBON)
seed.consume_gasses[gas] = rand(3,9) seed.consume_gasses[gas] = rand(3,9)
generic_mutation_message("shakes!") generic_mutation_message("shakes!")
if("exude_dangerousgas") if("exude_dangerousgas")
var/gas = pick("nitrogen","plasma","carbon_dioxide") var/gas = pick(GAS_NITROGEN, GAS_PLASMA, GAS_CARBON)
seed.exude_gasses[gas] = rand(3,9) seed.exude_gasses[gas] = rand(3,9)
generic_mutation_message("shakes!") generic_mutation_message("shakes!")

View File

@@ -89,12 +89,12 @@ var/global/list/gene_tag_masks = list() // Gene obfuscation for delicious tria
if(prob(5)) if(prob(5))
consume_gasses = list() consume_gasses = list()
var/gas = pick("oxygen","nitrogen","plasma","carbon_dioxide") var/gas = pick(GAS_OXYGEN, GAS_NITROGEN, GAS_PLASMA, GAS_CARBON)
consume_gasses[gas] = rand(3,9) consume_gasses[gas] = rand(3,9)
if(prob(5)) if(prob(5))
exude_gasses = list() exude_gasses = list()
var/gas = pick("oxygen","nitrogen","plasma","carbon_dioxide") var/gas = pick(GAS_OXYGEN, GAS_NITROGEN, GAS_PLASMA, GAS_CARBON)
exude_gasses[gas] = rand(3,9) exude_gasses[gas] = rand(3,9)
chems = list() chems = list()

View File

@@ -1681,7 +1681,7 @@
plant_dmi = 'icons/obj/hydroponics2.dmi' plant_dmi = 'icons/obj/hydroponics2.dmi'
plant_icon = "chickenshroom" plant_icon = "chickenshroom"
chems = list(NUTRIMENT = list(2,10)) chems = list(NUTRIMENT = list(2,10))
consume_gasses = list("nitrogen"=20) //Really likes its nitrogen. Planting on main station may mess with room air mix. consume_gasses = list(GAS_NITROGEN = 20) //Really likes its nitrogen. Planting on main station may mess with room air mix.
lifespan = 30 lifespan = 30
growth_stages = 3 growth_stages = 3

View File

@@ -1674,7 +1674,7 @@ mob/living/carbon/human/isincrit()
species.punch_damage = rand(1,5) species.punch_damage = rand(1,5)
species.max_hurt_damage = rand(1,10) species.max_hurt_damage = rand(1,10)
if(prob(10)) if(prob(10))
species.breath_type = pick("oxygen","toxins","nitrogen","carbon_dioxide") species.breath_type = pick(GAS_OXYGEN, GAS_PLASMA, GAS_NITROGEN, GAS_CARBON)
species.heat_level_3 = rand(800, 1200) species.heat_level_3 = rand(800, 1200)
species.heat_level_2 = round(species.heat_level_3 / 2.5) species.heat_level_2 = round(species.heat_level_3 / 2.5)

View File

@@ -11,7 +11,7 @@
//default_mutations=list(M_SKELETON) // This screws things up //default_mutations=list(M_SKELETON) // This screws things up
primitive = /mob/living/carbon/monkey/skellington/plasma primitive = /mob/living/carbon/monkey/skellington/plasma
breath_type = "toxins" breath_type = GAS_PLASMA
heat_level_1 = 350 // Heat damage level 1 above this point. heat_level_1 = 350 // Heat damage level 1 above this point.
heat_level_2 = 400 // Heat damage level 2 above this point. heat_level_2 = 400 // Heat damage level 2 above this point.
@@ -130,4 +130,4 @@
H.internals.icon_state = "internal1" H.internals.icon_state = "internal1"
/datum/species/plasmaman/can_artifact_revive() /datum/species/plasmaman/can_artifact_revive()
return 0 return 0

View File

@@ -1162,7 +1162,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
/obj/item/weapon/reagent_containers/food/snacks/egg/slime/process() /obj/item/weapon/reagent_containers/food/snacks/egg/slime/process()
var/turf/location = get_turf(src) var/turf/location = get_turf(src)
var/datum/gas_mixture/environment = location.return_air() var/datum/gas_mixture/environment = location.return_air()
if (environment.molar_density("toxins") > MOLES_PLASMA_VISIBLE / CELL_VOLUME)//plasma exposure causes the egg to hatch if (environment.molar_density(GAS_PLASMA) > MOLES_PLASMA_VISIBLE / CELL_VOLUME)//plasma exposure causes the egg to hatch
src.Hatch() src.Hatch()
/obj/item/weapon/reagent_containers/food/snacks/egg/slime/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/weapon/reagent_containers/food/snacks/egg/slime/attackby(obj/item/weapon/W as obj, mob/user as mob)

View File

@@ -50,7 +50,7 @@ var/global/list/whitelisted_species = list("Human")
var/mutantrace // Safeguard due to old code. var/mutantrace // Safeguard due to old code.
var/myhuman // mob reference var/myhuman // mob reference
var/breath_type = "oxygen" // Non-oxygen gas breathed, if any. var/breath_type = GAS_OXYGEN // Non-oxygen gas breathed, if any.
var/survival_gear = /obj/item/weapon/storage/box/survival // For spawnin'. var/survival_gear = /obj/item/weapon/storage/box/survival // For spawnin'.
var/cold_level_1 = 220 // Cold damage level 1 below this point. var/cold_level_1 = 220 // Cold damage level 1 below this point.
@@ -623,7 +623,7 @@ var/global/list/whitelisted_species = list("Human")
cold_level_3 = 0 cold_level_3 = 0
eyes = "vox_eyes_s" eyes = "vox_eyes_s"
breath_type = "nitrogen" breath_type = GAS_NITROGEN
default_mutations = list(M_BEAK, M_TALONS) default_mutations = list(M_BEAK, M_TALONS)
flags = IS_WHITELISTED | NO_SCAN flags = IS_WHITELISTED | NO_SCAN

View File

@@ -303,7 +303,7 @@
if(istype(T)) if(istype(T))
var/datum/gas_mixture/G = loc.return_air() // Check if we're standing in an oxygenless environment var/datum/gas_mixture/G = loc.return_air() // Check if we're standing in an oxygenless environment
if(G) if(G)
oxy = G.molar_density("oxygen") oxy = G.molar_density(GAS_OXYGEN)
if(oxy < (1 / CELL_VOLUME) || fire_stacks <= 0) if(oxy < (1 / CELL_VOLUME) || fire_stacks <= 0)
ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire
return 1 return 1

View File

@@ -17,8 +17,8 @@
var/ping_cooldown = 50 var/ping_cooldown = 50
var/list/required_mols=list( var/list/required_mols=list(
"toxins" = MOLES_PLASMA_VISIBLE / CELL_VOLUME, GAS_PLASMA = MOLES_PLASMA_VISIBLE / CELL_VOLUME,
"oxygen" = 5 / CELL_VOLUME GAS_OXYGEN = 5 / CELL_VOLUME
) )
/obj/item/weapon/reagent_containers/food/snacks/borer_egg/New() /obj/item/weapon/reagent_containers/food/snacks/borer_egg/New()

View File

@@ -241,41 +241,41 @@ var/global/list/animal_count = list() //Stores types, and amount of animals of t
bodytemperature += ((Environment.temperature - bodytemperature) / 5) bodytemperature += ((Environment.temperature - bodytemperature) / 5)
if(min_oxy) if(min_oxy)
if(Environment.molar_density("oxygen") < min_oxy / CELL_VOLUME) if(Environment.molar_density(GAS_OXYGEN) < min_oxy / CELL_VOLUME)
atmos_suitable = 0 atmos_suitable = 0
oxygen_alert = 1 oxygen_alert = 1
else else
oxygen_alert = 0 oxygen_alert = 0
if(max_oxy) if(max_oxy)
if(Environment.molar_density("oxygen") > max_oxy / CELL_VOLUME) if(Environment.molar_density(GAS_OXYGEN) > max_oxy / CELL_VOLUME)
atmos_suitable = 0 atmos_suitable = 0
if(min_tox) if(min_tox)
if(Environment.molar_density("toxins") < min_tox / CELL_VOLUME) if(Environment.molar_density(GAS_PLASMA) < min_tox / CELL_VOLUME)
atmos_suitable = 0 atmos_suitable = 0
if(max_tox) if(max_tox)
if(Environment.molar_density("toxins") > max_tox / CELL_VOLUME) if(Environment.molar_density(GAS_PLASMA) > max_tox / CELL_VOLUME)
atmos_suitable = 0 atmos_suitable = 0
toxins_alert = 1 toxins_alert = 1
else else
toxins_alert = 0 toxins_alert = 0
if(min_n2) if(min_n2)
if(Environment.molar_density("nitrogen") < min_n2 / CELL_VOLUME) if(Environment.molar_density(GAS_NITROGEN) < min_n2 / CELL_VOLUME)
atmos_suitable = 0 atmos_suitable = 0
if(max_n2) if(max_n2)
if(Environment.molar_density("nitrogen") > max_n2 / CELL_VOLUME) if(Environment.molar_density(GAS_NITROGEN) > max_n2 / CELL_VOLUME)
atmos_suitable = 0 atmos_suitable = 0
if(min_co2) if(min_co2)
if(Environment.molar_density("carbon_dioxide") < min_co2 / CELL_VOLUME) if(Environment.molar_density(GAS_CARBON) < min_co2 / CELL_VOLUME)
atmos_suitable = 0 atmos_suitable = 0
if(max_co2) if(max_co2)
if(Environment.molar_density("carbon_dioxide") > max_co2 / CELL_VOLUME) if(Environment.molar_density(GAS_CARBON) > max_co2 / CELL_VOLUME)
atmos_suitable = 0 atmos_suitable = 0
//Atmos effect //Atmos effect

View File

@@ -8,19 +8,19 @@
gasses = list() gasses = list()
var/list/intake_settings=list( var/list/intake_settings=list(
"oxygen" = list( GAS_OXYGEN = list(
new /datum/lung_gas/metabolizable(GAS_OXYGEN, min_pp=16, max_pp=280), new /datum/lung_gas/metabolizable(GAS_OXYGEN, min_pp=16, max_pp=280),
new /datum/lung_gas/waste(GAS_CARBON, max_pp=10), new /datum/lung_gas/waste(GAS_CARBON, max_pp=10),
new /datum/lung_gas/toxic(GAS_PLASMA, max_pp=5, max_pp_mask=0, reagent_id="plasma", reagent_mult=0.1), new /datum/lung_gas/toxic(GAS_PLASMA, max_pp=5, max_pp_mask=0, reagent_id="plasma", reagent_mult=0.1),
new /datum/lung_gas/sleep_agent(GAS_SLEEPING, min_giggle_pp=1, min_para_pp=5, min_sleep_pp=10), new /datum/lung_gas/sleep_agent(GAS_SLEEPING, min_giggle_pp=1, min_para_pp=5, min_sleep_pp=10),
), ),
"nitrogen" = list( GAS_NITROGEN = list(
new /datum/lung_gas/metabolizable(GAS_NITROGEN, min_pp=16, max_pp=280), new /datum/lung_gas/metabolizable(GAS_NITROGEN, min_pp=16, max_pp=280),
new /datum/lung_gas/waste(GAS_CARBON, max_pp=10), // I guess? Ideally it'd be some sort of nitrogen compound. Maybe N2O? new /datum/lung_gas/waste(GAS_CARBON, max_pp=10), // I guess? Ideally it'd be some sort of nitrogen compound. Maybe N2O?
new /datum/lung_gas/toxic(GAS_OXYGEN, max_pp=0.5, max_pp_mask=0, reagent_id="oxygen", reagent_mult=0.1), new /datum/lung_gas/toxic(GAS_OXYGEN, max_pp=0.5, max_pp_mask=0, reagent_id=GAS_OXYGEN, reagent_mult=0.1),
new /datum/lung_gas/sleep_agent(GAS_SLEEPING, min_giggle_pp=1, min_para_pp=5, min_sleep_pp=10), new /datum/lung_gas/sleep_agent(GAS_SLEEPING, min_giggle_pp=1, min_para_pp=5, min_sleep_pp=10),
), ),
"plasma" = list( GAS_PLASMA = list(
new /datum/lung_gas/metabolizable(GAS_PLASMA, min_pp=16, max_pp=280), new /datum/lung_gas/metabolizable(GAS_PLASMA, min_pp=16, max_pp=280),
new /datum/lung_gas/waste(GAS_OXYGEN, max_pp=10), new /datum/lung_gas/waste(GAS_OXYGEN, max_pp=10),
new /datum/lung_gas/sleep_agent(GAS_SLEEPING, min_giggle_pp=1, min_para_pp=5, min_sleep_pp=10), new /datum/lung_gas/sleep_agent(GAS_SLEEPING, min_giggle_pp=1, min_para_pp=5, min_sleep_pp=10),

View File

@@ -14,10 +14,10 @@
if(holder) if(holder)
var/datum/gas_mixture/env = holder.loc.return_air() var/datum/gas_mixture/env = holder.loc.return_air()
if(env) if(env)
env.adjust_gas("carbon_dioxide", rand(2,15)) env.adjust_gas(GAS_CARBON, rand(2,15))
/datum/artifact_effect/gasco2/DoEffectAura() /datum/artifact_effect/gasco2/DoEffectAura()
if(holder) if(holder)
var/datum/gas_mixture/env = holder.loc.return_air() var/datum/gas_mixture/env = holder.loc.return_air()
if(env && env.pressure < max_pressure) if(env && env.pressure < max_pressure)
env.adjust_gas("carbon_dioxide", pick(0, 0, 0.1, rand())) env.adjust_gas(GAS_CARBON, pick(0, 0, 0.1, rand()))

View File

@@ -15,10 +15,10 @@
if(holder) if(holder)
var/datum/gas_mixture/env = holder.loc.return_air() var/datum/gas_mixture/env = holder.loc.return_air()
if(env) if(env)
env.adjust_gas("nitrogen", rand(2,15)) env.adjust_gas(GAS_NITROGEN, rand(2,15))
/datum/artifact_effect/gasnitro/DoEffectAura() /datum/artifact_effect/gasnitro/DoEffectAura()
if(holder) if(holder)
var/datum/gas_mixture/env = holder.loc.return_air() var/datum/gas_mixture/env = holder.loc.return_air()
if(env && env.pressure < max_pressure) if(env && env.pressure < max_pressure)
env.adjust_gas("nitrogen", pick(0, 0, 0.1, rand())) env.adjust_gas(GAS_NITROGEN, pick(0, 0, 0.1, rand()))

View File

@@ -15,10 +15,10 @@
if(holder) if(holder)
var/datum/gas_mixture/env = holder.loc.return_air() var/datum/gas_mixture/env = holder.loc.return_air()
if(env) if(env)
env.adjust_gas("oxygen", rand(2,15)) env.adjust_gas(GAS_OXYGEN, rand(2,15))
/datum/artifact_effect/gasoxy/DoEffectAura() /datum/artifact_effect/gasoxy/DoEffectAura()
if(holder) if(holder)
var/datum/gas_mixture/env = holder.loc.return_air() var/datum/gas_mixture/env = holder.loc.return_air()
if(env && env.pressure < max_pressure) if(env && env.pressure < max_pressure)
env.adjust_gas("oxygen", pick(0, 0, 0.1, rand())) env.adjust_gas(GAS_OXYGEN, pick(0, 0, 0.1, rand()))

View File

@@ -15,10 +15,10 @@
if(holder) if(holder)
var/datum/gas_mixture/env = holder.loc.return_air() var/datum/gas_mixture/env = holder.loc.return_air()
if(env) if(env)
env.adjust_gas("plasma", rand(2,15)) env.adjust_gas(GAS_PLASMA, rand(2,15))
/datum/artifact_effect/gasplasma/DoEffectAura() /datum/artifact_effect/gasplasma/DoEffectAura()
if(holder) if(holder)
var/datum/gas_mixture/env = holder.loc.return_air() var/datum/gas_mixture/env = holder.loc.return_air()
if(env && env.pressure < max_pressure) if(env && env.pressure < max_pressure)
env.adjust_gas("plasma", pick(0, 0, 0.1, rand())) env.adjust_gas(GAS_PLASMA, pick(0, 0, 0.1, rand()))

View File

@@ -7,7 +7,7 @@
/datum/artifact_trigger/gas/New() /datum/artifact_trigger/gas/New()
..() ..()
trigger_gas = pick("TOXINS", "CARBON_DIOXIDE", "NITROGEN", "OXYGEN") trigger_gas = pick("PLASMA", "CARBON_DIOXIDE", "NITROGEN", "OXYGEN") //TODO: See if these can be replaced with the defines without fucking up
/datum/artifact_trigger/gas/CheckTrigger() /datum/artifact_trigger/gas/CheckTrigger()

View File

@@ -103,7 +103,7 @@
if(heating == BUNSEN_ON) if(heating == BUNSEN_ON)
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
var/datum/gas_mixture/G = T.return_air() var/datum/gas_mixture/G = T.return_air()
if(!G || G.molar_density("oxygen") < 0.1 / CELL_VOLUME) if(!G || G.molar_density(GAS_OXYGEN) < 0.1 / CELL_VOLUME)
visible_message("<span class = 'warning'>\The [src] splutters out from lack of oxygen.</span>","<span class = 'warning'>You hear something cough.</span>") visible_message("<span class = 'warning'>\The [src] splutters out from lack of oxygen.</span>","<span class = 'warning'>You hear something cough.</span>")
toggle() toggle()
return return