diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 2dfa10d345..40a9f325b0 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -84,8 +84,8 @@ Filter types: switch(filter_type) if(0) //removing hydrocarbons - filtered_out.toxins = removed.toxins - removed.toxins = 0 + filtered_out.phoron = removed.phoron + removed.phoron = 0 if(removed.trace_gases.len>0) for(var/datum/gas/trace_gas in removed.trace_gases) diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index 4c386f44ec..4cf3829c87 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -70,7 +70,7 @@ "scrubbing" = scrubbing, "panic" = panic, "filter_co2" = scrub_CO2, - "filter_toxins" = scrub_Toxins, + "filter_phoron" = scrub_Toxins, "filter_n2o" = scrub_N2O, "sigtype" = "status" ) @@ -104,7 +104,7 @@ var/datum/gas_mixture/environment = loc.return_air() if(scrubbing) - if((environment.toxins>0) || (environment.carbon_dioxide>0) || (environment.trace_gases.len>0)) + if((environment.phoron>0) || (environment.carbon_dioxide>0) || (environment.trace_gases.len>0)) var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles() //Take a gas sample @@ -116,8 +116,8 @@ var/datum/gas_mixture/filtered_out = new filtered_out.temperature = removed.temperature if(scrub_Toxins) - filtered_out.toxins = removed.toxins - removed.toxins = 0 + filtered_out.phoron = removed.phoron + removed.phoron = 0 if(scrub_CO2) filtered_out.carbon_dioxide = removed.carbon_dioxide removed.carbon_dioxide = 0 diff --git a/code/ATMOSPHERICS/datum_pipe_network.dm b/code/ATMOSPHERICS/datum_pipe_network.dm index bff2d0ee5e..b7f1734865 100644 --- a/code/ATMOSPHERICS/datum_pipe_network.dm +++ b/code/ATMOSPHERICS/datum_pipe_network.dm @@ -82,7 +82,7 @@ datum/pipe_network air_transient.oxygen = 0 air_transient.nitrogen = 0 - air_transient.toxins = 0 + air_transient.phoron = 0 air_transient.carbon_dioxide = 0 @@ -96,7 +96,7 @@ datum/pipe_network air_transient.oxygen += gas.oxygen air_transient.nitrogen += gas.nitrogen - air_transient.toxins += gas.toxins + air_transient.phoron += gas.phoron air_transient.carbon_dioxide += gas.carbon_dioxide if(gas.trace_gases.len) @@ -124,7 +124,7 @@ datum/pipe_network for(var/datum/gas_mixture/gas in gases) gas.oxygen = air_transient.oxygen*gas.volume/air_transient.volume gas.nitrogen = air_transient.nitrogen*gas.volume/air_transient.volume - gas.toxins = air_transient.toxins*gas.volume/air_transient.volume + gas.phoron = air_transient.phoron*gas.volume/air_transient.volume gas.carbon_dioxide = air_transient.carbon_dioxide*gas.volume/air_transient.volume gas.temperature = air_transient.temperature @@ -151,7 +151,7 @@ proc/equalize_gases(datum/gas_mixture/list/gases) var/total_oxygen = 0 var/total_nitrogen = 0 - var/total_toxins = 0 + var/total_phoron = 0 var/total_carbon_dioxide = 0 var/list/total_trace_gases = list() @@ -164,7 +164,7 @@ proc/equalize_gases(datum/gas_mixture/list/gases) total_oxygen += gas.oxygen total_nitrogen += gas.nitrogen - total_toxins += gas.toxins + total_phoron += gas.phoron total_carbon_dioxide += gas.carbon_dioxide if(gas.trace_gases.len) @@ -188,7 +188,7 @@ proc/equalize_gases(datum/gas_mixture/list/gases) for(var/datum/gas_mixture/gas in gases) gas.oxygen = total_oxygen*gas.volume/total_volume gas.nitrogen = total_nitrogen*gas.volume/total_volume - gas.toxins = total_toxins*gas.volume/total_volume + gas.phoron = total_phoron*gas.volume/total_volume gas.carbon_dioxide = total_carbon_dioxide*gas.volume/total_volume gas.temperature = temperature diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm index 3501b606d5..61d7a48d5f 100644 --- a/code/ATMOSPHERICS/datum_pipeline.dm +++ b/code/ATMOSPHERICS/datum_pipeline.dm @@ -39,7 +39,7 @@ datum/pipeline member.air_temporary.oxygen = air.oxygen*member.volume/air.volume member.air_temporary.nitrogen = air.nitrogen*member.volume/air.volume - member.air_temporary.toxins = air.toxins*member.volume/air.volume + member.air_temporary.phoron = air.phoron*member.volume/air.volume member.air_temporary.carbon_dioxide = air.carbon_dioxide*member.volume/air.volume member.air_temporary.temperature = air.temperature diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index 58413a7529..c1fa2b0e9e 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -884,7 +884,7 @@ obj/machinery/atmospherics/pipe/tank/carbon_dioxide ..() -obj/machinery/atmospherics/pipe/tank/toxins +obj/machinery/atmospherics/pipe/tank/phoron icon = 'icons/obj/atmospherics/orange_pipe_tank.dmi' name = "Pressure Tank (Phoron)" @@ -893,7 +893,7 @@ obj/machinery/atmospherics/pipe/tank/toxins air_temporary.volume = volume air_temporary.temperature = T20C - air_temporary.toxins = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature) + air_temporary.phoron = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature) ..() @@ -1005,7 +1005,7 @@ obj/machinery/atmospherics/pipe/tank/attackby(var/obj/item/weapon/W as obj, var/ var/o2_concentration = parent.air.oxygen/total_moles var/n2_concentration = parent.air.nitrogen/total_moles var/co2_concentration = parent.air.carbon_dioxide/total_moles - var/phoron_concentration = parent.air.toxins/total_moles + var/phoron_concentration = parent.air.phoron/total_moles var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+phoron_concentration) diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm b/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm index cd2c016d31..c31d6138df 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm @@ -4,7 +4,7 @@ Deuterium-deuterium fusion : 40 x 10^7 K Deuterium-tritium fusion: 4.5 x 10^7 K */ -//#DEFINE MAX_STORED_ENERGY (held_phoron.toxins * held_phoron.toxins * SPECIFIC_HEAT_TOXIN) +//#DEFINE MAX_STORED_ENERGY (held_phoron.phoron * held_phoron.phoron * SPECIFIC_HEAT_TOXIN) /obj/effect/rust_em_field name = "EM Field" @@ -140,19 +140,19 @@ Deuterium-tritium fusion: 4.5 x 10^7 K //the amount of phoron pulled in each update is relative to the field strength, with 50T (max field strength) = 100% of area covered by the field //at minimum strength, 0.25% of the field volume is pulled in per update (?) //have a max of 1000 moles suspended - if(held_phoron.toxins < transfer_ratio * 1000) + if(held_phoron.phoron < transfer_ratio * 1000) var/moles_covered = environment.return_pressure()*volume_covered/(environment.temperature * R_IDEAL_GAS_EQUATION) //world << "\blue moles_covered: [moles_covered]" // var/datum/gas_mixture/gas_covered = environment.remove(moles_covered) var/datum/gas_mixture/phoron_captured = new /datum/gas_mixture() // - phoron_captured.toxins = round(gas_covered.toxins * transfer_ratio) - //world << "\blue[phoron_captured.toxins] moles of phoron captured" + phoron_captured.phoron = round(gas_covered.phoron * transfer_ratio) + //world << "\blue[phoron_captured.phoron] moles of phoron captured" phoron_captured.temperature = gas_covered.temperature phoron_captured.update_values() // - gas_covered.toxins -= phoron_captured.toxins + gas_covered.phoron -= phoron_captured.phoron gas_covered.update_values() // held_phoron.merge(phoron_captured) @@ -171,15 +171,15 @@ Deuterium-tritium fusion: 4.5 x 10^7 K //change held phoron temp according to energy levels //SPECIFIC_HEAT_TOXIN - if(mega_energy > 0 && held_phoron.toxins) + if(mega_energy > 0 && held_phoron.phoron) var/heat_capacity = held_phoron.heat_capacity()//200 * number of phoron moles if(heat_capacity > 0.0003) //formerly MINIMUM_HEAT_CAPACITY held_phoron.temperature = (heat_capacity + mega_energy * 35000)/heat_capacity //if there is too much phoron in the field, lose some - /*if( held_phoron.toxins > (MOLES_CELLSTANDARD * 7) * (50 / field_strength) ) + /*if( held_phoron.phoron > (MOLES_CELLSTANDARD * 7) * (50 / field_strength) ) LosePhoron()*/ - if(held_phoron.toxins > 1) + if(held_phoron.phoron > 1) //lose a random amount of phoron back into the air, increased by the field strength (want to switch this over to frequency eventually) var/loss_ratio = rand() * (0.05 + (0.05 * 50 / field_strength)) //world << "lost [loss_ratio*100]% of held phoron" @@ -187,16 +187,16 @@ Deuterium-tritium fusion: 4.5 x 10^7 K var/datum/gas_mixture/phoron_lost = new phoron_lost.temperature = held_phoron.temperature // - phoron_lost.toxins = held_phoron.toxins * loss_ratio + phoron_lost.phoron = held_phoron.phoron * loss_ratio //phoron_lost.update_values() - held_phoron.toxins -= held_phoron.toxins * loss_ratio + held_phoron.phoron -= held_phoron.phoron * loss_ratio //held_phoron.update_values() // environment.merge(phoron_lost) radiation += loss_ratio * mega_energy * 0.1 mega_energy -= loss_ratio * mega_energy * 0.1 else - held_phoron.toxins = 0 + held_phoron.phoron = 0 //held_phoron.update_values() //handle some reactants formatting diff --git a/code/WorkInProgress/Cib/amorph/life.dm b/code/WorkInProgress/Cib/amorph/life.dm index e23662bbbb..1d254e5768 100644 --- a/code/WorkInProgress/Cib/amorph/life.dm +++ b/code/WorkInProgress/Cib/amorph/life.dm @@ -2,7 +2,7 @@ var/obj/item/weapon/card/id/wear_id = null // Fix for station bounced radios -- Skie var/oxygen_alert = 0 - var/toxins_alert = 0 + var/phoron_alert = 0 var/fire_alert = 0 var/temperature_alert = 0 @@ -455,7 +455,7 @@ if(src.pullin) src.pullin.icon_state = "pull[src.pulling ? 1 : 0]" - if (src.toxin) src.toxin.icon_state = "tox[src.toxins_alert ? 1 : 0]" + if (src.toxin) src.toxin.icon_state = "tox[src.phoron_alert ? 1 : 0]" if (src.oxygen) src.oxygen.icon_state = "oxy[src.oxygen_alert ? 1 : 0]" if (src.fire) src.fire.icon_state = "fire[src.fire_alert ? 1 : 0]" //NOTE: the alerts dont reset when youre out of danger. dont blame me, diff --git a/code/WorkInProgress/Mini/atmos_control.dm b/code/WorkInProgress/Mini/atmos_control.dm index 183f29d645..b89835de9d 100644 --- a/code/WorkInProgress/Mini/atmos_control.dm +++ b/code/WorkInProgress/Mini/atmos_control.dm @@ -282,7 +282,7 @@ siphoning Carbon Dioxide [data["filter_co2"]?"on":"off"]; Toxins -[data["filter_toxins"]?"on":"off"]; +[data["filter_phoron"]?"on":"off"]; Nitrous Oxide [data["filter_n2o"]?"on":"off"]
diff --git a/code/WorkInProgress/Sigyn/Softcurity/wardrobe.dm b/code/WorkInProgress/Sigyn/Softcurity/wardrobe.dm index 452670091f..00a6b83d91 100644 --- a/code/WorkInProgress/Sigyn/Softcurity/wardrobe.dm +++ b/code/WorkInProgress/Sigyn/Softcurity/wardrobe.dm @@ -193,12 +193,12 @@ return -/obj/structure/closet/wardrobe/toxins_white - name = "toxins wardrobe" +/obj/structure/closet/wardrobe/science_white + name = "science wardrobe" icon_state = "white" icon_closed = "white" -/obj/structure/closet/wardrobe/toxins_white/New() +/obj/structure/closet/wardrobe/science_white/New() new /obj/item/clothing/under/rank/scientist(src) new /obj/item/clothing/under/rank/scientist(src) new /obj/item/clothing/under/rank/scientist(src) diff --git a/code/WorkInProgress/SkyMarshal/wardrobes.dm b/code/WorkInProgress/SkyMarshal/wardrobes.dm index 28bd73cff7..420345214f 100755 --- a/code/WorkInProgress/SkyMarshal/wardrobes.dm +++ b/code/WorkInProgress/SkyMarshal/wardrobes.dm @@ -340,7 +340,7 @@ var/obj/item/weapon/storage/backpack/BPK = new /obj/item/weapon/storage/backpack(src) new /obj/item/weapon/storage/box(BPK) new /obj/item/weapon/pen(src) - new /obj/item/device/pda/toxins(src) + new /obj/item/device/pda/science(src) new /obj/item/weapon/tank/oxygen(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/suit/storage/labcoat/science(src) @@ -360,7 +360,7 @@ new /obj/item/device/radio/headset/headset_medsci(src) new /obj/item/clothing/under/rank/chemist(src) new /obj/item/clothing/shoes/white(src) - new /obj/item/device/pda/toxins(src) + new /obj/item/device/pda/science(src) new /obj/item/clothing/suit/storage/labcoat/chemist(src) /obj/item/wardrobe/hos diff --git a/code/WorkInProgress/Tastyfish/Eliza_Data.dm b/code/WorkInProgress/Tastyfish/Eliza_Data.dm index 80e1209924..1535e99292 100644 --- a/code/WorkInProgress/Tastyfish/Eliza_Data.dm +++ b/code/WorkInProgress/Tastyfish/Eliza_Data.dm @@ -246,8 +246,8 @@ list("bomb", "explosive", "toxin", "phoron"), list( "Do you worry about bombs often?", - "Do you work in toxins?", - "Do you find it odd to worry about bombs on a toxins research vessel?")), + "Do you work in science?", + "Do you find it odd to worry about bombs on a science research vessel?")), new/datum/text_parser/keyword( list("work", "job", "head", "staff", "transen"), list( diff --git a/code/ZAS/ConnectionGroup.dm b/code/ZAS/ConnectionGroup.dm index 6b253ee4e5..481492e7e2 100644 --- a/code/ZAS/ConnectionGroup.dm +++ b/code/ZAS/ConnectionGroup.dm @@ -239,14 +239,14 @@ proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles) full_oxy = A.oxygen * size full_nitro = A.nitrogen * size full_co2 = A.carbon_dioxide * size - full_phoron = A.toxins * size + full_phoron = A.phoron * size full_heat_capacity = A.heat_capacity() * size s_full_oxy = B.oxygen * share_size s_full_nitro = B.nitrogen * share_size s_full_co2 = B.carbon_dioxide * share_size - s_full_phoron = B.toxins * share_size + s_full_phoron = B.phoron * share_size s_full_heat_capacity = B.heat_capacity() * share_size @@ -265,14 +265,14 @@ proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles) A.oxygen = max(0, (A.oxygen - oxy_avg) * (1-ratio) + oxy_avg ) A.nitrogen = max(0, (A.nitrogen - nit_avg) * (1-ratio) + nit_avg ) A.carbon_dioxide = max(0, (A.carbon_dioxide - co2_avg) * (1-ratio) + co2_avg ) - A.toxins = max(0, (A.toxins - phoron_avg) * (1-ratio) + phoron_avg ) + A.phoron = max(0, (A.phoron - phoron_avg) * (1-ratio) + phoron_avg ) A.temperature = max(0, (A.temperature - temp_avg) * (1-ratio) + temp_avg ) B.oxygen = max(0, (B.oxygen - oxy_avg) * (1-ratio) + oxy_avg ) B.nitrogen = max(0, (B.nitrogen - nit_avg) * (1-ratio) + nit_avg ) B.carbon_dioxide = max(0, (B.carbon_dioxide - co2_avg) * (1-ratio) + co2_avg ) - B.toxins = max(0, (B.toxins - phoron_avg) * (1-ratio) + phoron_avg ) + B.phoron = max(0, (B.phoron - phoron_avg) * (1-ratio) + phoron_avg ) B.temperature = max(0, (B.temperature - temp_avg) * (1-ratio) + temp_avg ) @@ -328,7 +328,7 @@ proc/ShareSpace(datum/gas_mixture/A, list/unsimulated_tiles, dbg_output) unsim_oxygen = avg_unsim.oxygen unsim_co2 = avg_unsim.carbon_dioxide unsim_nitrogen = avg_unsim.nitrogen - unsim_phoron = avg_unsim.toxins + unsim_phoron = avg_unsim.phoron unsim_temperature = avg_unsim.temperature share_size = max(1, max(size + 3, 1) + avg_unsim.group_multiplier) tileslen = avg_unsim.group_multiplier @@ -352,7 +352,7 @@ proc/ShareSpace(datum/gas_mixture/A, list/unsimulated_tiles, dbg_output) unsim_oxygen += T.oxygen unsim_co2 += T.carbon_dioxide unsim_nitrogen += T.nitrogen - unsim_phoron += T.toxins + unsim_phoron += T.phoron unsim_temperature += T.temperature/unsimulated_tiles.len //These values require adjustment in order to properly represent a room of the specified size. @@ -375,7 +375,7 @@ proc/ShareSpace(datum/gas_mixture/A, list/unsimulated_tiles, dbg_output) full_oxy = A.oxygen * size full_nitro = A.nitrogen * size full_co2 = A.carbon_dioxide * size - full_phoron = A.toxins * size + full_phoron = A.phoron * size full_heat_capacity = A.heat_capacity() * size @@ -399,7 +399,7 @@ proc/ShareSpace(datum/gas_mixture/A, list/unsimulated_tiles, dbg_output) A.oxygen = max(0, (A.oxygen - oxy_avg) * (1 - ratio) + oxy_avg ) A.nitrogen = max(0, (A.nitrogen - nit_avg) * (1 - ratio) + nit_avg ) A.carbon_dioxide = max(0, (A.carbon_dioxide - co2_avg) * (1 - ratio) + co2_avg ) - A.toxins = max(0, (A.toxins - phoron_avg) * (1 - ratio) + phoron_avg ) + A.phoron = max(0, (A.phoron - phoron_avg) * (1 - ratio) + phoron_avg ) A.temperature = max(TCMB, (A.temperature - temp_avg) * (1 - ratio) + temp_avg ) diff --git a/code/ZAS/Controller.dm b/code/ZAS/Controller.dm index 83b4bf3f3b..cef6b068a8 100644 --- a/code/ZAS/Controller.dm +++ b/code/ZAS/Controller.dm @@ -312,7 +312,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun /datum/controller/air_system/proc/has_same_air(turf/A, turf/B) if(A.oxygen != B.oxygen) return 0 if(A.nitrogen != B.nitrogen) return 0 - if(A.toxins != B.toxins) return 0 + if(A.phoron != B.phoron) return 0 if(A.carbon_dioxide != B.carbon_dioxide) return 0 if(A.temperature != B.temperature) return 0 return 1 diff --git a/code/ZAS/Diagnostic.dm b/code/ZAS/Diagnostic.dm index 71c8d99fa3..31deb69bc5 100644 --- a/code/ZAS/Diagnostic.dm +++ b/code/ZAS/Diagnostic.dm @@ -19,7 +19,7 @@ client/proc/Zone_Info(turf/T as null|turf) mob << "No zone here." var/datum/gas_mixture/mix = T.return_air() mob << "[mix.return_pressure()] kPa [mix.temperature]C" - mob << "O2: [mix.oxygen] N2: [mix.nitrogen] CO2: [mix.carbon_dioxide] TX: [mix.toxins]" + mob << "O2: [mix.oxygen] N2: [mix.nitrogen] CO2: [mix.carbon_dioxide] TX: [mix.phoron]" else if(zone_debug_images) for(var/zone in zone_debug_images) @@ -105,7 +105,7 @@ client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf) client << "Zone Air Contents" client << "Oxygen: [air.oxygen]" client << "Nitrogen: [air.nitrogen]" - client << "Phoron: [air.toxins]" + client << "Phoron: [air.phoron]" client << "Carbon Dioxide: [air.carbon_dioxide]" client << "Temperature: [air.temperature] K" client << "Heat Energy: [air.temperature * air.heat_capacity()] J" diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index 085d4252a9..c444f10610 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -77,8 +77,8 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh) //the amount of moles might get to low for some functions to catch them and thus result in wonky behaviour if(air_contents.oxygen < 0.1) air_contents.oxygen = 0 - if(air_contents.toxins < 0.1) - air_contents.toxins = 0 + if(air_contents.phoron < 0.1) + air_contents.phoron = 0 if(fuel) if(fuel.moles < 0.1) air_contents.trace_gases.Remove(fuel) @@ -192,7 +192,7 @@ datum/gas_mixture/proc/zburn(obj/effect/decal/cleanable/liquid_fuel/liquid, forc var/total_fuel = 0 var/datum/gas/volatile_fuel/fuel = locate() in trace_gases - total_fuel += toxins + total_fuel += phoron if(fuel) //Volatile Fuel @@ -227,9 +227,9 @@ datum/gas_mixture/proc/zburn(obj/effect/decal/cleanable/liquid_fuel/liquid, forc //remove and add gasses as calculated oxygen -= min(oxygen, total_oxygen * used_reactants_ratio ) - toxins -= min(toxins, (toxins * used_fuel_ratio * used_reactants_ratio ) * 3) - if(toxins < 0) - toxins = 0 + phoron -= min(phoron, (phoron * used_fuel_ratio * used_reactants_ratio ) * 3) + if(phoron < 0) + phoron = 0 carbon_dioxide += max(2 * total_fuel, 0) @@ -254,10 +254,10 @@ datum/gas_mixture/proc/check_recombustability(obj/effect/decal/cleanable/liquid_ var/datum/gas/volatile_fuel/fuel = locate() in trace_gases - if(oxygen && (toxins || fuel || liquid)) + if(oxygen && (phoron || fuel || liquid)) if(liquid) return 1 - if(toxins >= 0.1) + if(phoron >= 0.1) return 1 if(fuel && fuel.moles >= 0.1) return 1 @@ -269,10 +269,10 @@ datum/gas_mixture/proc/check_combustability(obj/effect/decal/cleanable/liquid_fu var/datum/gas/volatile_fuel/fuel = locate() in trace_gases - if(oxygen && (toxins || fuel || liquid)) + if(oxygen && (phoron || fuel || liquid)) if(liquid) return 1 - if (toxins >= 0.1) + if (phoron >= 0.1) return 1 if(fuel && fuel.moles >= 0.1) return 1 @@ -288,7 +288,7 @@ datum/gas_mixture/proc/calculate_firelevel(obj/effect/decal/cleanable/liquid_fue if(check_recombustability(liquid)) - total_fuel += toxins + total_fuel += phoron if(liquid) total_fuel += liquid.amount diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index 6797fa5b8c..5de9359184 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -111,7 +111,7 @@ obj/var/contaminated = 0 if(vsc.plc.GENETIC_CORRUPTION) if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION) randmutb(src) - src << "\red High levels of toxins cause you to spontaneously mutate." + src << "\red High levels of phoron cause you to spontaneously mutate." domutcheck(src,null) @@ -158,6 +158,6 @@ turf/Entered(obj/item/I) var/datum/gas_mixture/env = return_air(1) if(!env) return - if(env.toxins > MOLES_PHORON_VISIBLE + 1) + if(env.phoron > MOLES_PHORON_VISIBLE + 1) if(I.can_contaminate()) I.contaminate() \ No newline at end of file diff --git a/code/ZAS/Turf.dm b/code/ZAS/Turf.dm index fece782aa7..3c5843830f 100644 --- a/code/ZAS/Turf.dm +++ b/code/ZAS/Turf.dm @@ -183,7 +183,7 @@ GM.oxygen = oxygen GM.carbon_dioxide = carbon_dioxide GM.nitrogen = nitrogen - GM.toxins = toxins + GM.phoron = phoron GM.temperature = temperature GM.update_values() @@ -193,12 +193,12 @@ /turf/remove_air(amount as num) var/datum/gas_mixture/GM = new - var/sum = oxygen + carbon_dioxide + nitrogen + toxins + var/sum = oxygen + carbon_dioxide + nitrogen + phoron if(sum>0) GM.oxygen = (oxygen/sum)*amount GM.carbon_dioxide = (carbon_dioxide/sum)*amount GM.nitrogen = (nitrogen/sum)*amount - GM.toxins = (toxins/sum)*amount + GM.phoron = (phoron/sum)*amount GM.temperature = temperature GM.update_values() @@ -231,7 +231,7 @@ /turf/proc/make_air() air = new/datum/gas_mixture air.temperature = temperature - air.adjust(oxygen, carbon_dioxide, nitrogen, toxins) + air.adjust(oxygen, carbon_dioxide, nitrogen, phoron) air.group_multiplier = 1 air.volume = CELL_VOLUME diff --git a/code/ZAS/Zone.dm b/code/ZAS/Zone.dm index 349d0e0582..2d285d08f6 100644 --- a/code/ZAS/Zone.dm +++ b/code/ZAS/Zone.dm @@ -130,7 +130,7 @@ Class Procs: /zone/proc/dbg_data(mob/M) M << name - M << "O2: [air.oxygen] N2: [air.nitrogen] CO2: [air.carbon_dioxide] P: [air.toxins]" + M << "O2: [air.oxygen] N2: [air.nitrogen] CO2: [air.carbon_dioxide] P: [air.phoron]" M << "P: [air.return_pressure()] kPa V: [air.volume]L T: [air.temperature]°K ([air.temperature - T0C]°C)" M << "O2 per N2: [(air.nitrogen ? air.oxygen/air.nitrogen : "N/A")] Moles: [air.total_moles]" M << "Simulated: [contents.len] ([air.group_multiplier])" diff --git a/code/ZAS/_gas_mixture.dm b/code/ZAS/_gas_mixture.dm index 8654ad21a2..2a072e8ef9 100644 --- a/code/ZAS/_gas_mixture.dm +++ b/code/ZAS/_gas_mixture.dm @@ -7,8 +7,8 @@ What are the archived variables for? #define SPECIFIC_HEAT_TOXIN 200 #define SPECIFIC_HEAT_AIR 20 #define SPECIFIC_HEAT_CDO 30 -#define HEAT_CAPACITY_CALCULATION(oxygen,carbon_dioxide,nitrogen,toxins) \ - max(0, carbon_dioxide * SPECIFIC_HEAT_CDO + (oxygen + nitrogen) * SPECIFIC_HEAT_AIR + toxins * SPECIFIC_HEAT_TOXIN) +#define HEAT_CAPACITY_CALCULATION(oxygen,carbon_dioxide,nitrogen,phoron) \ + max(0, carbon_dioxide * SPECIFIC_HEAT_CDO + (oxygen + nitrogen) * SPECIFIC_HEAT_AIR + phoron * SPECIFIC_HEAT_TOXIN) #define MINIMUM_HEAT_CAPACITY 0.0003 #define QUANTIZE(variable) (round(variable,0.0001)) @@ -45,7 +45,7 @@ What are the archived variables for? var/oxygen = 0 //Holds the "moles" of each of the four gases. var/carbon_dioxide = 0 var/nitrogen = 0 - var/toxins = 0 + var/phoron = 0 var/total_moles = 0 //Updated when a reaction occurs. @@ -64,7 +64,7 @@ What are the archived variables for? var/tmp/oxygen_archived //These are variables for use with the archived data var/tmp/carbon_dioxide_archived var/tmp/nitrogen_archived - var/tmp/toxins_archived + var/tmp/phoron_archived var/tmp/temperature_archived @@ -85,7 +85,7 @@ What are the archived variables for? oxygen = max(0, oxygen + o2) carbon_dioxide = max(0, carbon_dioxide + co2) nitrogen = max(0, nitrogen + n2) - toxins = max(0, toxins + tx) + phoron = max(0, phoron + tx) //handle trace gasses for(var/datum/gas/G in traces) @@ -119,7 +119,7 @@ What are the archived variables for? //Inputs: None //Outputs: Heat capacity - var/heat_capacity = HEAT_CAPACITY_CALCULATION(oxygen,carbon_dioxide,nitrogen,toxins) + var/heat_capacity = HEAT_CAPACITY_CALCULATION(oxygen,carbon_dioxide,nitrogen,phoron) if(trace_gases.len) for(var/datum/gas/trace_gas in trace_gases) @@ -133,7 +133,7 @@ What are the archived variables for? //Inputs: None //Outputs: Archived heat capacity - var/heat_capacity_archived = HEAT_CAPACITY_CALCULATION(oxygen_archived,carbon_dioxide_archived,nitrogen_archived,toxins_archived) + var/heat_capacity_archived = HEAT_CAPACITY_CALCULATION(oxygen_archived,carbon_dioxide_archived,nitrogen_archived,phoron_archived) if(trace_gases.len) for(var/datum/gas/trace_gas in trace_gases) @@ -143,7 +143,7 @@ What are the archived variables for? /datum/gas_mixture/proc/total_moles() return total_moles - /*var/moles = oxygen + carbon_dioxide + nitrogen + toxins + /*var/moles = oxygen + carbon_dioxide + nitrogen + phoron if(trace_gases.len) for(var/datum/gas/trace_gas in trace_gases) @@ -187,7 +187,7 @@ What are the archived variables for? //Inputs: None //Outputs: None - total_moles = oxygen + carbon_dioxide + nitrogen + toxins + total_moles = oxygen + carbon_dioxide + nitrogen + phoron if(trace_gases.len) for(var/datum/gas/trace_gas in trace_gases) @@ -206,7 +206,7 @@ What are the archived variables for? //Outputs: 1 if graphic changed, 0 if unchanged graphic = 0 - if(toxins > MOLES_PHORON_VISIBLE) + if(phoron > MOLES_PHORON_VISIBLE) graphic = 1 else if(length(trace_gases)) var/datum/gas/sleeping_agent = locate(/datum/gas/sleeping_agent) in trace_gases @@ -305,7 +305,7 @@ What are the archived variables for? oxygen_archived = oxygen carbon_dioxide_archived = carbon_dioxide nitrogen_archived = nitrogen - toxins_archived = toxins + phoron_archived = phoron if(trace_gases.len) for(var/datum/gas/trace_gas in trace_gases) @@ -329,7 +329,7 @@ What are the archived variables for? if(((giver.oxygen > MINIMUM_AIR_TO_SUSPEND) && (giver.oxygen >= oxygen*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ || ((giver.carbon_dioxide > MINIMUM_AIR_TO_SUSPEND) && (giver.carbon_dioxide >= carbon_dioxide*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ || ((giver.nitrogen > MINIMUM_AIR_TO_SUSPEND) && (giver.nitrogen >= nitrogen*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ - || ((giver.toxins > MINIMUM_AIR_TO_SUSPEND) && (giver.toxins >= toxins*MINIMUM_AIR_RATIO_TO_SUSPEND))) + || ((giver.phoron > MINIMUM_AIR_TO_SUSPEND) && (giver.phoron >= phoron*MINIMUM_AIR_RATIO_TO_SUSPEND))) return 0 if(abs(giver.temperature - temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) return 0 @@ -362,12 +362,12 @@ What are the archived variables for? oxygen += giver.oxygen*giver.group_multiplier/group_multiplier carbon_dioxide += giver.carbon_dioxide*giver.group_multiplier/group_multiplier nitrogen += giver.nitrogen*giver.group_multiplier/group_multiplier - toxins += giver.toxins*giver.group_multiplier/group_multiplier + phoron += giver.phoron*giver.group_multiplier/group_multiplier else oxygen += giver.oxygen carbon_dioxide += giver.carbon_dioxide nitrogen += giver.nitrogen - toxins += giver.toxins + phoron += giver.phoron if(giver.trace_gases.len) for(var/datum/gas/trace_gas in giver.trace_gases) @@ -399,12 +399,12 @@ What are the archived variables for? removed.oxygen = QUANTIZE((oxygen/sum)*amount) removed.nitrogen = QUANTIZE((nitrogen/sum)*amount) removed.carbon_dioxide = QUANTIZE((carbon_dioxide/sum)*amount) - removed.toxins = QUANTIZE(((toxins/sum)*amount)) + removed.phoron = QUANTIZE(((phoron/sum)*amount)) oxygen -= removed.oxygen/group_multiplier nitrogen -= removed.nitrogen/group_multiplier carbon_dioxide -= removed.carbon_dioxide/group_multiplier - toxins -= removed.toxins/group_multiplier + phoron -= removed.phoron/group_multiplier if(trace_gases.len) for(var/datum/gas/trace_gas in trace_gases) @@ -436,12 +436,12 @@ What are the archived variables for? removed.oxygen = QUANTIZE(oxygen*ratio) removed.nitrogen = QUANTIZE(nitrogen*ratio) removed.carbon_dioxide = QUANTIZE(carbon_dioxide*ratio) - removed.toxins = QUANTIZE(toxins*ratio) + removed.phoron = QUANTIZE(phoron*ratio) oxygen -= removed.oxygen/group_multiplier nitrogen -= removed.nitrogen/group_multiplier carbon_dioxide -= removed.carbon_dioxide/group_multiplier - toxins -= removed.toxins/group_multiplier + phoron -= removed.phoron/group_multiplier if(trace_gases.len) for(var/datum/gas/trace_gas in trace_gases) @@ -480,7 +480,7 @@ What are the archived variables for? oxygen = sample.oxygen carbon_dioxide = sample.carbon_dioxide nitrogen = sample.nitrogen - toxins = sample.toxins + phoron = sample.phoron total_moles = sample.total_moles() trace_gases.len=null @@ -508,14 +508,14 @@ What are the archived variables for? var/delta_oxygen = QUANTIZE(oxygen_archived - sharer.oxygen_archived)/TRANSFER_FRACTION var/delta_carbon_dioxide = QUANTIZE(carbon_dioxide_archived - sharer.carbon_dioxide_archived)/TRANSFER_FRACTION var/delta_nitrogen = QUANTIZE(nitrogen_archived - sharer.nitrogen_archived)/TRANSFER_FRACTION - var/delta_toxins = QUANTIZE(toxins_archived - sharer.toxins_archived)/TRANSFER_FRACTION + var/delta_phoron = QUANTIZE(phoron_archived - sharer.phoron_archived)/TRANSFER_FRACTION var/delta_temperature = (temperature_archived - sharer.temperature_archived) if(((abs(delta_oxygen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_oxygen) >= oxygen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ || ((abs(delta_carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_carbon_dioxide) >= carbon_dioxide_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ || ((abs(delta_nitrogen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_nitrogen) >= nitrogen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ - || ((abs(delta_toxins) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_toxins) >= toxins_archived*MINIMUM_AIR_RATIO_TO_SUSPEND))) + || ((abs(delta_phoron) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_phoron) >= phoron_archived*MINIMUM_AIR_RATIO_TO_SUSPEND))) return 0 if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) @@ -540,7 +540,7 @@ What are the archived variables for? if(((abs(delta_oxygen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_oxygen) >= sharer.oxygen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ || ((abs(delta_carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_carbon_dioxide) >= sharer.carbon_dioxide_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ || ((abs(delta_nitrogen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_nitrogen) >= sharer.nitrogen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ - || ((abs(delta_toxins) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_toxins) >= sharer.toxins_archived*MINIMUM_AIR_RATIO_TO_SUSPEND))) + || ((abs(delta_phoron) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_phoron) >= sharer.phoron_archived*MINIMUM_AIR_RATIO_TO_SUSPEND))) return -1 if(trace_gases.len) @@ -564,14 +564,14 @@ What are the archived variables for? var/delta_oxygen = (oxygen_archived - model.oxygen)/TRANSFER_FRACTION var/delta_carbon_dioxide = (carbon_dioxide_archived - model.carbon_dioxide)/TRANSFER_FRACTION var/delta_nitrogen = (nitrogen_archived - model.nitrogen)/TRANSFER_FRACTION - var/delta_toxins = (toxins_archived - model.toxins)/TRANSFER_FRACTION + var/delta_phoron = (phoron_archived - model.phoron)/TRANSFER_FRACTION var/delta_temperature = (temperature_archived - model.temperature) if(((abs(delta_oxygen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_oxygen) >= oxygen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ || ((abs(delta_carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_carbon_dioxide) >= carbon_dioxide_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ || ((abs(delta_nitrogen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_nitrogen) >= nitrogen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ - || ((abs(delta_toxins) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_toxins) >= toxins_archived*MINIMUM_AIR_RATIO_TO_SUSPEND))) + || ((abs(delta_phoron) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_phoron) >= phoron_archived*MINIMUM_AIR_RATIO_TO_SUSPEND))) return 0 if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) return 0 @@ -597,7 +597,7 @@ What are the archived variables for? var/delta_oxygen = QUANTIZE(oxygen_archived - sharer.oxygen_archived)/TRANSFER_FRACTION var/delta_carbon_dioxide = QUANTIZE(carbon_dioxide_archived - sharer.carbon_dioxide_archived)/TRANSFER_FRACTION var/delta_nitrogen = QUANTIZE(nitrogen_archived - sharer.nitrogen_archived)/TRANSFER_FRACTION - var/delta_toxins = QUANTIZE(toxins_archived - sharer.toxins_archived)/TRANSFER_FRACTION + var/delta_phoron = QUANTIZE(phoron_archived - sharer.phoron_archived)/TRANSFER_FRACTION var/delta_temperature = (temperature_archived - sharer.temperature_archived) @@ -630,14 +630,14 @@ What are the archived variables for? heat_sharer_to_self -= carbon_dioxide_heat_capacity*sharer.temperature_archived heat_capacity_sharer_to_self -= carbon_dioxide_heat_capacity - if(delta_toxins) - var/toxins_heat_capacity = SPECIFIC_HEAT_TOXIN*delta_toxins - if(delta_toxins > 0) - heat_self_to_sharer += toxins_heat_capacity*temperature_archived - heat_capacity_self_to_sharer += toxins_heat_capacity + if(delta_phoron) + var/phoron_heat_capacity = SPECIFIC_HEAT_TOXIN*delta_phoron + if(delta_phoron > 0) + heat_self_to_sharer += phoron_heat_capacity*temperature_archived + heat_capacity_self_to_sharer += phoron_heat_capacity else - heat_sharer_to_self -= toxins_heat_capacity*sharer.temperature_archived - heat_capacity_sharer_to_self -= toxins_heat_capacity + heat_sharer_to_self -= phoron_heat_capacity*sharer.temperature_archived + heat_capacity_sharer_to_self -= phoron_heat_capacity old_self_heat_capacity = heat_capacity()*group_multiplier old_sharer_heat_capacity = sharer.heat_capacity()*sharer.group_multiplier @@ -651,10 +651,10 @@ What are the archived variables for? nitrogen -= delta_nitrogen/group_multiplier sharer.nitrogen += delta_nitrogen/sharer.group_multiplier - toxins -= delta_toxins/group_multiplier - sharer.toxins += delta_toxins/sharer.group_multiplier + phoron -= delta_phoron/group_multiplier + sharer.phoron += delta_phoron/sharer.group_multiplier - var/moved_moles = (delta_oxygen + delta_carbon_dioxide + delta_nitrogen + delta_toxins) + var/moved_moles = (delta_oxygen + delta_carbon_dioxide + delta_nitrogen + delta_phoron) var/list/trace_types_considered = list() @@ -743,7 +743,7 @@ What are the archived variables for? var/delta_oxygen = QUANTIZE(oxygen_archived - model.oxygen)/TRANSFER_FRACTION var/delta_carbon_dioxide = QUANTIZE(carbon_dioxide_archived - model.carbon_dioxide)/TRANSFER_FRACTION var/delta_nitrogen = QUANTIZE(nitrogen_archived - model.nitrogen)/TRANSFER_FRACTION - var/delta_toxins = QUANTIZE(toxins_archived - model.toxins)/TRANSFER_FRACTION + var/delta_phoron = QUANTIZE(phoron_archived - model.phoron)/TRANSFER_FRACTION var/delta_temperature = (temperature_archived - model.temperature) @@ -764,10 +764,10 @@ What are the archived variables for? heat_transferred -= carbon_dioxide_heat_capacity*model.temperature heat_capacity_transferred -= carbon_dioxide_heat_capacity - if(delta_toxins) - var/toxins_heat_capacity = SPECIFIC_HEAT_TOXIN*delta_toxins - heat_transferred -= toxins_heat_capacity*model.temperature - heat_capacity_transferred -= toxins_heat_capacity + if(delta_phoron) + var/phoron_heat_capacity = SPECIFIC_HEAT_TOXIN*delta_phoron + heat_transferred -= phoron_heat_capacity*model.temperature + heat_capacity_transferred -= phoron_heat_capacity old_self_heat_capacity = heat_capacity()*group_multiplier @@ -775,14 +775,14 @@ What are the archived variables for? oxygen -= delta_oxygen*border_multiplier/group_multiplier carbon_dioxide -= delta_carbon_dioxide*border_multiplier/group_multiplier nitrogen -= delta_nitrogen*border_multiplier/group_multiplier - toxins -= delta_toxins*border_multiplier/group_multiplier + phoron -= delta_phoron*border_multiplier/group_multiplier else oxygen -= delta_oxygen/group_multiplier carbon_dioxide -= delta_carbon_dioxide/group_multiplier nitrogen -= delta_nitrogen/group_multiplier - toxins -= delta_toxins/group_multiplier + phoron -= delta_phoron/group_multiplier - var/moved_moles = (delta_oxygen + delta_carbon_dioxide + delta_nitrogen + delta_toxins) + var/moved_moles = (delta_oxygen + delta_carbon_dioxide + delta_nitrogen + delta_phoron) if(trace_gases.len) for(var/datum/gas/trace_gas in trace_gases) @@ -812,7 +812,7 @@ What are the archived variables for? temperature_mimic(model, model.thermal_conductivity, border_multiplier) if((delta_temperature > MINIMUM_TEMPERATURE_TO_MOVE) || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE) - var/delta_pressure = temperature_archived*(total_moles() + moved_moles) - model.temperature*(model.oxygen+model.carbon_dioxide+model.nitrogen+model.toxins) + var/delta_pressure = temperature_archived*(total_moles() + moved_moles) - model.temperature*(model.oxygen+model.carbon_dioxide+model.nitrogen+model.phoron) return delta_pressure*R_IDEAL_GAS_EQUATION/volume else return 0 @@ -989,8 +989,8 @@ What are the archived variables for? if((abs(carbon_dioxide-sample.carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && \ ((carbon_dioxide < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide) || (carbon_dioxide > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide))) return 0 - if((abs(toxins-sample.toxins) > MINIMUM_AIR_TO_SUSPEND) && \ - ((toxins < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.toxins) || (toxins > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.toxins))) + if((abs(phoron-sample.phoron) > MINIMUM_AIR_TO_SUSPEND) && \ + ((phoron < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.phoron) || (phoron > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.phoron))) return 0 @@ -1030,7 +1030,7 @@ What are the archived variables for? oxygen += right_side.oxygen carbon_dioxide += right_side.carbon_dioxide nitrogen += right_side.nitrogen - toxins += right_side.toxins + phoron += right_side.phoron if(trace_gases.len || right_side.trace_gases.len) for(var/datum/gas/trace_gas in right_side.trace_gases) @@ -1052,7 +1052,7 @@ What are the archived variables for? oxygen = max(oxygen - right_side.oxygen) carbon_dioxide = max(carbon_dioxide - right_side.carbon_dioxide) nitrogen = max(nitrogen - right_side.nitrogen) - toxins = max(toxins - right_side.toxins) + phoron = max(phoron - right_side.phoron) if(trace_gases.len || right_side.trace_gases.len) for(var/datum/gas/trace_gas in right_side.trace_gases) @@ -1067,7 +1067,7 @@ What are the archived variables for? oxygen *= factor carbon_dioxide *= factor nitrogen *= factor - toxins *= factor + phoron *= factor if(trace_gases && trace_gases.len) for(var/datum/gas/trace_gas in trace_gases) @@ -1080,7 +1080,7 @@ What are the archived variables for? oxygen /= factor carbon_dioxide /= factor nitrogen /= factor - toxins /= factor + phoron /= factor if(trace_gases && trace_gases.len) for(var/datum/gas/trace_gas in trace_gases) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index ed054ae6c8..7d24790c52 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -308,14 +308,14 @@ contents.Add(0) if ("oxygen") - if(t.air_contents.oxygen && !t.air_contents.toxins) + if(t.air_contents.oxygen && !t.air_contents.phoron) contents.Add(t.air_contents.oxygen) else contents.Add(0) // No races breath this, but never know about downstream servers. if ("carbon dioxide") - if(t.air_contents.carbon_dioxide && !t.air_contents.toxins) + if(t.air_contents.carbon_dioxide && !t.air_contents.phoron) contents.Add(t.air_contents.carbon_dioxide) else contents.Add(0) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index a18849d81e..c782a63ed7 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -210,7 +210,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H) clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) if("Scientist") - clothes_s = new /icon('icons/mob/uniform.dmi', "toxinswhite_s") + clothes_s = new /icon('icons/mob/uniform.dmi', "rndswhite_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY) if("Chemist") diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index bfe3393359..aa84c7d943 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -1344,49 +1344,49 @@ var/list/ghostteleportlocs = list() name = "Hydroponics" icon_state = "hydro" -//Toxins +//rnd (Research and Development -/area/toxins/lab +/area/rnd/lab name = "\improper Research and Development" icon_state = "toxlab" -/area/toxins/hallway +/area/rnd/hallway name = "\improper Research Lab" icon_state = "toxlab" -/area/toxins/rdoffice +/area/rnd/rdoffice name = "\improper Research Director's Office" icon_state = "head_quarters" -/area/toxins/supermatter +/area/rnd/supermatter name = "\improper Supermatter Lab" icon_state = "toxlab" -/area/toxins/xenobiology +/area/rnd/xenobiology name = "\improper Xenobiology Lab" icon_state = "toxlab" -/area/toxins/storage +/area/rnd/storage name = "\improper Toxins Storage" icon_state = "toxstorage" -/area/toxins/test_area +/area/rnd/test_area name = "\improper Toxins Test Area" icon_state = "toxtest" -/area/toxins/mixing +/area/rnd/mixing name = "\improper Toxins Mixing Room" icon_state = "toxmix" -/area/toxins/misc_lab +/area/rnd/misc_lab name = "\improper Miscellaneous Research" icon_state = "toxmisc" -/area/toxins/telesci +/area/rnd/telesci name = "\improper Telescience Lab" icon_state = "toxmisc" -/area/toxins/server +/area/rnd/server name = "\improper Server Room" icon_state = "server" @@ -1898,7 +1898,7 @@ var/list/the_station_areas = list ( /area/quartermaster, /area/janitor, /area/hydroponics, - /area/toxins, + /area/rnd, /area/storage, /area/construction, /area/ai_monitored/storage/eva, //do not try to simplify to "/area/ai_monitored" --rastaf0 diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index 124596f3e8..d9f3801902 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -323,7 +323,7 @@ ________________________________________________________________________________ var/o2_level = environment.oxygen/total_moles var/n2_level = environment.nitrogen/total_moles var/co2_level = environment.carbon_dioxide/total_moles - var/phoron_level = environment.toxins/total_moles + var/phoron_level = environment.phoron/total_moles var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level) dat += "