diff --git a/baystation12.dme b/baystation12.dme index 802db258a4..0514c47220 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -14,7 +14,6 @@ #include "code\hub.dm" #include "code\names.dm" #include "code\setup.dm" -#include "code\stylesheet.dm" #include "code\world.dm" #include "code\__HELPERS\files.dm" #include "code\__HELPERS\game.dm" diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index b968c0fb12..58413a7529 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -1005,15 +1005,15 @@ 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/plasma_concentration = parent.air.toxins/total_moles + var/phoron_concentration = parent.air.toxins/total_moles - var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) + var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+phoron_concentration) user << "\blue Pressure: [round(pressure,0.1)] kPa" user << "\blue Nitrogen: [round(n2_concentration*100)]%" user << "\blue Oxygen: [round(o2_concentration*100)]%" user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Phoron: [round(plasma_concentration*100)]%" + user << "\blue Phoron: [round(phoron_concentration*100)]%" if(unknown_concentration>0.01) user << "\red Unknown: [round(unknown_concentration*100)]%" user << "\blue Temperature: [round(parent.air.temperature-T0C)]°C" diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/falsewall.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/falsewall.dm index a83711609d..1a5d46371a 100644 --- a/code/WorkInProgress/Cael_Aislinn/Jungle/falsewall.dm +++ b/code/WorkInProgress/Cael_Aislinn/Jungle/falsewall.dm @@ -7,11 +7,11 @@ name = "wall" anchored = 1 icon = 'icons/turf/walls.dmi' - icon_state = "plasma0" + icon_state = "phoron0" opacity = 1 var/closed_wall_dir = 0 var/opening = 0 - var/mineral = "plasma" + var/mineral = "phoron" var/is_metal = 0 /obj/structure/temple_falsewall/New() diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dm index ccfe4c1e65..421e803ec4 100644 --- a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dm +++ b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dm @@ -60,9 +60,9 @@ my_ladder.id = rand(999) my_ladder.height = -1 - //loop over the walls in the temple and make them a random pre-chosen mineral (null is a stand in for plasma, which the walls already are) - //treat plasma slightly differently because it's the default wall type - var/mineral = pick("uranium","sandstone","gold","iron","silver","diamond","clown","plasma") + //loop over the walls in the temple and make them a random pre-chosen mineral (null is a stand in for phoron, which the walls already are) + //treat phoron slightly differently because it's the default wall type + var/mineral = pick("uranium","sandstone","gold","iron","silver","diamond","clown","phoron") //world << "init [mineral]" var/area/my_area = get_area(src) var/list/temple_turfs = get_area_turfs(my_area.type) @@ -86,8 +86,8 @@ del(D) for(var/turf/unsimulated/wall/T in temple_turfs) - if(mineral != "plasma") - T.icon_state = replacetext(T.icon_state, "plasma", mineral) + if(mineral != "phoron") + T.icon_state = replacetext(T.icon_state, "phoron", mineral) /*for(var/obj/effect/landmark/falsewall_spawner/F in T.contents) //world << "falsewall_spawner found in wall" diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm index 3581c9fff6..7408663f44 100644 --- a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm +++ b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm @@ -289,8 +289,8 @@ var/trap_type New() - trap_type = pick(50;"thrower","sawburst","poison_dart","flame_burst",10;"plasma_gas",5;"n2_gas") - if( (trap_type == "plasma_gas" || trap_type == "n2_gas") && prob(10)) + trap_type = pick(50;"thrower","sawburst","poison_dart","flame_burst",10;"phoron_gas",5;"n2_gas") + if( (trap_type == "phoron_gas" || trap_type == "n2_gas") && prob(10)) new /obj/effect/glowshroom(src.loc) //hint that this tile is dangerous @@ -337,8 +337,8 @@ myloc.overlays -= flicker del flicker //flick("flameburst",src) - if("plasma_gas") - //spawn a bunch of plasma + if("phoron_gas") + //spawn a bunch of phoron if("n2_gas") //spawn a bunch of sleeping gas if("thrower") diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_turfs.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_turfs.dm index 7be8108d1f..86b4a112c5 100644 --- a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_turfs.dm +++ b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_turfs.dm @@ -174,5 +174,5 @@ desc = "" density = 1 icon = 'icons/turf/walls.dmi' - icon_state = "plasma0" - var/mineral = "plasma" + icon_state = "phoron0" + var/mineral = "phoron" diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/circuits_and_design.dm b/code/WorkInProgress/Cael_Aislinn/Rust/circuits_and_design.dm index f9c6259001..ee5f1def1b 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/circuits_and_design.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/circuits_and_design.dm @@ -56,15 +56,15 @@ datum/design/rust_fuel_port /obj/item/weapon/module/rust_fuel_compressor name = "Internal circuitry (RUST fuel compressor)" icon_state = "card_mod" - origin_tech = "materials=6;plasmatech=4" + origin_tech = "materials=6;phorontech=4" datum/design/rust_fuel_compressor name = "Circuit Design (RUST fuel compressor)" desc = "Allows for the construction of circuit boards used to build a fuel compressor of the RUST fusion engine." id = "rust_fuel_compressor" - req_tech = list("materials" = 6, "plasmatech" = 4) + req_tech = list("materials" = 6, "phorontech" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 3000, "$diamond" = 1000) + materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 3000, "$diamond" = 1000) build_path = "/obj/item/weapon/module/rust_fuel_compressor" ////////////////////////////////////// @@ -74,7 +74,7 @@ datum/design/rust_fuel_compressor name = "Internal circuitry (RUST tokamak core)" build_path = "/obj/machinery/power/rust_core" board_type = "machine" - origin_tech = "bluespace=3;plasmatech=4;magnets=5;powerstorage=6" + origin_tech = "bluespace=3;phorontech=4;magnets=5;powerstorage=6" frame_desc = "Requires 2 Pico Manipulators, 1 Ultra Micro-Laser, 5 Pieces of Cable, 1 Subspace Crystal and 1 Console Screen." req_components = list( "/obj/item/weapon/stock_parts/manipulator/pico" = 2, @@ -87,10 +87,10 @@ datum/design/rust_core name = "Internal circuitry (RUST tokamak core)" desc = "The circuit board that for a RUST-pattern tokamak fusion core." id = "pacman" - req_tech = list(bluespace = 3, plasmatech = 4, magnets = 5, powerstorage = 6) + req_tech = list(bluespace = 3, phorontech = 4, magnets = 5, powerstorage = 6) build_type = IMPRINTER reliability_base = 79 - materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 3000, "$diamond" = 2000) + materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 3000, "$diamond" = 2000) build_path = "/obj/item/weapon/circuitboard/rust_core" ////////////////////////////////////// @@ -100,7 +100,7 @@ datum/design/rust_core name = "Internal circuitry (RUST fuel injector)" build_path = "/obj/machinery/power/rust_fuel_injector" board_type = "machine" - origin_tech = "powerstorage=3;engineering=4;plasmatech=4;materials=6" + origin_tech = "powerstorage=3;engineering=4;phorontech=4;materials=6" frame_desc = "Requires 2 Pico Manipulators, 1 Phasic Scanning Module, 1 Super Matter Bin, 1 Console Screen and 5 Pieces of Cable." req_components = list( "/obj/item/weapon/stock_parts/manipulator/pico" = 2, @@ -113,8 +113,8 @@ datum/design/rust_injector name = "Internal circuitry (RUST tokamak core)" desc = "The circuit board that for a RUST-pattern particle accelerator." id = "pacman" - req_tech = list(powerstorage = 3, engineering = 4, plasmatech = 4, materials = 6) + req_tech = list(powerstorage = 3, engineering = 4, phorontech = 4, materials = 6) build_type = IMPRINTER reliability_base = 79 - materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 3000, "$uranium" = 2000) + materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 3000, "$uranium" = 2000) build_path = "/obj/item/weapon/circuitboard/rust_core" diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm b/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm index 50125f4ef4..cd2c016d31 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_plasma.toxins * held_plasma.toxins * SPECIFIC_HEAT_TOXIN) +//#DEFINE MAX_STORED_ENERGY (held_phoron.toxins * held_phoron.toxins * SPECIFIC_HEAT_TOXIN) /obj/effect/rust_em_field name = "EM Field" @@ -29,7 +29,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K var/field_strength = 0.01 //in teslas, max is 50T var/obj/machinery/rust/rad_source/radiator - var/datum/gas_mixture/held_plasma = new + var/datum/gas_mixture/held_phoron = new var/particle_catchers[13] var/emp_overload = 0 @@ -128,34 +128,34 @@ Deuterium-tritium fusion: 4.5 x 10^7 K radiation = 0 //update values - var/transfer_ratio = field_strength / 50 //higher field strength will result in faster plasma aggregation + var/transfer_ratio = field_strength / 50 //higher field strength will result in faster phoron aggregation major_radius = field_strength * 0.21875// max = 8.75m minor_radius = field_strength * 0.2125// max = 8.625m volume_covered = PI * major_radius * minor_radius * 2.5 * 2.5 * 2.5 * 7 * 7 * transfer_ratio //one tile = 2.5m*2.5m*2.5m - //add plasma from the surrounding environment + //add phoron from the surrounding environment var/datum/gas_mixture/environment = loc.return_air() - //hack in some stuff to remove plasma from the air because SCIENCE - //the amount of plasma pulled in each update is relative to the field strength, with 50T (max field strength) = 100% of area covered by the field + //hack in some stuff to remove phoron from the air because SCIENCE + //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_plasma.toxins < transfer_ratio * 1000) + if(held_phoron.toxins < 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/plasma_captured = new /datum/gas_mixture() + var/datum/gas_mixture/phoron_captured = new /datum/gas_mixture() // - plasma_captured.toxins = round(gas_covered.toxins * transfer_ratio) - //world << "\blue[plasma_captured.toxins] moles of plasma captured" - plasma_captured.temperature = gas_covered.temperature - plasma_captured.update_values() + phoron_captured.toxins = round(gas_covered.toxins * transfer_ratio) + //world << "\blue[phoron_captured.toxins] moles of phoron captured" + phoron_captured.temperature = gas_covered.temperature + phoron_captured.update_values() // - gas_covered.toxins -= plasma_captured.toxins + gas_covered.toxins -= phoron_captured.toxins gas_covered.update_values() // - held_plasma.merge(plasma_captured) + held_phoron.merge(phoron_captured) // environment.merge(gas_covered) @@ -169,35 +169,35 @@ Deuterium-tritium fusion: 4.5 x 10^7 K mega_energy -= energy_lost radiation += energy_lost*/ - //change held plasma temp according to energy levels + //change held phoron temp according to energy levels //SPECIFIC_HEAT_TOXIN - if(mega_energy > 0 && held_plasma.toxins) - var/heat_capacity = held_plasma.heat_capacity()//200 * number of plasma moles + if(mega_energy > 0 && held_phoron.toxins) + var/heat_capacity = held_phoron.heat_capacity()//200 * number of phoron moles if(heat_capacity > 0.0003) //formerly MINIMUM_HEAT_CAPACITY - held_plasma.temperature = (heat_capacity + mega_energy * 35000)/heat_capacity + held_phoron.temperature = (heat_capacity + mega_energy * 35000)/heat_capacity - //if there is too much plasma in the field, lose some - /*if( held_plasma.toxins > (MOLES_CELLSTANDARD * 7) * (50 / field_strength) ) + //if there is too much phoron in the field, lose some + /*if( held_phoron.toxins > (MOLES_CELLSTANDARD * 7) * (50 / field_strength) ) LosePhoron()*/ - if(held_plasma.toxins > 1) - //lose a random amount of plasma back into the air, increased by the field strength (want to switch this over to frequency eventually) + if(held_phoron.toxins > 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 plasma" + //world << "lost [loss_ratio*100]% of held phoron" // - var/datum/gas_mixture/plasma_lost = new - plasma_lost.temperature = held_plasma.temperature + var/datum/gas_mixture/phoron_lost = new + phoron_lost.temperature = held_phoron.temperature // - plasma_lost.toxins = held_plasma.toxins * loss_ratio - //plasma_lost.update_values() - held_plasma.toxins -= held_plasma.toxins * loss_ratio - //held_plasma.update_values() + phoron_lost.toxins = held_phoron.toxins * loss_ratio + //phoron_lost.update_values() + held_phoron.toxins -= held_phoron.toxins * loss_ratio + //held_phoron.update_values() // - environment.merge(plasma_lost) + environment.merge(phoron_lost) radiation += loss_ratio * mega_energy * 0.1 mega_energy -= loss_ratio * mega_energy * 0.1 else - held_plasma.toxins = 0 - //held_plasma.update_values() + held_phoron.toxins = 0 + //held_phoron.update_values() //handle some reactants formatting for(var/reactant in dormant_reactant_quantities) @@ -256,9 +256,9 @@ Deuterium-tritium fusion: 4.5 x 10^7 K radiation += mega_energy mega_energy = 0 - //lose all held plasma back into the air + //lose all held phoron back into the air var/datum/gas_mixture/environment = loc.return_air() - environment.merge(held_plasma) + environment.merge(held_phoron) /obj/effect/rust_em_field/proc/change_size(var/newsize = 1) // diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm b/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm index 72dddd6fe0..88cf6fd441 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm @@ -2,7 +2,7 @@ /* when the core is turned on, it generates [creates] an electromagnetic field -the em field attracts plasma, and suspends it in a controlled torus (doughnut) shape, oscillating around the core +the em field attracts phoron, and suspends it in a controlled torus (doughnut) shape, oscillating around the core the field strength is directly controllable by the user field strength = sqrt(energy used by the field generator) @@ -16,27 +16,27 @@ the size of the EM field = field strength / k 7 tilewidth = between 20T and 50T (can't go higher than 40T) -energy is added by a gyrotron, and lost when plasma escapes +energy is added by a gyrotron, and lost when phoron escapes energy transferred from the gyrotron beams is reduced by how different the frequencies are (closer frequencies = more energy transferred) -frequency = field strength * (stored energy / stored moles of plasma) * x +frequency = field strength * (stored energy / stored moles of phoron) * x (where x is an arbitrary constant to make the frequency something realistic) -the gyrotron beams' frequency and energy are hardcapped low enough that they won't heat the plasma much +the gyrotron beams' frequency and energy are hardcapped low enough that they won't heat the phoron much energy is generated in considerable amounts by fusion reactions from injected particles fusion reactions only occur when the existing energy is above a certain level, and it's near the max operating level of the gyrotron. higher energy reactions only occur at higher energy levels a small amount of energy constantly bleeds off in the form of radiation -the field is constantly pulling in plasma from the surrounding [local] atmosphere -at random intervals, the field releases a random percentage of stored plasma in addition to a percentage of energy as intense radiation +the field is constantly pulling in phoron from the surrounding [local] atmosphere +at random intervals, the field releases a random percentage of stored phoron in addition to a percentage of energy as intense radiation -the amount of plasma is a percentage of the field strength, increased by frequency +the amount of phoron is a percentage of the field strength, increased by frequency */ /* - VALUES - -max volume of plasma storeable by the field = the total volume of a number of tiles equal to the (field tilewidth)^2 +max volume of phoron storeable by the field = the total volume of a number of tiles equal to the (field tilewidth)^2 */ diff --git a/code/WorkInProgress/Cael_Aislinn/ShieldGen/circuits_and_designs.dm b/code/WorkInProgress/Cael_Aislinn/ShieldGen/circuits_and_designs.dm index b85be8f74a..617468bd70 100644 --- a/code/WorkInProgress/Cael_Aislinn/ShieldGen/circuits_and_designs.dm +++ b/code/WorkInProgress/Cael_Aislinn/ShieldGen/circuits_and_designs.dm @@ -6,7 +6,7 @@ name = "Circuit board (Experimental hull shield generator)" board_type = "machine" build_path = "/obj/machinery/shield_gen/external" - origin_tech = "bluespace=4;plasmatech=3" + origin_tech = "bluespace=4;phorontech=3" frame_desc = "Requires 2 Pico Manipulators, 1 Subspace Transmitter, 5 Pieces of cable, 1 Subspace Crystal, 1 Subspace Amplifier and 1 Console Screen." req_components = list( "/obj/item/weapon/stock_parts/manipulator/pico" = 2, @@ -20,9 +20,9 @@ datum/design/shield_gen_ex name = "Circuit Design (Experimental hull shield generator)" desc = "Allows for the construction of circuit boards used to build an experimental hull shield generator." id = "shield_gen" - req_tech = list("bluespace" = 4, "plasmatech" = 3) + req_tech = list("bluespace" = 4, "phorontech" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 10000, "$diamond" = 5000, "$gold" = 10000) + materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000) build_path = "/obj/machinery/shield_gen/external" //////////////////////////////////////// @@ -32,7 +32,7 @@ datum/design/shield_gen_ex name = "Circuit board (Experimental shield generator)" board_type = "machine" build_path = "/obj/machinery/shield_gen/external" - origin_tech = "bluespace=4;plasmatech=3" + origin_tech = "bluespace=4;phorontech=3" frame_desc = "Requires 2 Pico Manipulators, 1 Subspace Transmitter, 5 Pieces of cable, 1 Subspace Crystal, 1 Subspace Amplifier and 1 Console Screen." req_components = list( "/obj/item/weapon/stock_parts/manipulator/pico" = 2, @@ -46,9 +46,9 @@ datum/design/shield_gen name = "Circuit Design (Experimental shield generator)" desc = "Allows for the construction of circuit boards used to build an experimental shield generator." id = "shield_gen" - req_tech = list("bluespace" = 4, "plasmatech" = 3) + req_tech = list("bluespace" = 4, "phorontech" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 10000, "$diamond" = 5000, "$gold" = 10000) + materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000) build_path = "/obj/machinery/shield_gen/external" //////////////////////////////////////// @@ -74,5 +74,5 @@ datum/design/shield_cap id = "shield_cap" req_tech = list("magnets" = 3, "powerstorage" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 10000, "$diamond" = 5000, "$silver" = 10000) + materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$silver" = 10000) build_path = "/obj/machinery/shield_gen/external" diff --git a/code/WorkInProgress/Mini/atmos_control.dm b/code/WorkInProgress/Mini/atmos_control.dm index adf81eefb8..183f29d645 100644 --- a/code/WorkInProgress/Mini/atmos_control.dm +++ b/code/WorkInProgress/Mini/atmos_control.dm @@ -332,7 +332,7 @@ table tr:first-child th:first-child { border: none;} var/list/gases = list( "oxygen" = "O2", "carbon dioxide" = "CO2", - "plasma" = "Toxin", + "phoron" = "Toxin", "other" = "Other", ) var/list/tlv diff --git a/code/WorkInProgress/Ported/Spawners/spawner.dm b/code/WorkInProgress/Ported/Spawners/spawner.dm index 875a05cc68..90f2f90039 100644 --- a/code/WorkInProgress/Ported/Spawners/spawner.dm +++ b/code/WorkInProgress/Ported/Spawners/spawner.dm @@ -57,7 +57,7 @@ // radio if (0) var/obj/item/assembly/r_i_ptank/R = new /obj/item/assembly/r_i_ptank(src.loc) - var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R) + var/obj/item/weapon/tank/phoron/p3 = new /obj/item/weapon/tank/phoron(R) var/obj/item/device/radio/signaler/p1 = new /obj/item/device/radio/signaler(R) var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R) R.part1 = p1 @@ -74,7 +74,7 @@ // proximity if (1) var/obj/item/assembly/m_i_ptank/R = new /obj/item/assembly/m_i_ptank(src.loc) - var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R) + var/obj/item/weapon/tank/phoron/p3 = new /obj/item/weapon/tank/phoron(R) var/obj/item/device/prox_sensor/p1 = new /obj/item/device/prox_sensor(R) var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R) R.part1 = p1 @@ -96,7 +96,7 @@ // timer if (2) var/obj/item/assembly/t_i_ptank/R = new /obj/item/assembly/t_i_ptank(src.loc) - var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R) + var/obj/item/weapon/tank/phoron/p3 = new /obj/item/weapon/tank/phoron(R) var/obj/item/device/timer/p1 = new /obj/item/device/timer(R) var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R) R.part1 = p1 @@ -112,7 +112,7 @@ //bombvest if(3) var/obj/item/clothing/suit/armor/a_i_a_ptank/R = new /obj/item/clothing/suit/armor/a_i_a_ptank(src.loc) - var/obj/item/weapon/tank/plasma/p4 = new /obj/item/weapon/tank/plasma(R) + var/obj/item/weapon/tank/phoron/p4 = new /obj/item/weapon/tank/phoron(R) var/obj/item/device/healthanalyzer/p1 = new /obj/item/device/healthanalyzer(R) var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R) var/obj/item/clothing/suit/armor/vest/p3 = new /obj/item/clothing/suit/armor/vest(R) @@ -140,7 +140,7 @@ if (0) var/obj/item/device/transfer_valve/V = new(src.loc) - var/obj/item/weapon/tank/plasma/PT = new(V) + var/obj/item/weapon/tank/phoron/PT = new(V) var/obj/item/weapon/tank/oxygen/OT = new(V) var/obj/item/device/radio/signaler/S = new(V) @@ -164,7 +164,7 @@ if (1) var/obj/item/device/transfer_valve/V = new(src.loc) - var/obj/item/weapon/tank/plasma/PT = new(V) + var/obj/item/weapon/tank/phoron/PT = new(V) var/obj/item/weapon/tank/oxygen/OT = new(V) var/obj/item/device/prox_sensor/P = new(V) @@ -187,7 +187,7 @@ // timer if (2) var/obj/item/device/transfer_valve/V = new(src.loc) - var/obj/item/weapon/tank/plasma/PT = new(V) + var/obj/item/weapon/tank/phoron/PT = new(V) var/obj/item/weapon/tank/oxygen/OT = new(V) var/obj/item/device/timer/T = new(V) diff --git a/code/WorkInProgress/Tastyfish/Eliza_Data.dm b/code/WorkInProgress/Tastyfish/Eliza_Data.dm index 2fbbfb030b..80e1209924 100644 --- a/code/WorkInProgress/Tastyfish/Eliza_Data.dm +++ b/code/WorkInProgress/Tastyfish/Eliza_Data.dm @@ -243,7 +243,7 @@ "Do you think that caused a trauma with you?", "Have you ever previously spoken to anybody about this?")), new/datum/text_parser/keyword( - list("bomb", "explosive", "toxin", "plasma"), + list("bomb", "explosive", "toxin", "phoron"), list( "Do you worry about bombs often?", "Do you work in toxins?", diff --git a/code/WorkInProgress/animusstation/atm.dm b/code/WorkInProgress/animusstation/atm.dm index 12632bf3d9..1031c599f4 100644 --- a/code/WorkInProgress/animusstation/atm.dm +++ b/code/WorkInProgress/animusstation/atm.dm @@ -49,7 +49,7 @@ log transactions A.loc = src inserted += 50 return - if(istype(A,/obj/item/weapon/coin/plasma)) + if(istype(A,/obj/item/weapon/coin/phoron)) cashes += A user.drop_item() A.loc = src diff --git a/code/ZAS/ConnectionGroup.dm b/code/ZAS/ConnectionGroup.dm index c31dbf9a03..6b253ee4e5 100644 --- a/code/ZAS/ConnectionGroup.dm +++ b/code/ZAS/ConnectionGroup.dm @@ -239,21 +239,21 @@ 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_plasma = A.toxins * size + full_phoron = A.toxins * 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_plasma = B.toxins * share_size + s_full_phoron = B.toxins * share_size s_full_heat_capacity = B.heat_capacity() * share_size oxy_avg = (full_oxy + s_full_oxy) / (size + share_size) nit_avg = (full_nitro + s_full_nitro) / (size + share_size) co2_avg = (full_co2 + s_full_co2) / (size + share_size) - plasma_avg = (full_plasma + s_full_plasma) / (size + share_size) + phoron_avg = (full_phoron + s_full_phoron) / (size + share_size) temp_avg = (A.temperature * full_heat_capacity + B.temperature * s_full_heat_capacity) / (full_heat_capacity + s_full_heat_capacity) @@ -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 - plasma_avg) * (1-ratio) + plasma_avg ) + A.toxins = max(0, (A.toxins - 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 - plasma_avg) * (1-ratio) + plasma_avg ) + B.toxins = max(0, (B.toxins - phoron_avg) * (1-ratio) + phoron_avg ) B.temperature = max(0, (B.temperature - temp_avg) * (1-ratio) + temp_avg ) @@ -314,7 +314,7 @@ proc/ShareSpace(datum/gas_mixture/A, list/unsimulated_tiles, dbg_output) unsim_oxygen = 0 unsim_nitrogen = 0 unsim_co2 = 0 - unsim_plasma = 0 + unsim_phoron = 0 unsim_heat_capacity = 0 unsim_temperature = 0 @@ -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_plasma = avg_unsim.toxins + unsim_phoron = avg_unsim.toxins unsim_temperature = avg_unsim.temperature share_size = max(1, max(size + 3, 1) + avg_unsim.group_multiplier) tileslen = avg_unsim.group_multiplier @@ -352,20 +352,20 @@ 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_plasma += T.toxins + unsim_phoron += T.toxins unsim_temperature += T.temperature/unsimulated_tiles.len //These values require adjustment in order to properly represent a room of the specified size. unsim_oxygen *= correction_ratio unsim_co2 *= correction_ratio unsim_nitrogen *= correction_ratio - unsim_plasma *= correction_ratio + unsim_phoron *= correction_ratio tileslen = unsimulated_tiles.len else //invalid input type return 0 - unsim_heat_capacity = HEAT_CAPACITY_CALCULATION(unsim_oxygen, unsim_co2, unsim_nitrogen, unsim_plasma) + unsim_heat_capacity = HEAT_CAPACITY_CALCULATION(unsim_oxygen, unsim_co2, unsim_nitrogen, unsim_phoron) var ratio = sharing_lookup_table[6] @@ -375,14 +375,14 @@ 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_plasma = A.toxins * size + full_phoron = A.toxins * size full_heat_capacity = A.heat_capacity() * size oxy_avg = (full_oxy + unsim_oxygen*share_size) / (size + share_size) nit_avg = (full_nitro + unsim_nitrogen*share_size) / (size + share_size) co2_avg = (full_co2 + unsim_co2*share_size) / (size + share_size) - plasma_avg = (full_plasma + unsim_plasma*share_size) / (size + share_size) + phoron_avg = (full_phoron + unsim_phoron*share_size) / (size + share_size) temp_avg = 0 @@ -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 - plasma_avg) * (1 - ratio) + plasma_avg ) + A.toxins = max(0, (A.toxins - phoron_avg) * (1 - ratio) + phoron_avg ) A.temperature = max(TCMB, (A.temperature - temp_avg) * (1 - ratio) + temp_avg ) diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index ed24af6b87..085d4252a9 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -3,8 +3,8 @@ Making Bombs with ZAS: Make burny fire with lots of burning Draw off 5000K gas from burny fire -Separate gas into oxygen and plasma components -Obtain plasma and oxygen tanks filled up about 50-75% with normal-temp gas +Separate gas into oxygen and phoron components +Obtain phoron and oxygen tanks filled up about 50-75% with normal-temp gas Fill rest with super hot gas from separated canisters, they should be about 125C now. Attach to transfer valve and open. BOOM. diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index 6e5871c1ca..6797fa5b8c 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -7,7 +7,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') 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/CLOTH_CONTAMINATION_DESC = "If this is on, phoron does damage by getting into cloth." var/PHORONGUARD_ONLY = 0 var/PHORONGUARD_ONLY_NAME = "\"PhoronGuard Only\"" @@ -31,7 +31,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') var/PHORON_HALLUCINATION = 0 var/PHORON_HALLUCINATION_NAME = "Phoron Hallucination" - var/PHORON_HALLUCINATION_DESC = "Does being in plasma cause you to hallucinate?" + var/PHORON_HALLUCINATION_DESC = "Does being in phoron cause you to hallucinate?" var/N2O_HALLUCINATION = 1 var/N2O_HALLUCINATION_NAME = "N2O Hallucination" @@ -75,7 +75,7 @@ obj/var/contaminated = 0 /mob/proc/pl_effects() /mob/living/carbon/human/pl_effects() - //Handles all the bad things plasma can do. + //Handles all the bad things phoron can do. //Contamination if(vsc.plc.CLOTH_CONTAMINATION) contaminate() @@ -153,7 +153,7 @@ obj/var/contaminated = 0 turf/Entered(obj/item/I) . = ..() - //Items that are in plasma, but not on a mob, can still be contaminated. + //Items that are in phoron, but not on a mob, can still be contaminated. if(istype(I) && vsc.plc.CLOTH_CONTAMINATION) var/datum/gas_mixture/env = return_air(1) if(!env) diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index 1f9ebf1610..c2d8a2fc6c 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -198,7 +198,7 @@ var/global/vs_control/vsc = new return switch(def) if("Phoron - Standard") - plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. + plc.CLOTH_CONTAMINATION = 1 //If this is on, phoron does damage by getting into cloth. plc.PHORONGUARD_ONLY = 0 plc.GENETIC_CORRUPTION = 0 //Chance of genetic corruption as well as toxic damage, X in 1000. plc.SKIN_BURNS = 0 //Phoron has an effect similar to mustard gas on the un-suited. @@ -207,7 +207,7 @@ var/global/vs_control/vsc = new plc.CONTAMINATION_LOSS = 0.02 if("Phoron - Low Hazard") - plc.CLOTH_CONTAMINATION = 0 //If this is on, plasma does damage by getting into cloth. + plc.CLOTH_CONTAMINATION = 0 //If this is on, phoron does damage by getting into cloth. plc.PHORONGUARD_ONLY = 0 plc.GENETIC_CORRUPTION = 0 //Chance of genetic corruption as well as toxic damage, X in 1000 plc.SKIN_BURNS = 0 //Phoron has an effect similar to mustard gas on the un-suited. @@ -216,7 +216,7 @@ var/global/vs_control/vsc = new plc.CONTAMINATION_LOSS = 0.01 if("Phoron - High Hazard") - plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. + plc.CLOTH_CONTAMINATION = 1 //If this is on, phoron does damage by getting into cloth. plc.PHORONGUARD_ONLY = 0 plc.GENETIC_CORRUPTION = 0 //Chance of genetic corruption as well as toxic damage, X in 1000. plc.SKIN_BURNS = 1 //Phoron has an effect similar to mustard gas on the un-suited. @@ -225,7 +225,7 @@ var/global/vs_control/vsc = new plc.CONTAMINATION_LOSS = 0.05 if("Phoron - Oh Shit!") - plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. + plc.CLOTH_CONTAMINATION = 1 //If this is on, phoron does damage by getting into cloth. plc.PHORONGUARD_ONLY = 1 plc.GENETIC_CORRUPTION = 5 //Chance of genetic corruption as well as toxic damage, X in 1000. plc.SKIN_BURNS = 1 //Phoron has an effect similar to mustard gas on the un-suited. @@ -291,7 +291,7 @@ var/global/vs_control/vsc = new connection_insulation = 0 - world << "\blue [key_name(user)] changed the global plasma/ZAS settings to \"[def]\"" + world << "\blue [key_name(user)] changed the global phoron/ZAS settings to \"[def]\"" /pl_control/var/list/settings = list() diff --git a/code/ZAS/_gas_mixture.dm b/code/ZAS/_gas_mixture.dm index f3aea593ba..8654ad21a2 100644 --- a/code/ZAS/_gas_mixture.dm +++ b/code/ZAS/_gas_mixture.dm @@ -17,7 +17,7 @@ What are the archived variables for? /hook/startup/proc/createGasOverlays() plmaster = new /obj/effect/overlay() plmaster.icon = 'icons/effects/tile_effects.dmi' - plmaster.icon_state = "plasma" + plmaster.icon_state = "phoron" plmaster.layer = FLY_LAYER plmaster.mouse_opacity = 0 @@ -258,11 +258,11 @@ What are the archived variables for? carbon_dioxide += burned_fuel fuel_burnt += burned_fuel - //Handle plasma burning + //Handle phoron burning if(toxins > MINIMUM_HEAT_CAPACITY) - var/plasma_burn_rate = 0 + var/phoron_burn_rate = 0 var/oxygen_burn_rate = 0 - //more plasma released at higher temperatures + //more phoron released at higher temperatures var/temperature_scale if(temperature > PLASMA_UPPER_TEMPERATURE) temperature_scale = 1 @@ -271,17 +271,17 @@ What are the archived variables for? if(temperature_scale > 0) oxygen_burn_rate = 1.4 - temperature_scale if(oxygen > toxins*PLASMA_OXYGEN_FULLBURN) - plasma_burn_rate = (toxins*temperature_scale)/4 + phoron_burn_rate = (toxins*temperature_scale)/4 else - plasma_burn_rate = (temperature_scale*(oxygen/PLASMA_OXYGEN_FULLBURN))/4 - if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY) - toxins -= plasma_burn_rate - oxygen -= plasma_burn_rate*oxygen_burn_rate - carbon_dioxide += plasma_burn_rate + phoron_burn_rate = (temperature_scale*(oxygen/PLASMA_OXYGEN_FULLBURN))/4 + if(phoron_burn_rate > MINIMUM_HEAT_CAPACITY) + toxins -= phoron_burn_rate + oxygen -= phoron_burn_rate*oxygen_burn_rate + carbon_dioxide += phoron_burn_rate - energy_released += FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate) + energy_released += FIRE_PLASMA_ENERGY_RELEASED * (phoron_burn_rate) - fuel_burnt += (plasma_burn_rate)*(1+oxygen_burn_rate) + fuel_burnt += (phoron_burn_rate)*(1+oxygen_burn_rate) if(energy_released > 0) var/new_heat_capacity = heat_capacity() diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 376df93678..bea5672006 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -16,7 +16,7 @@ var/list/advance_cures = list( "nutriment", "sugar", "orangejuice", "spaceacillin", "kelotane", "ethanol", "leporazine", "synaptizine", "lipozine", - "silver", "gold", "plasma" + "silver", "gold", "phoron" ) /* diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm index 8e70770a4a..00bf74e7cd 100644 --- a/code/datums/diseases/rhumba_beat.dm +++ b/code/datums/diseases/rhumba_beat.dm @@ -4,7 +4,7 @@ spread = "On contact" spread_type = CONTACT_GENERAL cure = "Chick Chicky Boom!" - cure_id = list("plasma") + cure_id = list("phoron") agent = "Unknown" affected_species = list("Human") permeability_mod = 1 diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 17ff8a79d4..4c98bf3aab 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -599,11 +599,11 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee access = access_robotics group = "Engineering" -/datum/supply_packs/plasma +/datum/supply_packs/phoron name = "Phoron assembly crate" - contains = list(/obj/item/weapon/tank/plasma, - /obj/item/weapon/tank/plasma, - /obj/item/weapon/tank/plasma, + contains = list(/obj/item/weapon/tank/phoron, + /obj/item/weapon/tank/phoron, + /obj/item/weapon/tank/phoron, /obj/item/device/assembly/igniter, /obj/item/device/assembly/igniter, /obj/item/device/assembly/igniter, @@ -614,7 +614,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /obj/item/device/assembly/timer, /obj/item/device/assembly/timer) cost = 10 - containertype = /obj/structure/closet/crate/secure/plasma + containertype = /obj/structure/closet/crate/secure/phoron containername = "Phoron assembly crate" access = access_tox_storage group = "Medical / Science" @@ -638,9 +638,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /datum/supply_packs/eweapons name = "Experimental weapons crate" contains = list(/obj/item/weapon/flamethrower/full, - /obj/item/weapon/tank/plasma, - /obj/item/weapon/tank/plasma, - /obj/item/weapon/tank/plasma, + /obj/item/weapon/tank/phoron, + /obj/item/weapon/tank/phoron, + /obj/item/weapon/tank/phoron, /obj/item/weapon/grenade/chem_grenade/incendiary, /obj/item/weapon/grenade/chem_grenade/incendiary, /obj/item/weapon/grenade/chem_grenade/incendiary) @@ -1022,7 +1022,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee name = "Supermatter Core" contains = list(/obj/machinery/power/supermatter) cost = 50 - containertype = /obj/structure/closet/crate/secure/plasma + containertype = /obj/structure/closet/crate/secure/phoron containername = "Supermatter crate (CAUTION)" group = "Engineering" access = access_ce @@ -1032,7 +1032,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee name = "Supermatter Shard" contains = list(/obj/machinery/power/supermatter/shard) cost = 25 - containertype = /obj/structure/closet/crate/secure/plasma + containertype = /obj/structure/closet/crate/secure/phoron containername = "Supermatter shard crate (CAUTION)" access = access_ce group = "Engineering" */ diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 7ca5bdbe80..e11a950eee 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -59,7 +59,7 @@ throw_range = 20 /obj/item/weapon/soap/nanotrasen - desc = "A Nanotrasen brand bar of soap. Smells of plasma." + desc = "A Nanotrasen brand bar of soap. Smells of phoron." icon_state = "soapnt" /obj/item/weapon/soap/deluxe diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index afa8b72c1b..124596f3e8 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -323,13 +323,13 @@ ________________________________________________________________________________ var/o2_level = environment.oxygen/total_moles var/n2_level = environment.nitrogen/total_moles var/co2_level = environment.carbon_dioxide/total_moles - var/plasma_level = environment.toxins/total_moles - var/unknown_level = 1-(o2_level+n2_level+co2_level+plasma_level) + var/phoron_level = environment.toxins/total_moles + var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level) dat += "" if(unknown_level > 0.01) dat += "OTHER: [round(unknown_level)]%
" diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index b3493efcba..7be4c3ad35 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -489,7 +489,7 @@ datum/objective/steal "a pair of magboots" = /obj/item/clothing/shoes/magboots, "the station blueprints" = /obj/item/blueprints, "a nasa voidsuit" = /obj/item/clothing/suit/space/nasavoid, - "28 moles of plasma (full tank)" = /obj/item/weapon/tank, + "28 moles of phoron (full tank)" = /obj/item/weapon/tank, "a sample of slime extract" = /obj/item/slime_extract, "a piece of corgi meat" = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi, "a research director's jumpsuit" = /obj/item/clothing/under/rank/research_director, @@ -551,13 +551,13 @@ datum/objective/steal if(!isliving(owner.current)) return 0 var/list/all_items = owner.current.get_contents() switch (target_name) - if("28 moles of plasma (full tank)","10 diamonds","50 gold bars","25 refined uranium bars") + if("28 moles of phoron (full tank)","10 diamonds","50 gold bars","25 refined uranium bars") var/target_amount = text2num(target_name)//Non-numbers are ignored. var/found_amount = 0.0//Always starts as zero. - for(var/obj/item/I in all_items) //Check for plasma tanks + for(var/obj/item/I in all_items) //Check for phoron tanks if(istype(I, steal_target)) - found_amount += (target_name=="28 moles of plasma (full tank)" ? (I:air_contents:toxins) : (I:amount)) + found_amount += (target_name=="28 moles of phoron (full tank)" ? (I:air_contents:toxins) : (I:amount)) return found_amount>=target_amount if("50 coins (in bag)") @@ -867,7 +867,7 @@ datum/objective/heist/salvage target = "plasteel" target_amount = 100 if(4) - target = "plasma" + target = "phoron" target_amount = 100 if(5) target = "silver" diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index c781bb20c9..4434cd3a33 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -103,7 +103,7 @@ req_access = list(access_rd, access_atmospherics, access_engine_equip) TLV["oxygen"] = list(-1.0, -1.0,-1.0,-1.0) // Partial pressure, kpa TLV["carbon dioxide"] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa - TLV["plasma"] = list(-1.0, -1.0, 0.2, 0.5) // Partial pressure, kpa + TLV["phoron"] = list(-1.0, -1.0, 0.2, 0.5) // Partial pressure, kpa TLV["other"] = list(-1.0, -1.0, 0.5, 1.0) // Partial pressure, kpa TLV["pressure"] = list(0,ONE_ATMOSPHERE*0.10,ONE_ATMOSPHERE*1.40,ONE_ATMOSPHERE*1.60) /* kpa */ TLV["temperature"] = list(20, 40, 140, 160) // K @@ -143,7 +143,7 @@ // breathable air according to human/Life() TLV["oxygen"] = list(16, 19, 135, 140) // Partial pressure, kpa TLV["carbon dioxide"] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa - TLV["plasma"] = list(-1.0, -1.0, 0.2, 0.5) // Partial pressure, kpa + TLV["phoron"] = list(-1.0, -1.0, 0.2, 0.5) // Partial pressure, kpa TLV["other"] = list(-1.0, -1.0, 0.5, 1.0) // Partial pressure, kpa TLV["pressure"] = list(ONE_ATMOSPHERE*0.80,ONE_ATMOSPHERE*0.90,ONE_ATMOSPHERE*1.10,ONE_ATMOSPHERE*1.20) /* kpa */ TLV["temperature"] = list(T0C-26, T0C, T0C+40, T0C+66) // K @@ -245,7 +245,7 @@ var/pressure_dangerlevel = get_danger_level(environment_pressure, TLV["pressure"]) var/oxygen_dangerlevel = get_danger_level(environment.oxygen*partial_pressure, TLV["oxygen"]) var/co2_dangerlevel = get_danger_level(environment.carbon_dioxide*partial_pressure, TLV["carbon dioxide"]) - var/plasma_dangerlevel = get_danger_level(environment.toxins*partial_pressure, TLV["plasma"]) + var/phoron_dangerlevel = get_danger_level(environment.toxins*partial_pressure, TLV["phoron"]) var/temperature_dangerlevel = get_danger_level(environment.temperature, TLV["temperature"]) var/other_dangerlevel = get_danger_level(other_moles*partial_pressure, TLV["other"]) @@ -253,7 +253,7 @@ pressure_dangerlevel, oxygen_dangerlevel, co2_dangerlevel, - plasma_dangerlevel, + phoron_dangerlevel, other_dangerlevel, temperature_dangerlevel ) @@ -729,9 +729,9 @@ var/co2_dangerlevel = get_danger_level(environment.carbon_dioxide*partial_pressure, current_settings) var/co2_percent = round(environment.carbon_dioxide / total * 100, 2) - current_settings = TLV["plasma"] - var/plasma_dangerlevel = get_danger_level(environment.toxins*partial_pressure, current_settings) - var/plasma_percent = round(environment.toxins / total * 100, 2) + current_settings = TLV["phoron"] + var/phoron_dangerlevel = get_danger_level(environment.toxins*partial_pressure, current_settings) + var/phoron_percent = round(environment.toxins / total * 100, 2) current_settings = TLV["other"] var/other_moles = 0.0 @@ -746,7 +746,7 @@ Pressure: [environment_pressure]kPa
Oxygen: [oxygen_percent]%
Carbon dioxide: [co2_percent]%
-Toxins: [plasma_percent]%
+Toxins: [phoron_percent]%
"} if (other_dangerlevel==2) output += "Notice: High Concentration of Unknown Particles Detected
" @@ -757,7 +757,7 @@ Toxins: [plasma_percent]%
//Overall status output += "Local Status: " - switch(max(pressure_dangerlevel,oxygen_dangerlevel,co2_dangerlevel,plasma_dangerlevel,other_dangerlevel,temperature_dangerlevel)) + switch(max(pressure_dangerlevel,oxygen_dangerlevel,co2_dangerlevel,phoron_dangerlevel,other_dangerlevel,temperature_dangerlevel)) if(2) output += "DANGER: Internals Required" if(1) @@ -930,7 +930,7 @@ table tr:first-child th:first-child { border: none;} var/list/gases = list( "oxygen" = "O2", "carbon dioxide" = "CO2", - "plasma" = "Toxin", + "phoron" = "Toxin", "other" = "Other",) var/list/selected diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index ce3a166b3a..4610b33322 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -125,15 +125,15 @@ var/o2_concentration = air_contents.oxygen/total_moles var/n2_concentration = air_contents.nitrogen/total_moles var/co2_concentration = air_contents.carbon_dioxide/total_moles - var/plasma_concentration = air_contents.toxins/total_moles + var/phoron_concentration = air_contents.toxins/total_moles - var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) + var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+phoron_concentration) user << "\blue Pressure: [round(pressure,0.1)] kPa" user << "\blue Nitrogen: [round(n2_concentration*100)]%" user << "\blue Oxygen: [round(o2_concentration*100)]%" user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Phoron: [round(plasma_concentration*100)]%" + user << "\blue Phoron: [round(phoron_concentration*100)]%" if(unknown_concentration>0.01) user << "\red Unknown: [round(unknown_concentration*100)]%" user << "\blue Temperature: [round(air_contents.temperature-T0C)]°C" diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index d5408d3330..a57140b6e3 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -10,7 +10,7 @@ g_amt = 300 // Motion, EMP-Proof, X-Ray - var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma, /obj/item/weapon/reagent_containers/food/snacks/grown/carrot) + var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/phoron, /obj/item/weapon/reagent_containers/food/snacks/grown/carrot) var/list/upgrades = list() var/state = 0 var/busy = 0 diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index 0ee0e622b8..0c0c845700 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -53,7 +53,7 @@ // CHECKS /obj/machinery/camera/proc/isEmpProof() - var/O = locate(/obj/item/stack/sheet/mineral/plasma) in assembly.upgrades + var/O = locate(/obj/item/stack/sheet/mineral/phoron) in assembly.upgrades return O /obj/machinery/camera/proc/isXRay() @@ -67,7 +67,7 @@ // UPGRADE PROCS /obj/machinery/camera/proc/upgradeEmpProof() - assembly.upgrades.Add(new /obj/item/stack/sheet/mineral/plasma(assembly)) + assembly.upgrades.Add(new /obj/item/stack/sheet/mineral/phoron(assembly)) /obj/machinery/camera/proc/upgradeXRay() assembly.upgrades.Add(new /obj/item/weapon/reagent_containers/food/snacks/grown/carrot(assembly)) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index bd2c66f42e..9232ff019b 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -212,7 +212,7 @@ to destroy them and players will be able to make replacements. name = "Circuit Board (PACMAN-type Generator)" build_path = "/obj/machinery/power/port_gen/pacman" board_type = "machine" - origin_tech = "programming=3:powerstorage=3;plasmatech=3;engineering=3" + origin_tech = "programming=3:powerstorage=3;phorontech=3;engineering=3" frame_desc = "Requires 1 Matter Bin, 1 Micro-Laser, 2 Pieces of Cable, and 1 Capacitor." req_components = list( "/obj/item/weapon/stock_parts/matter_bin" = 1, diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 81675367ad..0ce20bbbfd 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -258,21 +258,21 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }. L.apply_effect(15,IRRADIATE,0) return -/obj/machinery/door/airlock/plasma +/obj/machinery/door/airlock/phoron name = "Phoron Airlock" desc = "No way this can end badly." - icon = 'icons/obj/doors/Doorplasma.dmi' - mineral = "plasma" + icon = 'icons/obj/doors/Doorphoron.dmi' + mineral = "phoron" -/obj/machinery/door/airlock/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/machinery/door/airlock/phoron/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > 300) PhoronBurn(exposed_temperature) -/obj/machinery/door/airlock/plasma/proc/ignite(exposed_temperature) +/obj/machinery/door/airlock/phoron/proc/ignite(exposed_temperature) if(exposed_temperature > 300) PhoronBurn(exposed_temperature) -/obj/machinery/door/airlock/plasma/proc/PhoronBurn(temperature) +/obj/machinery/door/airlock/phoron/proc/PhoronBurn(temperature) for(var/turf/simulated/floor/target_tile in range(2,loc)) // if(target_tile.parent && target_tile.parent.group_processing) // THESE PROBABLY DO SOMETHING IMPORTANT BUT I DON'T KNOW HOW TO FIX IT - Erthilo // target_tile.parent.suspend_group_processing() @@ -282,13 +282,13 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }. napalm.temperature = 400+T0C target_tile.assume_air(napalm) spawn (0) target_tile.hotspot_expose(temperature, 400) - for(var/obj/structure/falsewall/plasma/F in range(3,src))//Hackish as fuck, but until temperature_expose works, there is nothing I can do -Sieve + for(var/obj/structure/falsewall/phoron/F in range(3,src))//Hackish as fuck, but until temperature_expose works, there is nothing I can do -Sieve var/turf/T = get_turf(F) - T.ChangeTurf(/turf/simulated/wall/mineral/plasma/) + T.ChangeTurf(/turf/simulated/wall/mineral/phoron/) del (F) - for(var/turf/simulated/wall/mineral/plasma/W in range(3,src)) + for(var/turf/simulated/wall/mineral/phoron/W in range(3,src)) W.ignite((temperature/4))//Added so that you can't set off a massive chain reaction with a small flame - for(var/obj/machinery/door/airlock/plasma/D in range(3,src)) + for(var/obj/machinery/door/airlock/phoron/D in range(3,src)) D.ignite(temperature/4) new/obj/structure/door_assembly( src.loc ) del (src) @@ -1248,7 +1248,7 @@ About the new airlock wires panel: ..() return -/obj/machinery/door/airlock/plasma/attackby(C as obj, mob/user as mob) +/obj/machinery/door/airlock/phoron/attackby(C as obj, mob/user as mob) if(C) ignite(is_hot(C)) ..() diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 817a3603e8..a3bea04fd1 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -1,6 +1,6 @@ /obj/machinery/igniter name = "igniter" - desc = "It's useful for igniting plasma." + desc = "It's useful for igniting flammable items." icon = 'icons/obj/stationobjs.dmi' icon_state = "igniter1" var/id = null diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index bbf765544f..59e24ad3e9 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -65,7 +65,7 @@ if(1 to 50) objective = "Steal [pick("a hand teleporter", "the Captain's antique laser gun", "a jetpack", "the Captain's ID", "the Captain's jumpsuit")]." if(51 to 60) - objective = "Destroy 70% or more of the station's plasma tanks." + objective = "Destroy 70% or more of the station's phoron tanks." if(61 to 70) objective = "Cut power to 80% or more of the station's tiles." if(71 to 80) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 5eb4601be8..9f5fc789e7 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -597,7 +597,7 @@ desc = "A vendor with a wide variety of masks and gas tanks." icon = 'icons/obj/objects.dmi' icon_state = "dispenser" - product_paths = "/obj/item/weapon/tank/oxygen;/obj/item/weapon/tank/plasma;/obj/item/weapon/tank/emergency_oxygen;/obj/item/weapon/tank/emergency_oxygen/engi;/obj/item/clothing/mask/breath" + product_paths = "/obj/item/weapon/tank/oxygen;/obj/item/weapon/tank/phoron;/obj/item/weapon/tank/emergency_oxygen;/obj/item/weapon/tank/emergency_oxygen/engi;/obj/item/clothing/mask/breath" product_amounts = "10;10;10;5;25" vend_delay = 0 */ @@ -719,7 +719,7 @@ //This one's from bay12 -/obj/machinery/vending/plasmaresearch +/obj/machinery/vending/phoronresearch name = "Toximate 3000" desc = "All the fine parts you need in one vending machine!" products = list(/obj/item/clothing/under/rank/scientist = 6,/obj/item/clothing/suit/bio_suit = 6,/obj/item/clothing/head/bio_hood = 6, diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 015b6f8239..53317f116b 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -262,7 +262,7 @@ energy_drain = 250 range = MELEE|RANGED construction_time = 1200 - construction_cost = list("metal"=30000,"plasma"=25000,"silver"=20000,"gold"=20000) + construction_cost = list("metal"=30000,"phoron"=25000,"silver"=20000,"gold"=20000) var/mode = 0 //0 - deconstruct, 1 - wall or floor, 2 - airlock. var/disabled = 0 //malf @@ -831,9 +831,9 @@ /obj/item/mecha_parts/mecha_equipment/generator name = "Phoron Generator" - desc = "Generates power using solid plasma as fuel. Pollutes the environment." + desc = "Generates power using solid phoron as fuel. Pollutes the environment." icon_state = "tesla" - origin_tech = "plasmatech=2;powerstorage=2;engineering=1" + origin_tech = "phorontech=2;powerstorage=2;engineering=1" equip_cooldown = 10 energy_drain = 0 range = MELEE @@ -853,7 +853,7 @@ return proc/init() - fuel = new /obj/item/stack/sheet/mineral/plasma(src) + fuel = new /obj/item/stack/sheet/mineral/phoron(src) fuel.amount = 0 pr_mech_generator = new /datum/global_iterator/mecha_generator(list(src),0) pr_mech_generator.set_delay(equip_cooldown) @@ -928,12 +928,12 @@ if(prob(10)) GM.toxins += 100 GM.temperature = 1500+T0C //should be enough to start a fire - T.visible_message("The [src] suddenly disgorges a cloud of heated plasma.") + T.visible_message("The [src] suddenly disgorges a cloud of heated phoron.") destroy() else GM.toxins += 5 GM.temperature = istype(T) ? T.air.temperature : T20C - T.visible_message("The [src] suddenly disgorges a cloud of plasma.") + T.visible_message("The [src] suddenly disgorges a cloud of phoron.") T.assume_air(GM) return diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index f15ae7eb48..de3884923a 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -21,7 +21,7 @@ "gold"=0, "silver"=0, "diamond"=0, - "plasma"=0, + "phoron"=0, "uranium"=0, //"bananium"=0 No need to state what it can no longer hold ) @@ -684,8 +684,8 @@ type = /obj/item/stack/sheet/mineral/silver if("diamond") type = /obj/item/stack/sheet/mineral/diamond - if("plasma") - type = /obj/item/stack/sheet/mineral/plasma + if("phoron") + type = /obj/item/stack/sheet/mineral/phoron if("uranium") type = /obj/item/stack/sheet/mineral/uranium /*if("bananium") @@ -732,9 +732,9 @@ if(src.resources["glass"] >= 3750) var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src.loc) G.amount = round(src.resources["glass"] / G.perunit) - if(src.resources["plasma"] >= 2000) - var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma(src.loc) - G.amount = round(src.resources["plasma"] / G.perunit) + if(src.resources["phoron"] >= 2000) + var/obj/item/stack/sheet/mineral/phoron/G = new /obj/item/stack/sheet/mineral/phoron(src.loc) + G.amount = round(src.resources["phoron"] / G.perunit) if(src.resources["silver"] >= 2000) var/obj/item/stack/sheet/mineral/silver/G = new /obj/item/stack/sheet/mineral/silver(src.loc) G.amount = round(src.resources["silver"] / G.perunit) @@ -767,8 +767,8 @@ material = "silver" if(/obj/item/stack/sheet/mineral/diamond) material = "diamond" - if(/obj/item/stack/sheet/mineral/plasma) - material = "plasma" + if(/obj/item/stack/sheet/mineral/phoron) + material = "phoron" if(/obj/item/stack/sheet/metal) material = "metal" if(/obj/item/stack/sheet/glass) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 2db25119fb..5a8972ee4a 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -292,42 +292,42 @@ name="Phazon Torso" icon_state = "phazon_harness" construction_time = 300 - construction_cost = list("metal"=35000,"glass"=10000,"plasma"=20000) + construction_cost = list("metal"=35000,"glass"=10000,"phoron"=20000) origin_tech = "programming=5;materials=7;bluespace=6;powerstorage=6" /obj/item/mecha_parts/part/phazon_head name="Phazon Head" icon_state = "phazon_head" construction_time = 200 - construction_cost = list("metal"=15000,"glass"=5000,"plasma"=10000) + construction_cost = list("metal"=15000,"glass"=5000,"phoron"=10000) origin_tech = "programming=4;materials=5;magnets=6" /obj/item/mecha_parts/part/phazon_left_arm name="Phazon Left Arm" icon_state = "phazon_l_arm" construction_time = 200 - construction_cost = list("metal"=20000,"plasma"=10000) + construction_cost = list("metal"=20000,"phoron"=10000) origin_tech = "materials=5;bluespace=2;magnets=2" /obj/item/mecha_parts/part/phazon_right_arm name="Phazon Right Arm" icon_state = "phazon_r_arm" construction_time = 200 - construction_cost = list("metal"=20000,"plasma"=10000) + construction_cost = list("metal"=20000,"phoron"=10000) origin_tech = "materials=5;bluespace=2;magnets=2" /obj/item/mecha_parts/part/phazon_left_leg name="Phazon Left Leg" icon_state = "phazon_l_leg" construction_time = 200 - construction_cost = list("metal"=20000,"plasma"=10000) + construction_cost = list("metal"=20000,"phoron"=10000) origin_tech = "materials=5;bluespace=3;magnets=3" /obj/item/mecha_parts/part/phazon_right_leg name="Phazon Right Leg" icon_state = "phazon_r_leg" construction_time = 200 - construction_cost = list("metal"=20000,"plasma"=10000) + construction_cost = list("metal"=20000,"phoron"=10000) origin_tech = "materials=5;bluespace=3;magnets=3" ///////// Odysseus diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm index 5cc3ebd3fe..31ac734c47 100644 --- a/code/game/objects/effects/decals/Cleanable/fuel.dm +++ b/code/game/objects/effects/decals/Cleanable/fuel.dm @@ -1,5 +1,5 @@ obj/effect/decal/cleanable/liquid_fuel - //Liquid fuel is used for things that used to rely on volatile fuels or plasma being contained to a couple tiles. + //Liquid fuel is used for things that used to rely on volatile fuels or phoron being contained to a couple tiles. icon = 'icons/effects/effects.dmi' icon_state = "fuel" layer = TURF_LAYER+0.2 diff --git a/code/game/objects/effects/decals/posters/bs12.dm b/code/game/objects/effects/decals/posters/bs12.dm index 3d6261fb9a..581807c8b6 100644 --- a/code/game/objects/effects/decals/posters/bs12.dm +++ b/code/game/objects/effects/decals/posters/bs12.dm @@ -52,7 +52,7 @@ /datum/poster/bay_11 icon_state="bsposter11" name = "Underwater Laboratory" - desc = "This particular one is of the fabled last crew of Nanotrasen's previous project before going big on plasma research." + desc = "This particular one is of the fabled last crew of Nanotrasen's previous project before going big on phoron research." /datum/poster/bay_12 icon_state="bsposter12" diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 68716f3eb9..8890a46dfe 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -63,7 +63,7 @@ spawn(0) del(src) -/obj/effect/mine/proc/triggerplasma(obj) +/obj/effect/mine/proc/triggerphoron(obj) for (var/turf/simulated/floor/target in range(1,src)) if(!target.blocks_air) @@ -96,10 +96,10 @@ icon_state = "uglymine" triggerproc = "triggerrad" -/obj/effect/mine/plasma +/obj/effect/mine/phoron name = "Phoron Mine" icon_state = "uglymine" - triggerproc = "triggerplasma" + triggerproc = "triggerphoron" /obj/effect/mine/kick name = "Kick Mine" diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index 8025b270e2..dfc594e383 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -30,7 +30,7 @@ // radio if (0) var/obj/item/assembly/r_i_ptank/R = new /obj/item/assembly/r_i_ptank(src.loc) - var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R) + var/obj/item/weapon/tank/phoron/p3 = new /obj/item/weapon/tank/phoron(R) var/obj/item/device/radio/signaler/p1 = new /obj/item/device/radio/signaler(R) var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R) R.part1 = p1 @@ -47,7 +47,7 @@ // proximity if (1) var/obj/item/assembly/m_i_ptank/R = new /obj/item/assembly/m_i_ptank(src.loc) - var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R) + var/obj/item/weapon/tank/phoron/p3 = new /obj/item/weapon/tank/phoron(R) var/obj/item/device/prox_sensor/p1 = new /obj/item/device/prox_sensor(R) var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R) R.part1 = p1 @@ -69,7 +69,7 @@ // timer if (2) var/obj/item/assembly/t_i_ptank/R = new /obj/item/assembly/t_i_ptank(src.loc) - var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R) + var/obj/item/weapon/tank/phoron/p3 = new /obj/item/weapon/tank/phoron(R) var/obj/item/device/timer/p1 = new /obj/item/device/timer(R) var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R) R.part1 = p1 @@ -85,7 +85,7 @@ //bombvest if(3) var/obj/item/clothing/suit/armor/a_i_a_ptank/R = new /obj/item/clothing/suit/armor/a_i_a_ptank(src.loc) - var/obj/item/weapon/tank/plasma/p4 = new /obj/item/weapon/tank/plasma(R) + var/obj/item/weapon/tank/phoron/p4 = new /obj/item/weapon/tank/phoron(R) var/obj/item/device/healthanalyzer/p1 = new /obj/item/device/healthanalyzer(R) var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R) var/obj/item/clothing/suit/armor/vest/p3 = new /obj/item/clothing/suit/armor/vest(R) @@ -127,7 +127,7 @@ ..() var/obj/item/device/transfer_valve/V = new(src.loc) - var/obj/item/weapon/tank/plasma/PT = new(V) + var/obj/item/weapon/tank/phoron/PT = new(V) var/obj/item/weapon/tank/oxygen/OT = new(V) V.tank_one = PT diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 55eac2f4e7..f412e9361f 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -446,14 +446,14 @@ var/global/list/obj/item/device/pda/PDAs = list() var/o2_level = environment.oxygen/total_moles var/n2_level = environment.nitrogen/total_moles var/co2_level = environment.carbon_dioxide/total_moles - var/plasma_level = environment.toxins/total_moles - var/unknown_level = 1-(o2_level+n2_level+co2_level+plasma_level) + var/phoron_level = environment.toxins/total_moles + var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level) data["aircontents"] = list(\ "pressure" = "[round(pressure,0.1)]",\ "nitrogen" = "[round(n2_level*100,0.1)]",\ "oxygen" = "[round(o2_level*100,0.1)]",\ "carbon_dioxide" = "[round(co2_level*100,0.1)]",\ - "plasma" = "[round(plasma_level*100,0.01)]",\ + "phoron" = "[round(phoron_level*100,0.01)]",\ "other" = "[round(unknown_level, 0.01)]",\ "temp" = "[round(environment.temperature-T0C,0.1)]",\ "reading" = 1\ @@ -1165,15 +1165,15 @@ var/global/list/obj/item/device/pda/PDAs = list() var/o2_concentration = A:air_contents.oxygen/total_moles var/n2_concentration = A:air_contents.nitrogen/total_moles var/co2_concentration = A:air_contents.carbon_dioxide/total_moles - var/plasma_concentration = A:air_contents.toxins/total_moles + var/phoron_concentration = A:air_contents.toxins/total_moles - var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) + var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+phoron_concentration) user << "\blue Pressure: [round(pressure,0.1)] kPa" user << "\blue Nitrogen: [round(n2_concentration*100)]%" user << "\blue Oxygen: [round(o2_concentration*100)]%" user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Phoron: [round(plasma_concentration*100)]%" + user << "\blue Phoron: [round(phoron_concentration*100)]%" if(unknown_concentration>0.01) user << "\red Unknown: [round(unknown_concentration*100)]%" user << "\blue Temperature: [round(A:air_contents.temperature-T0C)]°C" @@ -1194,15 +1194,15 @@ var/global/list/obj/item/device/pda/PDAs = list() var/o2_concentration = T.parent.air.oxygen/total_moles var/n2_concentration = T.parent.air.nitrogen/total_moles var/co2_concentration = T.parent.air.carbon_dioxide/total_moles - var/plasma_concentration = T.parent.air.toxins/total_moles + var/phoron_concentration = T.parent.air.toxins/total_moles - var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) + var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+phoron_concentration) user << "\blue Pressure: [round(pressure,0.1)] kPa" user << "\blue Nitrogen: [round(n2_concentration*100)]%" user << "\blue Oxygen: [round(o2_concentration*100)]%" user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Phoron: [round(plasma_concentration*100)]%" + user << "\blue Phoron: [round(phoron_concentration*100)]%" if(unknown_concentration>0.01) user << "\red Unknown: [round(unknown_concentration*100)]%" user << "\blue Temperature: [round(T.parent.air.temperature-T0C)]°C" diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 569b513823..d1919564c4 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -238,9 +238,9 @@ REAGENT SCANNER var/o2_concentration = environment.oxygen/total_moles var/n2_concentration = environment.nitrogen/total_moles var/co2_concentration = environment.carbon_dioxide/total_moles - var/plasma_concentration = environment.toxins/total_moles + var/phoron_concentration = environment.toxins/total_moles - var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) + var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+phoron_concentration) if(abs(n2_concentration - N2STANDARD) < 20) user.show_message("\blue Nitrogen: [round(n2_concentration*100)]%", 1) else @@ -256,8 +256,8 @@ REAGENT SCANNER else user.show_message("\blue CO2: [round(co2_concentration*100)]%", 1) - if(plasma_concentration > 0.01) - user.show_message("\red Phoron: [round(plasma_concentration*100)]%", 1) + if(phoron_concentration > 0.01) + user.show_message("\red Phoron: [round(phoron_concentration*100)]%", 1) if(unknown_concentration > 0.01) user.show_message("\red Unknown: [round(unknown_concentration*100)]%", 1) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 4c142b841f..c2aca6807e 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -133,7 +133,7 @@ /obj/item/borg/upgrade/jetpack name = "mining robot jetpack" desc = "A carbon dioxide jetpack suitable for low-gravity mining operations." - construction_cost = list("metal"=10000,"plasma"=15000,"uranium" = 20000) + construction_cost = list("metal"=10000,"phoron"=15000,"uranium" = 20000) icon_state = "cyborg_upgrade3" require_module = 1 diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 0e5e34f346..4211a6de14 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -302,23 +302,23 @@ /* * Phoron Glass sheets */ -/obj/item/stack/sheet/glass/plasmaglass - name = "plasma glass" - desc = "A very strong and very resistant sheet of a plasma-glass alloy." - singular_name = "plasma glass sheet" - icon_state = "sheet-plasmaglass" +/obj/item/stack/sheet/glass/phoronglass + name = "phoron glass" + desc = "A very strong and very resistant sheet of a phoron-glass alloy." + singular_name = "phoron glass sheet" + icon_state = "sheet-phoronglass" g_amt = 7500 - origin_tech = "materials=3;plasma=2" - created_window = /obj/structure/window/plasmabasic + origin_tech = "materials=3;phoron=2" + created_window = /obj/structure/window/phoronbasic -/obj/item/stack/sheet/glass/plasmaglass/attack_self(mob/user as mob) +/obj/item/stack/sheet/glass/phoronglass/attack_self(mob/user as mob) construct_window(user) -/obj/item/stack/sheet/glass/plasmaglass/attackby(obj/item/W, mob/user) +/obj/item/stack/sheet/glass/phoronglass/attackby(obj/item/W, mob/user) ..() if( istype(W, /obj/item/stack/rods) ) var/obj/item/stack/rods/V = W - var/obj/item/stack/sheet/glass/plasmarglass/RG = new (user.loc) + var/obj/item/stack/sheet/glass/phoronrglass/RG = new (user.loc) RG.add_fingerprint(user) RG.add_to_stacks(user) V.use(1) @@ -332,17 +332,17 @@ return ..() /* - * Reinforced plasma glass sheets + * Reinforced phoron glass sheets */ -/obj/item/stack/sheet/glass/plasmarglass - name = "reinforced plasma glass" +/obj/item/stack/sheet/glass/phoronrglass + name = "reinforced phoron glass" desc = "Phoron glass which seems to have rods or something stuck in them." - singular_name = "reinforced plasma glass sheet" - icon_state = "sheet-plasmarglass" + singular_name = "reinforced phoron glass sheet" + icon_state = "sheet-phoronrglass" g_amt = 7500 m_amt = 1875 - origin_tech = "materials=4;plasma=2" - created_window = /obj/structure/window/plasmareinforced + origin_tech = "materials=4;phoron=2" + created_window = /obj/structure/window/phoronreinforced -/obj/item/stack/sheet/glass/plasmarglass/attack_self(mob/user as mob) +/obj/item/stack/sheet/glass/phoronrglass/attack_self(mob/user as mob) construct_window(user) \ No newline at end of file diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 90f97fd483..630617cf59 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -92,24 +92,24 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \ /* * Phoron */ -/obj/item/stack/sheet/mineral/plasma - name = "solid plasma" - icon_state = "sheet-plasma" +/obj/item/stack/sheet/mineral/phoron + name = "solid phoron" + icon_state = "sheet-phoron" force = 5.0 throwforce = 5 w_class = 3.0 throw_speed = 3 throw_range = 3 - origin_tech = "plasmatech=2;materials=2" + origin_tech = "phorontech=2;materials=2" perunit = 2000 - sheettype = "plasma" + sheettype = "phoron" -var/global/list/datum/stack_recipe/plasma_recipes = list ( \ - new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \ +var/global/list/datum/stack_recipe/phoron_recipes = list ( \ + new/datum/stack_recipe("phoron door", /obj/structure/mineral_door/transparent/phoron, 10, one_per_turf = 1, on_floor = 1), \ ) -/obj/item/stack/sheet/mineral/plasma/New(var/loc, var/amount=null) - recipes = plasma_recipes +/obj/item/stack/sheet/mineral/phoron/New(var/loc, var/amount=null) + recipes = phoron_recipes pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 ..() diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 14bad64262..4c13f7ceeb 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -108,7 +108,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ /obj/item/stack/sheet/plasteel name = "plasteel" singular_name = "plasteel sheet" - desc = "This sheet is an alloy of iron and plasma." + desc = "This sheet is an alloy of iron and phoron." icon_state = "sheet-plasteel" item_state = "sheet-metal" m_amt = 7500 diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index a08d856b68..070e296412 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -136,9 +136,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!src.lit) src.lit = 1 damtype = "fire" - if(reagents.get_reagent_amount("plasma")) // the plasma explodes when exposed to fire + if(reagents.get_reagent_amount("phoron")) // the phoron explodes when exposed to fire var/datum/effect/effect/system/reagents_explosion/e = new() - e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0) + e.set_up(round(reagents.get_reagent_amount("phoron") / 2.5, 1), get_turf(src), 0, 0) e.start() del(src) return diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 2e8e087ad5..71abde08a8 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -11,7 +11,7 @@ throw_range = 5 w_class = 3.0 m_amt = 500 - origin_tech = "combat=1;plasmatech=1" + origin_tech = "combat=1;phorontech=1" var/status = 0 var/throw_amount = 100 var/lit = 0 //on or off @@ -19,7 +19,7 @@ var/turf/previousturf = null var/obj/item/weapon/weldingtool/weldtool = null var/obj/item/device/assembly/igniter/igniter = null - var/obj/item/weapon/tank/plasma/ptank = null + var/obj/item/weapon/tank/phoron/ptank = null /obj/item/weapon/flamethrower/Del() @@ -102,9 +102,9 @@ update_icon() return - if(istype(W,/obj/item/weapon/tank/plasma)) + if(istype(W,/obj/item/weapon/tank/phoron)) if(ptank) - user << "There appears to already be a plasma tank loaded in [src]!" + user << "There appears to already be a phoron tank loaded in [src]!" return user.drop_item() ptank = W @@ -123,15 +123,15 @@ var/o2_concentration = ptank.air_contents.oxygen/total_moles var/n2_concentration = ptank.air_contents.nitrogen/total_moles var/co2_concentration = ptank.air_contents.carbon_dioxide/total_moles - var/plasma_concentration = ptank.air_contents.toxins/total_moles + var/phoron_concentration = ptank.air_contents.toxins/total_moles - var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) + var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+phoron_concentration) user << "\blue Pressure: [round(pressure,0.1)] kPa" user << "\blue Nitrogen: [round(n2_concentration*100)]%" user << "\blue Oxygen: [round(o2_concentration*100)]%" user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Phoron: [round(plasma_concentration*100)]%" + user << "\blue Phoron: [round(phoron_concentration*100)]%" if(unknown_concentration>0.01) user << "\red Unknown: [round(unknown_concentration*100)]%" user << "\blue Temperature: [round(ptank.air_contents.temperature-T0C)]°C" @@ -146,9 +146,9 @@ if(user.stat || user.restrained() || user.lying) return user.set_machine(src) if(!ptank) - user << "Attach a plasma tank first!" + user << "Attach a phoron tank first!" return - var/dat = text("Flamethrower ([lit ? "Lit" : "Unlit"])
\n Tank Pressure: [ptank.air_contents.return_pressure()]
\nAmount to throw: - - - [throw_amount] + + +
\nRemove plasmatank - Close") + var/dat = text("Flamethrower ([lit ? "Lit" : "Unlit"])
\n Tank Pressure: [ptank.air_contents.return_pressure()]
\nAmount to throw: - - - [throw_amount] + + +
\nRemove phorontank - Close") user << browse(dat, "window=flamethrower;size=600x300") onclose(user, "flamethrower") return diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 2f24667049..ffc49ac899 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -213,7 +213,7 @@ B1.reagents.add_reagent("aluminum", 15) B1.reagents.add_reagent("fuel",20) - B2.reagents.add_reagent("plasma", 15) + B2.reagents.add_reagent("phoron", 15) B2.reagents.add_reagent("sacid", 15) B1.reagents.add_reagent("fuel",20) diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 0f24c403cd..d2cb7f4493 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -87,7 +87,7 @@
Notes on starting the basic function mode, dubbed .Heat-Primary Mode..


- 1. Prepare collector arrays. This is done standard to any text on their function by wrenching them down, filling six plasma tanks with a plasma canister, and inserting the tank into the collectors one by one. Finally, initialize each collector.

+ 1. Prepare collector arrays. This is done standard to any text on their function by wrenching them down, filling six phoron tanks with a phoron canister, and inserting the tank into the collectors one by one. Finally, initialize each collector.

2. Prepare gas system. Before introducing any gas to the Supermatter engine room, it is important to remember the small but vital steps to preparing this section. First, set the input gas pump and output gas flow pump to 4500, or maximum flow. Second, switch the digital switching valve into the .up. position, in order to circulate the gas back toward the coolers and collectors.

@@ -111,11 +111,11 @@ Additionally, this mode can be used for what is called a .Cold Start.. If the station has no power in the SMES to run the emitters, using this mode will allow enough power output to run them, and quickly reach an acceptable level of power output.

- 1. Prepare collector arrays. This is done standard to any text on their function by wrenching them down, filling six plasma tanks with a plasma canister, and inserting the tank into the collectors one by one. Finally, initialize each collector.

+ 1. Prepare collector arrays. This is done standard to any text on their function by wrenching them down, filling six phoron tanks with a phoron canister, and inserting the tank into the collectors one by one. Finally, initialize each collector.

2. Prepare gas system. Before introducing any gas to the Supermatter engine room, it is important to remember the small but vital steps to preparing this section. First, set the input gas pump and output gas flow pump to 4500, or maximum flow. Second, switch the digital switching valve into the .up. position, in order to circulate the gas back toward the coolers and collectors.

- 3. Modify the engine room filters. Unlike the Heat-Primary Mode, it is important to change the filters attached to the gas system to stop filtering O2, and start filtering Carbon Molecules. O2-Reaction Mode produces far more plasma than Heat-Primary, therefor filtering it off is essential.

+ 3. Modify the engine room filters. Unlike the Heat-Primary Mode, it is important to change the filters attached to the gas system to stop filtering O2, and start filtering Carbon Molecules. O2-Reaction Mode produces far more phoron than Heat-Primary, therefor filtering it off is essential.

4. Switch SMES units to primary settings. Maximize input and set the devices to automatically charge, additionally turn their outputs on if they are off unless power is to be saved (Which can be useful in case of later failures.) If you check the power in the system lines at this point you will find that it is constantly going up. Indeed, with just the addition of O2 to the Supermatter, it will begin outputting power.

@@ -131,18 +131,18 @@ *Radiation (which is converted into power by the collectors,)
*Heat (which is removed via the gas exchange system and coolers,)
- *External gas (in the form of plasma and O2.)
+ *External gas (in the form of phoron and O2.)
- When in Heat-Primary mode, far more heat and plasma are produced than radiation. In O2-Reaction mode, very little heat and only moderate amounts of plasma are produced, however HUGE amounts of energy leaving the Supermatter is in the form of radiation.

+ When in Heat-Primary mode, far more heat and phoron are produced than radiation. In O2-Reaction mode, very little heat and only moderate amounts of phoron are produced, however HUGE amounts of energy leaving the Supermatter is in the form of radiation.

- The O2-Reaction engine mode has a single drawback which has been eluded to more than once so far and that is very simple. The engine room will continue to grow hotter as the constant reaction continues. Eventually, there will be what he calls the .critical gas mix.. This is the point at which the constant adding of plasma to the mix of air around the Supermatter changes the gas concentration to below the tolerance. When this happens, two things occur. First, the Supermatter switches to its primary mode of operation where in huge amounts of heat are produced by the engine rather than low amounts with high power output. Second, an uncontrollable increase in heat within the Supermatter chamber will occur. This will lead to a spark-up, igniting the plasma in the Supermatter chamber, wildly increasing both pressure and temperature.

+ The O2-Reaction engine mode has a single drawback which has been eluded to more than once so far and that is very simple. The engine room will continue to grow hotter as the constant reaction continues. Eventually, there will be what he calls the .critical gas mix.. This is the point at which the constant adding of phoron to the mix of air around the Supermatter changes the gas concentration to below the tolerance. When this happens, two things occur. First, the Supermatter switches to its primary mode of operation where in huge amounts of heat are produced by the engine rather than low amounts with high power output. Second, an uncontrollable increase in heat within the Supermatter chamber will occur. This will lead to a spark-up, igniting the phoron in the Supermatter chamber, wildly increasing both pressure and temperature.

While the O2-Reaction mode is dangerous, it does produce heavy amounts of energy. Consider using this mode only in short amounts to fill the SMES, and switch back later in the shift to keep things flowing normally.

Notes on Supermatter Containment and Emergency Procedures-

- While a constant vigil on the Supermatter is not required, regular checkups are important. Verify the temp of gas leaving the Supermatter chamber for unsafe levels, and ensure that the plasma in the chamber is at a safe concentration. Of course, also make sure the chamber is not on fire. A fire in the core chamber is very difficult to put out. As any Toxin scientist can tell you, even low amounts of plasma can burn at very high temperatures. This burning creates a huge increase in pressure and more importantly, temperature of the crystal itself.

+ While a constant vigil on the Supermatter is not required, regular checkups are important. Verify the temp of gas leaving the Supermatter chamber for unsafe levels, and ensure that the phoron in the chamber is at a safe concentration. Of course, also make sure the chamber is not on fire. A fire in the core chamber is very difficult to put out. As any Toxin scientist can tell you, even low amounts of phoron can burn at very high temperatures. This burning creates a huge increase in pressure and more importantly, temperature of the crystal itself.

The Supermatter is strong, but not invincible. When the Supermatter is heated too much, its crystal structure will attempt to liquify. The change in atomic structure of the Supermatter leads to a single reaction, a massive explosion. The computer chip attached to the Supermatter core will warn the station when stability is threatened. It will then offer a second warning, when things have become dangerously close to total destruction of the core.

@@ -470,7 +470,7 @@ This machine, along with the Protolathe, is used to actually produce new devices. The Circuit Imprinter takes glass and various chemicals (depends on the design) to produce new circuit boards to build new machines or computers. It can even be used to print AI modules.

Protolathe

- This machine is an advanced form of the Autolathe that produce non-circuit designs. Unlike the Autolathe, it can use processed metal, glass, solid plasma, silver, gold, and diamonds along with a variety of chemicals to produce devices. + This machine is an advanced form of the Autolathe that produce non-circuit designs. Unlike the Autolathe, it can use processed metal, glass, solid phoron, silver, gold, and diamonds along with a variety of chemicals to produce devices. The downside is that, again, not all devices you make are 100% reliable when you first discover them.

Reliability and You

diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 1ee12faf0f..9fb8610413 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -104,7 +104,7 @@ /obj/item/weapon/cell/slime name = "charged slime core" - desc = "A yellow slime core infused with plasma, it crackles with power." + desc = "A yellow slime core infused with phoron, it crackles with power." origin_tech = "powerstorage=2;biotech=4" icon = 'icons/mob/slimes.dmi' //'icons/obj/harvest.dmi' icon_state = "yellow slime extract" //"potato_battery" diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 0591d077ec..2f6e527458 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -94,15 +94,15 @@ /* * Phoron */ -/obj/item/weapon/tank/plasma - name = "plasma tank" - desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable." - icon_state = "plasma" +/obj/item/weapon/tank/phoron + name = "phoron tank" + desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." + icon_state = "phoron" flags = FPRINT | TABLEPASS | CONDUCT slot_flags = null //they have no straps! -/obj/item/weapon/tank/plasma/New() +/obj/item/weapon/tank/phoron/New() ..() src.air_contents.toxins = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) @@ -110,7 +110,7 @@ src.air_contents.update_values() return -/obj/item/weapon/tank/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/weapon/tank/phoron/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if (istype(W, /obj/item/weapon/flamethrower)) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 9badcc71fe..264d2c6a56 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -97,15 +97,15 @@ var/o2_concentration = air_contents.oxygen/total_moles var/n2_concentration = air_contents.nitrogen/total_moles var/co2_concentration = air_contents.carbon_dioxide/total_moles - var/plasma_concentration = air_contents.toxins/total_moles + var/phoron_concentration = air_contents.toxins/total_moles - var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) + var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+phoron_concentration) user << "\blue Pressure: [round(pressure,0.1)] kPa" user << "\blue Nitrogen: [round(n2_concentration*100)]%" user << "\blue Oxygen: [round(o2_concentration*100)]%" user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Phoron: [round(plasma_concentration*100)]%" + user << "\blue Phoron: [round(phoron_concentration*100)]%" if(unknown_concentration>0.01) user << "\red Unknown: [round(unknown_concentration*100)]%" user << "\blue Temperature: [round(air_contents.temperature-T0C)]°C" diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 3655effb9e..6c308caf99 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -411,7 +411,7 @@ w_class = 3.0 m_amt = 70 g_amt = 120 - origin_tech = "engineering=4;plasma=3" + origin_tech = "engineering=4;phoron=3" var/last_gen = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 8cbf52835b..6c92f3c2df 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -82,13 +82,13 @@ if(pickednum >= 5) new /obj/item/stack/sheet/glass(src, rand(common_min, common_max)) - //Plasteel (common ore) Because it has a million more uses then plasma + //Plasteel (common ore) Because it has a million more uses then phoron if(pickednum >= 10) new /obj/item/stack/sheet/plasteel(src, rand(common_min, common_max)) //Phoron (rare ore) if(pickednum >= 15) - new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max)) + new /obj/item/stack/sheet/mineral/phoron(src, rand(rare_min, rare_max)) //Silver (rare ore) if(pickednum >= 20) @@ -121,7 +121,7 @@ /obj/item/stack/sheet/glass, /obj/item/stack/sheet/mineral/gold, /obj/item/stack/sheet/mineral/silver, - /obj/item/stack/sheet/mineral/plasma, + /obj/item/stack/sheet/mineral/phoron, /obj/item/stack/sheet/mineral/uranium, /obj/item/stack/sheet/mineral/diamond, /obj/item/stack/sheet/mineral/clown, diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 331c825a9f..ac71a69203 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -375,12 +375,12 @@ icon_opened = "weaponcrateopen" icon_closed = "weaponcrate" -/obj/structure/closet/crate/secure/plasma - desc = "A secure plasma crate." +/obj/structure/closet/crate/secure/phoron + desc = "A secure phoron crate." name = "Phoron crate" - icon_state = "plasmacrate" - icon_opened = "plasmacrateopen" - icon_closed = "plasmacrate" + icon_state = "phoroncrate" + icon_opened = "phoroncrateopen" + icon_closed = "phoroncrate" /obj/structure/closet/crate/secure/gear desc = "A secure gear crate." diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index b49820dc54..0d496b47cd 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -107,7 +107,7 @@ T.ChangeTurf(/turf/simulated/wall) else T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]")) - if(mineral != "plasma")//Stupid shit keeps me from pushing the attackby() to plasma walls -Sieve + if(mineral != "phoron")//Stupid shit keeps me from pushing the attackby() to phoron walls -Sieve T = get_turf(src) T.attackby(W,user) del(src) @@ -120,7 +120,7 @@ T.ChangeTurf(/turf/simulated/wall) else T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]")) - if(mineral != "plasma") + if(mineral != "phoron") T = get_turf(src) T.attackby(W,user) del(src) @@ -142,7 +142,7 @@ T.ChangeTurf(/turf/simulated/wall) else T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]")) - if(mineral != "plasma") + if(mineral != "phoron") T = get_turf(src) T.attackby(W,user) del(src) @@ -320,11 +320,11 @@ icon_state = "" mineral = "diamond" -/obj/structure/falsewall/plasma - name = "plasma wall" - desc = "A wall with plasma plating. This is definately a bad idea." +/obj/structure/falsewall/phoron + name = "phoron wall" + desc = "A wall with phoron plating. This is definately a bad idea." icon_state = "" - mineral = "plasma" + mineral = "phoron" //-----------wtf?-----------start /obj/structure/falsewall/clown diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 3cdc4765e6..24f479e33b 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -188,8 +188,8 @@ ..() opacity = 0 -/obj/structure/mineral_door/transparent/plasma - mineralType = "plasma" +/obj/structure/mineral_door/transparent/phoron + mineralType = "phoron" attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/weapon/weldingtool)) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 66925627f5..f22735bf15 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -1,20 +1,20 @@ /obj/structure/dispenser name = "tank storage unit" - desc = "A simple yet bulky storage device for gas tanks. Has room for up to ten oxygen tanks, and ten plasma tanks." + desc = "A simple yet bulky storage device for gas tanks. Has room for up to ten oxygen tanks, and ten phoron tanks." icon = 'icons/obj/objects.dmi' icon_state = "dispenser" density = 1 anchored = 1.0 var/oxygentanks = 10 - var/plasmatanks = 10 + var/phorontanks = 10 var/list/oxytanks = list() //sorry for the similar var names var/list/platanks = list() /obj/structure/dispenser/oxygen - plasmatanks = 0 + phorontanks = 0 -/obj/structure/dispenser/plasma +/obj/structure/dispenser/phoron oxygentanks = 0 @@ -27,16 +27,16 @@ switch(oxygentanks) if(1 to 3) overlays += "oxygen-[oxygentanks]" if(4 to INFINITY) overlays += "oxygen-4" - switch(plasmatanks) - if(1 to 4) overlays += "plasma-[plasmatanks]" - if(5 to INFINITY) overlays += "plasma-5" + switch(phorontanks) + if(1 to 4) overlays += "phoron-[phorontanks]" + if(5 to INFINITY) overlays += "phoron-5" /obj/structure/dispenser/attack_hand(mob/user as mob) user.set_machine(src) var/dat = "[src]

" dat += "Oxygen tanks: [oxygentanks] - [oxygentanks ? "Dispense" : "empty"]
" - dat += "Phoron tanks: [plasmatanks] - [plasmatanks ? "Dispense" : "empty"]" + dat += "Phoron tanks: [phorontanks] - [phorontanks ? "Dispense" : "empty"]" user << browse(dat, "window=dispenser") onclose(user, "dispenser") return @@ -54,12 +54,12 @@ user << "[src] is full." updateUsrDialog() return - if(istype(I, /obj/item/weapon/tank/plasma)) - if(plasmatanks < 10) + if(istype(I, /obj/item/weapon/tank/phoron)) + if(phorontanks < 10) user.drop_item() I.loc = src platanks.Add(I) - plasmatanks++ + phorontanks++ user << "You put [I] in [src]." else user << "[src] is full." @@ -91,17 +91,17 @@ usr << "You take [O] out of [src]." oxygentanks-- update_icon() - if(href_list["plasma"]) - if(plasmatanks > 0) - var/obj/item/weapon/tank/plasma/P - if(platanks.len == plasmatanks) + if(href_list["phoron"]) + if(phorontanks > 0) + var/obj/item/weapon/tank/phoron/P + if(platanks.len == phorontanks) P = platanks[1] platanks.Remove(P) else - P = new /obj/item/weapon/tank/plasma(loc) + P = new /obj/item/weapon/tank/phoron(loc) P.loc = loc usr << "You take [P] out of [src]." - plasmatanks-- + phorontanks-- update_icon() add_fingerprint(usr) updateUsrDialog() diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 7050808fb4..6f4cf813fd 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -368,29 +368,29 @@ icon_state = "window" basestate = "window" -/obj/structure/window/plasmabasic - name = "plasma window" - desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through." - basestate = "plasmawindow" - icon_state = "plasmawindow" - shardtype = /obj/item/weapon/shard/plasma +/obj/structure/window/phoronbasic + name = "phoron window" + desc = "A phoron-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through." + basestate = "phoronwindow" + icon_state = "phoronwindow" + shardtype = /obj/item/weapon/shard/phoron health = 120 -/obj/structure/window/plasmabasic/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/structure/window/phoronbasic/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > T0C + 32000) hit(round(exposed_volume / 1000), 0) ..() -/obj/structure/window/plasmareinforced - name = "reinforced plasma window" - desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof." - basestate = "plasmarwindow" - icon_state = "plasmarwindow" - shardtype = /obj/item/weapon/shard/plasma +/obj/structure/window/phoronreinforced + name = "reinforced phoron window" + desc = "A phoron-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic phoron windows are insanely fireproof." + basestate = "phoronrwindow" + icon_state = "phoronrwindow" + shardtype = /obj/item/weapon/shard/phoron reinf = 1 health = 160 -/obj/structure/window/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/structure/window/phoronreinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) return /obj/structure/window/reinforced diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index f28b649ba7..bb6b66f4d9 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -134,7 +134,7 @@ var/list/mechtoys = list( var/points_per_process = 1 var/points_per_slip = 2 var/points_per_crate = 5 - var/plasma_per_point = 2 // 2 plasma for 1 point + var/phoron_per_point = 2 // 2 phoron for 1 point //control var/ordernum var/list/shoppinglist = list() @@ -234,7 +234,7 @@ var/list/mechtoys = list( var/area/shuttle = locate(shuttle_at) if(!shuttle) return - var/plasma_count = 0 + var/phoron_count = 0 for(var/atom/movable/MA in shuttle) if(MA.anchored) continue @@ -254,14 +254,14 @@ var/list/mechtoys = list( find_slip = 0 continue - // Sell plasma - if(istype(A, /obj/item/stack/sheet/mineral/plasma)) - var/obj/item/stack/sheet/mineral/plasma/P = A - plasma_count += P.amount + // Sell phoron + if(istype(A, /obj/item/stack/sheet/mineral/phoron)) + var/obj/item/stack/sheet/mineral/phoron/P = A + phoron_count += P.amount del(MA) - if(plasma_count) - points += Floor(plasma_count / plasma_per_point) + if(phoron_count) + points += Floor(phoron_count / phoron_per_point) //Buyin proc/buy() diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 7d0db5184e..7a1aba19d7 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -76,20 +76,20 @@ radiate() ..() -/turf/simulated/wall/mineral/plasma - name = "plasma wall" - desc = "A wall with plasma plating. This is definately a bad idea." - icon_state = "plasma0" - walltype = "plasma" - mineral = "plasma" +/turf/simulated/wall/mineral/phoron + name = "phoron wall" + desc = "A wall with phoron plating. This is definately a bad idea." + icon_state = "phoron0" + walltype = "phoron" + mineral = "phoron" -/turf/simulated/wall/mineral/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob) +/turf/simulated/wall/mineral/phoron/attackby(obj/item/weapon/W as obj, mob/user as mob) if(is_hot(W) > 300)//If the temperature of the object is over 300, then ignite ignite(is_hot(W)) return ..() -/turf/simulated/wall/mineral/plasma/proc/PhoronBurn(temperature) +/turf/simulated/wall/mineral/phoron/proc/PhoronBurn(temperature) spawn(2) new /obj/structure/girder(src) src.ChangeTurf(/turf/simulated/floor) @@ -102,24 +102,24 @@ napalm.temperature = 400+T0C target_tile.assume_air(napalm) spawn (0) target_tile.hotspot_expose(temperature, 400) - for(var/obj/structure/falsewall/plasma/F in range(3,src))//Hackish as fuck, but until temperature_expose works, there is nothing I can do -Sieve + for(var/obj/structure/falsewall/phoron/F in range(3,src))//Hackish as fuck, but until temperature_expose works, there is nothing I can do -Sieve var/turf/T = get_turf(F) - T.ChangeTurf(/turf/simulated/wall/mineral/plasma/) + T.ChangeTurf(/turf/simulated/wall/mineral/phoron/) del (F) - for(var/turf/simulated/wall/mineral/plasma/W in range(3,src)) + for(var/turf/simulated/wall/mineral/phoron/W in range(3,src)) W.ignite((temperature/4))//Added so that you can't set off a massive chain reaction with a small flame - for(var/obj/machinery/door/airlock/plasma/D in range(3,src)) + for(var/obj/machinery/door/airlock/phoron/D in range(3,src)) D.ignite(temperature/4) -/turf/simulated/wall/mineral/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)//Doesn't fucking work because walls don't interact with air :( +/turf/simulated/wall/mineral/phoron/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)//Doesn't fucking work because walls don't interact with air :( if(exposed_temperature > 300) PhoronBurn(exposed_temperature) -/turf/simulated/wall/mineral/plasma/proc/ignite(exposed_temperature) +/turf/simulated/wall/mineral/phoron/proc/ignite(exposed_temperature) if(exposed_temperature > 300) PhoronBurn(exposed_temperature) -/turf/simulated/wall/mineral/plasma/bullet_act(var/obj/item/projectile/Proj) +/turf/simulated/wall/mineral/phoron/bullet_act(var/obj/item/projectile/Proj) if(istype(Proj,/obj/item/projectile/beam)) PhoronBurn(2500) else if(istype(Proj,/obj/item/projectile/ion)) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 837ab0ad0f..ca6e4e48b8 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -563,7 +563,7 @@ var/global/floorIsLava = 0 Create Turf
Create Mob

Edit Airflow Settings
- Edit Phoron Settings
+ Edit Phoron Settings
Choose a default ZAS setting
"} @@ -961,7 +961,7 @@ var/global/floorIsLava = 0 /datum/admins/proc/get_sab_desc(var/target) switch(target) if(1) - return "Destroy at least 70% of the plasma canisters on the station" + return "Destroy at least 70% of the phoron canisters on the station" if(2) return "Destroy the AI" if(3) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 0754c39fc9..87588e97e8 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2599,7 +2599,7 @@ if(check_rights(R_ADMIN|R_SERVER)) if(href_list["vsc"] == "airflow") vsc.ChangeSettingsDialog(usr,vsc.settings) - if(href_list["vsc"] == "plasma") + if(href_list["vsc"] == "phoron") vsc.ChangeSettingsDialog(usr,vsc.plc.settings) if(href_list["vsc"] == "default") vsc.SetDefault(usr) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 5a22503bab..25b85772bf 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -955,7 +955,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that for(var/obj/machinery/power/rad_collector/Rad in world) if(Rad.anchored) if(!Rad.P) - var/obj/item/weapon/tank/plasma/Phoron = new/obj/item/weapon/tank/plasma(Rad) + var/obj/item/weapon/tank/phoron/Phoron = new/obj/item/weapon/tank/phoron(Rad) Phoron.air_contents.toxins = 70 Rad.drainratio = 0 Rad.P = Phoron diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 77c972a40d..90fb1be8e1 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -797,7 +797,7 @@ Traitors and the like can also be revived with the previous role mostly intact. feedback_add_details("admin_verb","CC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /* This proc is DEFERRED. Does not do anything. -/client/proc/cmd_admin_remove_plasma() +/client/proc/cmd_admin_remove_phoron() set category = "Debug" set name = "Stabilize Atmos." if(!holder) diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index ca04edd7a4..5efafd5996 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -9,7 +9,7 @@ flags = FPRINT | TABLEPASS| CONDUCT //Copied this from old code, so this may or may not be necessary var/status = 0 //0 - not readied //1 - bomb finished with welder var/obj/item/device/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device - var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a plasma tank + var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a phoron tank /obj/item/device/onetankbomb/examine() ..() diff --git a/code/modules/assembly/helpers.dm b/code/modules/assembly/helpers.dm index 0c8005ad0b..bfecbd8a41 100644 --- a/code/modules/assembly/helpers.dm +++ b/code/modules/assembly/helpers.dm @@ -30,7 +30,7 @@ /* Name: IsSpecialAssembly -Desc: If true is an object that can be attached to an assembly holder but is a special thing like a plasma can or door +Desc: If true is an object that can be attached to an assembly holder but is a special thing like a phoron can or door */ /obj/proc/IsSpecialAssembly() diff --git a/code/modules/economy/Events_Mundane.dm b/code/modules/economy/Events_Mundane.dm index 60f9f3bb99..97f8718d8c 100644 --- a/code/modules/economy/Events_Mundane.dm +++ b/code/modules/economy/Events_Mundane.dm @@ -22,7 +22,7 @@ newMsg.body = "" switch(event_type) if(RESEARCH_BREAKTHROUGH) - newMsg.body = "A major breakthough in the field of [pick("plasma research","super-compressed materials","nano-augmentation","bluespace research","volatile power manipulation")] \ + newMsg.body = "A major breakthough in the field of [pick("phoron research","super-compressed materials","nano-augmentation","bluespace research","volatile power manipulation")] \ was announced [pick("yesterday","a few days ago","last week","earlier this month")] by a private firm on [affected_dest.name]. \ NanoTrasen declined to comment as to whether this could impinge on profits." diff --git a/code/modules/economy/TradeDestinations.dm b/code/modules/economy/TradeDestinations.dm index 6778a1b6b1..596276006d 100644 --- a/code/modules/economy/TradeDestinations.dm +++ b/code/modules/economy/TradeDestinations.dm @@ -61,7 +61,7 @@ var/list/weighted_mundaneevent_locations = list() /datum/trade_destination/redolant/get_custom_eventstring(var/event_type) if(event_type == RESEARCH_BREAKTHROUGH) return "Thanks to research conducted on the OAV Redolant, Osiris Atmospherics wishes to announce a major breakthough in the field of \ - [pick("plasma research","high energy flux capacitance","super-compressed materials","theoretical particle physics")]. NanoTrasen is expected to announce a co-exploitation deal within the fortnight." + [pick("phoron research","high energy flux capacitance","super-compressed materials","theoretical particle physics")]. NanoTrasen is expected to announce a co-exploitation deal within the fortnight." return null /datum/trade_destination/beltway diff --git a/code/modules/economy/economy_misc.dm b/code/modules/economy/economy_misc.dm index b236c2905d..e860cca95f 100644 --- a/code/modules/economy/economy_misc.dm +++ b/code/modules/economy/economy_misc.dm @@ -47,7 +47,7 @@ #define GEAR_EVA 15 //---- The following corporations are friendly with NanoTrasen and loosely enable trade and travel: -//Corporation NanoTrasen - Generalised / high tech research and plasma exploitation. +//Corporation NanoTrasen - Generalised / high tech research and phoron exploitation. //Corporation Vessel Contracting - Ship and station construction, materials research. //Corporation Osiris Atmospherics - Atmospherics machinery construction and chemical research. //Corporation Second Red Cross Society - 26th century Red Cross reborn as a dominating economic force in biomedical science (research and materials). diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index d466ca2471..f48846c590 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -4,7 +4,7 @@ mob/living/carbon/proc/dream() "an ID card","a bottle","a familiar face","a crewmember","a toolbox","a security officer","the captain", "voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness", "light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun", - "a hat","the Luna","a ruined station","a planet","plasma","air","the medical bay","the bridge","blinking lights", + "a hat","the Luna","a ruined station","a planet","phoron","air","the medical bay","the bridge","blinking lights", "a blue light","an abandoned laboratory","Nanotrasen","The Syndicate","blood","healing","power","respect", "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money", "the head of personnel","the head of security","a chief engineer","a research director","a chief medical officer", diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 18e4f2916a..89a1cfa610 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -1,7 +1,7 @@ /* Ideas for the subtle effects of hallucination: -Light up oxygen/plasma indicators (done) +Light up oxygen/phoron indicators (done) Cause health to look critical/dead, even when standing (done) Characters silently watching you Brief flashes of fire/space/bombs/c4/dangerous shit (done) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 29b288995b..b41ff4ab16 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -39,7 +39,7 @@ var/dat = "Smelter control console

" //iron - if(machine.ore_iron || machine.ore_glass || machine.ore_plasma || machine.ore_uranium || machine.ore_gold || machine.ore_silver || machine.ore_diamond || machine.ore_clown || machine.ore_adamantine) + if(machine.ore_iron || machine.ore_glass || machine.ore_phoron || machine.ore_uranium || machine.ore_gold || machine.ore_silver || machine.ore_diamond || machine.ore_clown || machine.ore_adamantine) if(machine.ore_iron) if (machine.selected & ORE_PROC_IRON) dat += text("Smelting ") @@ -59,13 +59,13 @@ else machine.selected &= ~ORE_PROC_GLASS - //plasma - if(machine.ore_plasma) + //phoron + if(machine.ore_phoron) if (machine.selected & ORE_PROC_PHORON) - dat += text("Smelting ") + dat += text("Smelting ") else - dat += text("Not smelting ") - dat += text("Phoron: [machine.ore_plasma]
") + dat += text("Not smelting ") + dat += text("Phoron: [machine.ore_phoron]
") else machine.selected &= ~ORE_PROC_PHORON @@ -148,8 +148,8 @@ machine.selected |= ORE_PROC_GLASS else machine.selected &= ~ORE_PROC_GLASS - if(href_list["sel_plasma"]) - if (href_list["sel_plasma"] == "yes") + if(href_list["sel_phoron"]) + if (href_list["sel_phoron"] == "yes") machine.selected |= ORE_PROC_PHORON else machine.selected &= ~ORE_PROC_PHORON @@ -204,7 +204,7 @@ var/ore_silver = 0; var/ore_diamond = 0; var/ore_glass = 0; - var/ore_plasma = 0; + var/ore_phoron = 0; var/ore_uranium = 0; var/ore_iron = 0; var/ore_clown = 0; @@ -281,9 +281,9 @@ on = 0 continue if (selected == ORE_PROC_PHORON) - if (ore_plasma > 0) - ore_plasma--; - new /obj/item/stack/sheet/mineral/plasma(output.loc) + if (ore_phoron > 0) + ore_phoron--; + new /obj/item/stack/sheet/mineral/phoron(output.loc) else on = 0 continue @@ -302,9 +302,9 @@ on = 0 continue if (selected == ORE_PROC_IRON + ORE_PROC_PHORON) - if (ore_iron > 0 && ore_plasma > 0) + if (ore_iron > 0 && ore_phoron > 0) ore_iron--; - ore_plasma--; + ore_phoron--; new /obj/item/stack/sheet/plasteel(output.loc) else on = 0 @@ -346,9 +346,9 @@ on = 0 continue if (selected == ORE_PROC_SILVER + ORE_PROC_PHORON) - if (ore_silver >= 1 && ore_plasma >= 3) + if (ore_silver >= 1 && ore_phoron >= 3) ore_silver -= 1 - ore_plasma -= 3 + ore_phoron -= 3 new /obj/item/stack/sheet/mineral/mythril(output.loc) else on = 0 @@ -376,7 +376,7 @@ if (ore_uranium <= 0) b = 0 if (selected & ORE_PROC_PHORON) - if (ore_plasma <= 0) + if (ore_phoron <= 0) b = 0 if (selected & ORE_PROC_IRON) if (ore_iron <= 0) @@ -398,7 +398,7 @@ if (selected & ORE_PROC_URANIUM) ore_uranium-- if (selected & ORE_PROC_PHORON) - ore_plasma-- + ore_phoron-- if (selected & ORE_PROC_IRON) ore_iron-- if (selected & ORE_PROC_CLOWN) @@ -430,8 +430,8 @@ O.loc = null //del(O) continue - if (istype(O,/obj/item/weapon/ore/plasma)) - ore_plasma++ + if (istype(O,/obj/item/weapon/ore/phoron)) + ore_phoron++ O.loc = null //del(O) continue diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index da92cc78bb..13f3e0290d 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -40,12 +40,12 @@ dat += text("Glass: [machine.ore_glass] Release
") if(machine.ore_rglass) dat += text("Reinforced Glass: [machine.ore_rglass] Release
") - if(machine.ore_plasma) - dat += text("Phoron: [machine.ore_plasma] Release
") - if(machine.ore_plasmaglass) - dat += text("Phoron Glass: [machine.ore_plasmaglass] Release
") - if(machine.ore_plasmarglass) - dat += text("Reinforced Phoron Glass: [machine.ore_plasmarglass] Release
") + if(machine.ore_phoron) + dat += text("Phoron: [machine.ore_phoron] Release
") + if(machine.ore_phoronglass) + dat += text("Phoron Glass: [machine.ore_phoronglass] Release
") + if(machine.ore_phoronrglass) + dat += text("Reinforced Phoron Glass: [machine.ore_phoronrglass] Release
") if(machine.ore_gold) dat += text("Gold: [machine.ore_gold] Release
") if(machine.ore_silver) @@ -81,24 +81,24 @@ src.add_fingerprint(usr) if(href_list["release"]) switch(href_list["release"]) - if ("plasma") - if (machine.ore_plasma > 0) - var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma - G.amount = machine.ore_plasma + if ("phoron") + if (machine.ore_phoron > 0) + var/obj/item/stack/sheet/mineral/phoron/G = new /obj/item/stack/sheet/mineral/phoron + G.amount = machine.ore_phoron G.loc = machine.output.loc - machine.ore_plasma = 0 - if ("plasmaglass") - if (machine.ore_plasmaglass > 0) - var/obj/item/stack/sheet/glass/plasmaglass/G = new /obj/item/stack/sheet/glass/plasmaglass - G.amount = machine.ore_plasmaglass + machine.ore_phoron = 0 + if ("phoronglass") + if (machine.ore_phoronglass > 0) + var/obj/item/stack/sheet/glass/phoronglass/G = new /obj/item/stack/sheet/glass/phoronglass + G.amount = machine.ore_phoronglass G.loc = machine.output.loc - machine.ore_plasmaglass = 0 - if ("plasmarglass") - if (machine.ore_plasmarglass > 0) - var/obj/item/stack/sheet/glass/plasmarglass/G = new /obj/item/stack/sheet/glass/plasmarglass - G.amount = machine.ore_plasmarglass + machine.ore_phoronglass = 0 + if ("phoronrglass") + if (machine.ore_phoronrglass > 0) + var/obj/item/stack/sheet/glass/phoronrglass/G = new /obj/item/stack/sheet/glass/phoronrglass + G.amount = machine.ore_phoronrglass G.loc = machine.output.loc - machine.ore_plasmarglass = 0 + machine.ore_phoronrglass = 0 if ("uranium") if (machine.ore_uranium > 0) var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium @@ -210,9 +210,9 @@ var/ore_gold = 0; var/ore_silver = 0; var/ore_diamond = 0; - var/ore_plasma = 0; - var/ore_plasmaglass = 0; - var/ore_plasmarglass = 0; + var/ore_phoron = 0; + var/ore_phoronglass = 0; + var/ore_phoronrglass = 0; var/ore_iron = 0; var/ore_uranium = 0; var/ore_clown = 0; @@ -262,8 +262,8 @@ O.loc = null //del(O) continue - if (istype(O,/obj/item/stack/sheet/mineral/plasma)) - ore_plasma+= O.amount + if (istype(O,/obj/item/stack/sheet/mineral/phoron)) + ore_phoron+= O.amount O.loc = null //del(O) continue @@ -287,13 +287,13 @@ O.loc = null //del(O) continue - if (istype(O,/obj/item/stack/sheet/glass/plasmaglass)) - ore_plasmaglass+= O.amount + if (istype(O,/obj/item/stack/sheet/glass/phoronglass)) + ore_phoronglass+= O.amount O.loc = null //del(O) continue - if (istype(O,/obj/item/stack/sheet/glass/plasmarglass)) - ore_plasmarglass+= O.amount + if (istype(O,/obj/item/stack/sheet/glass/phoronrglass)) + ore_phoronrglass+= O.amount O.loc = null //del(O) continue @@ -362,11 +362,11 @@ G.loc = output.loc ore_diamond -= stack_amt return - if (ore_plasma >= stack_amt) - var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma + if (ore_phoron >= stack_amt) + var/obj/item/stack/sheet/mineral/phoron/G = new /obj/item/stack/sheet/mineral/phoron G.amount = stack_amt G.loc = output.loc - ore_plasma -= stack_amt + ore_phoron -= stack_amt return if (ore_iron >= stack_amt) var/obj/item/stack/sheet/metal/G = new /obj/item/stack/sheet/metal @@ -398,17 +398,17 @@ G.loc = output.loc ore_rglass -= stack_amt return - if (ore_plasmaglass >= stack_amt) - var/obj/item/stack/sheet/glass/plasmaglass/G = new /obj/item/stack/sheet/glass/plasmaglass + if (ore_phoronglass >= stack_amt) + var/obj/item/stack/sheet/glass/phoronglass/G = new /obj/item/stack/sheet/glass/phoronglass G.amount = stack_amt G.loc = output.loc - ore_plasmaglass -= stack_amt + ore_phoronglass -= stack_amt return - if (ore_plasmarglass >= stack_amt) - var/obj/item/stack/sheet/glass/plasmarglass/G = new /obj/item/stack/sheet/glass/plasmarglass + if (ore_phoronrglass >= stack_amt) + var/obj/item/stack/sheet/glass/phoronrglass/G = new /obj/item/stack/sheet/glass/phoronrglass G.amount = stack_amt G.loc = output.loc - ore_plasmarglass -= stack_amt + ore_phoronrglass -= stack_amt return if (ore_plasteel >= stack_amt) var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 14e07c3f8c..c200d2ff53 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -259,7 +259,7 @@ proc/move_mining_shuttle() w_class = 3.0 //it is smaller than the pickaxe damtype = "fire" digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire - origin_tech = "materials=4;plasmatech=3;engineering=3" + origin_tech = "materials=4;phorontech=3;engineering=3" desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff." drill_verb = "cutting" diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 922b114c25..7a1b6d6acf 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -349,7 +349,7 @@ var/list/artifact_spawn = list() // Runtime fix for geometry loading before cont if(6) var/quantity = rand(1,3) for(var/i=0, iChoose") - dat += text("
Phoron inserted: [amt_plasma] ") - if (chosen == "plasma") + dat += text("
Phoron inserted: [amt_phoron] ") + if (chosen == "phoron") dat += text("chosen") else - dat += text("Choose") + dat += text("Choose") dat += text("
uranium inserted: [amt_uranium] ") if (chosen == "uranium") dat += text("chosen") @@ -202,14 +202,14 @@ newCoins++ src.updateUsrDialog() sleep(5); - if("plasma") - while(amt_plasma > 0 && coinsToProduce > 0) + if("phoron") + while(amt_phoron > 0 && coinsToProduce > 0) if (locate(/obj/item/weapon/moneybag,output.loc)) M = locate(/obj/item/weapon/moneybag,output.loc) else M = new/obj/item/weapon/moneybag(output.loc) - new /obj/item/weapon/coin/plasma(M) - amt_plasma -= 20 + new /obj/item/weapon/coin/phoron(M) + amt_phoron -= 20 coinsToProduce-- newCoins++ src.updateUsrDialog() diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index dbc4e6165f..0635c261bf 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -14,7 +14,7 @@ var/amt_silver = 0 var/amt_diamond = 0 var/amt_iron = 0 - var/amt_plasma = 0 + var/amt_phoron = 0 var/amt_uranium = 0 var/amt_clown = 0 var/amt_adamantine = 0 @@ -22,8 +22,8 @@ for (var/obj/item/weapon/coin/C in contents) if (istype(C,/obj/item/weapon/coin/diamond)) amt_diamond++; - if (istype(C,/obj/item/weapon/coin/plasma)) - amt_plasma++; + if (istype(C,/obj/item/weapon/coin/phoron)) + amt_phoron++; if (istype(C,/obj/item/weapon/coin/iron)) amt_iron++; if (istype(C,/obj/item/weapon/coin/silver)) @@ -46,8 +46,8 @@ dat += text("Metal coins: [amt_iron] Remove one
") if (amt_diamond) dat += text("Diamond coins: [amt_diamond] Remove one
") - if (amt_plasma) - dat += text("Phoron coins: [amt_plasma] Remove one
") + if (amt_phoron) + dat += text("Phoron coins: [amt_phoron] Remove one
") if (amt_uranium) dat += text("Uranium coins: [amt_uranium] Remove one
") if (amt_clown) @@ -86,8 +86,8 @@ COIN = locate(/obj/item/weapon/coin/iron,src.contents) if("diamond") COIN = locate(/obj/item/weapon/coin/diamond,src.contents) - if("plasma") - COIN = locate(/obj/item/weapon/coin/plasma,src.contents) + if("phoron") + COIN = locate(/obj/item/weapon/coin/phoron,src.contents) if("uranium") COIN = locate(/obj/item/weapon/coin/uranium,src.contents) if("clown") diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 6a7dddd3c7..502b0e772d 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -29,7 +29,7 @@ new /obj/item/stack/sheet/mineral/sandstone(location) del(src) -/obj/item/weapon/ore/plasma +/obj/item/weapon/ore/phoron name = "Phoron ore" icon_state = "Phoron ore" origin_tech = "materials=2" @@ -103,9 +103,9 @@ name = "iron coin" icon_state = "coin_iron" -/obj/item/weapon/coin/plasma - name = "solid plasma coin" - icon_state = "coin_plasma" +/obj/item/weapon/coin/phoron + name = "solid phoron coin" + icon_state = "coin_phoron" /obj/item/weapon/coin/uranium name = "uranium coin" diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 4ab39ad8d6..b215e23629 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -25,7 +25,7 @@ var/amt_diamond = 0 var/amt_glass = 0 var/amt_iron = 0 - var/amt_plasma = 0 + var/amt_phoron = 0 var/amt_uranium = 0 var/amt_clown = 0 var/amt_strange = 0 @@ -36,8 +36,8 @@ amt_diamond++; if (istype(C,/obj/item/weapon/ore/glass)) amt_glass++; - if (istype(C,/obj/item/weapon/ore/plasma)) - amt_plasma++; + if (istype(C,/obj/item/weapon/ore/phoron)) + amt_phoron++; if (istype(C,/obj/item/weapon/ore/iron)) amt_iron++; if (istype(C,/obj/item/weapon/ore/silver)) @@ -62,8 +62,8 @@ dat += text("Sand: [amt_glass]
") if (amt_diamond) dat += text("Diamond ore: [amt_diamond]
") - if (amt_plasma) - dat += text("Phoron ore: [amt_plasma]
") + if (amt_phoron) + dat += text("Phoron ore: [amt_phoron]
") if (amt_uranium) dat += text("Uranium ore: [amt_uranium]
") if (amt_clown) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 79142744bc..3fc63282fb 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -398,9 +398,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/o2_concentration = environment.oxygen/total_moles var/n2_concentration = environment.nitrogen/total_moles var/co2_concentration = environment.carbon_dioxide/total_moles - var/plasma_concentration = environment.toxins/total_moles + var/phoron_concentration = environment.toxins/total_moles - var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) + var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+phoron_concentration) if(abs(n2_concentration - N2STANDARD) < 20) src << "\blue Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)" else @@ -416,8 +416,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp else src << "\blue CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)" - if(plasma_concentration > 0.01) - src << "\red Phoron: [round(plasma_concentration*100)]% ([round(environment.toxins,0.01)] moles)" + if(phoron_concentration > 0.01) + src << "\red Phoron: [round(phoron_concentration*100)]% ([round(environment.toxins,0.01)] moles)" if(unknown_concentration > 0.01) src << "\red Unknown: [round(unknown_concentration*100)]% ([round(unknown_concentration*total_moles,0.01)] moles)" diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index 41b6e86c05..e76bed96d7 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -6,7 +6,7 @@ w_class = 3 origin_tech = "engineering=4;materials=4;bluespace=2;programming=4" - construction_cost = list("metal"=500,"glass"=500,"silver"=200,"gold"=200,"plasma"=100,"diamond"=10) + construction_cost = list("metal"=500,"glass"=500,"silver"=200,"gold"=200,"phoron"=100,"diamond"=10) construction_time = 75 var/searching = 0 var/askDelay = 10 * 60 * 1 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 9a43480138..2716e21b4b 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -510,7 +510,7 @@ var/ratio = (breath.toxins/safe_toxins_max) * 10 //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_PHORON_DAMAGE, MAX_PHORON_DAMAGE)) + reagents.add_reagent("phoron", 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 @@ -888,12 +888,12 @@ alien = 2 reagents.metabolize(src,alien) - var/total_plasmaloss = 0 + var/total_phoronloss = 0 for(var/obj/item/I in src) if(I.contaminated) - total_plasmaloss += vsc.plc.CONTAMINATION_LOSS + total_phoronloss += vsc.plc.CONTAMINATION_LOSS if(status_flags & GODMODE) return 0 //godmode - adjustToxLoss(total_plasmaloss) + adjustToxLoss(total_phoronloss) if(species.flags & REQUIRE_LIGHT) var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 3985f70536..910e0d0f02 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_PHORON_VISIBLE)//plasma exposure causes the egg to hatch + if (environment.toxins > MOLES_PHORON_VISIBLE)//phoron 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 709632a90e..72cfff38ed 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_PHORON_DAMAGE, MAX_PHORON_DAMAGE)) + reagents.add_reagent("phoron", Clamp(ratio, MIN_PHORON_DAMAGE, MAX_PHORON_DAMAGE)) toxins_alert = max(toxins_alert, 1) else toxins_alert = 0 diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index a93bfd2d19..312bccff0f 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -26,7 +26,7 @@ //Allows mobs to move through dense areas without restriction. For instance, in space or out of holder objects. var/incorporeal_move = 0 //0 is off, 1 is normal, 2 is for ninjas. - var/t_plasma = null + var/t_phoron = null var/t_oxygen = null var/t_sl_gas = null var/t_n2 = null diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 461d5dd713..5354f77ed2 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -542,12 +542,12 @@ var/o2_level = environment.oxygen/total_moles var/n2_level = environment.nitrogen/total_moles var/co2_level = environment.carbon_dioxide/total_moles - var/plasma_level = environment.toxins/total_moles - var/unknown_level = 1-(o2_level+n2_level+co2_level+plasma_level) + var/phoron_level = environment.toxins/total_moles + var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level) dat += "Nitrogen: [round(n2_level*100)]%
" dat += "Oxygen: [round(o2_level*100)]%
" dat += "Carbon Dioxide: [round(co2_level*100)]%
" - dat += "Phoron: [round(plasma_level*100)]%
" + dat += "Phoron: [round(phoron_level*100)]%
" if(unknown_level > 0.01) dat += "OTHER: [round(unknown_level)]%
" dat += "Temperature: [round(environment.temperature-T0C)]°C
" diff --git a/code/modules/mob/living/silicon/robot/robot_upgrades.dm b/code/modules/mob/living/silicon/robot/robot_upgrades.dm index e512a6ccce..45269fba43 100644 --- a/code/modules/mob/living/silicon/robot/robot_upgrades.dm +++ b/code/modules/mob/living/silicon/robot/robot_upgrades.dm @@ -128,7 +128,7 @@ /obj/item/borg/upgrade/jetpack/ name = "Mining Borg Jetpack" desc = "A carbon dioxide jetpack suitable for low-gravity mining operations" - construction_cost = list("metal"=10000,"plasma"=15000,"uranium" = 20000) + construction_cost = list("metal"=10000,"phoron"=15000,"uranium" = 20000) icon_state = "cyborg_upgrade3" require_module = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm index f97e0eb8c2..1b9529b15d 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm @@ -258,8 +258,8 @@ if(spawnees & 128) C = new(src.loc) - C.name = "Drone plasma overcharge counter" - C.origin_tech = "plasma=[rand(3,6)]" + C.name = "Drone phoron overcharge counter" + C.origin_tech = "phoron=[rand(3,6)]" if(spawnees & 256) C = new(src.loc) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 350471f1b3..898c778a48 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -34,7 +34,7 @@ var/heat_damage_per_tick = 3 //amount of damage applied if animal's body temperature is higher than maxbodytemp var/cold_damage_per_tick = 2 //same as heat_damage_per_tick, only if the bodytemperature it's lower than minbodytemp - //Atmos effect - Yes, you can make creatures that require plasma or co2 to survive. N2O is a trace gas and handled separately, hence why it isn't here. It'd be hard to add it. Hard and me don't mix (Yes, yes make all the dick jokes you want with that.) - Errorage + //Atmos effect - Yes, you can make creatures that require phoron or co2 to survive. N2O is a trace gas and handled separately, hence why it isn't here. It'd be hard to add it. Hard and me don't mix (Yes, yes make all the dick jokes you want with that.) - Errorage var/min_oxy = 5 var/max_oxy = 0 //Leaving something at 0 means it's off - has no maximum var/min_tox = 0 diff --git a/code/modules/mob/living/simple_animal/worm.dm b/code/modules/mob/living/simple_animal/worm.dm index 14faaffdd5..23aa7b987d 100644 --- a/code/modules/mob/living/simple_animal/worm.dm +++ b/code/modules/mob/living/simple_animal/worm.dm @@ -174,18 +174,18 @@ for(var/atom/movable/stomachContent in contents) if(prob(digestionProbability)) if(istype(stomachContent,/obj/item/stack)) //converts to plasma, keeping the stack value - if(!istype(stomachContent,/obj/item/stack/sheet/mineral/plasma)) + if(!istype(stomachContent,/obj/item/stack/sheet/mineral/phoron)) var/obj/item/stack/oldStack = stomachContent - new /obj/item/stack/sheet/mineral/plasma(src, oldStack.amount) + new /obj/item/stack/sheet/mineral/phoron(src, oldStack.amount) del(oldStack) continue else if(istype(stomachContent,/obj/item)) //converts to plasma, keeping the w_class var/obj/item/oldItem = stomachContent - new /obj/item/stack/sheet/mineral/plasma(src, oldItem.w_class) + new /obj/item/stack/sheet/mineral/phoron(src, oldItem.w_class) del(oldItem) continue else - new /obj/item/stack/sheet/mineral/plasma(src, flatPlasmaValue) //just flat amount + new /obj/item/stack/sheet/mineral/phoron(src, flatPlasmaValue) //just flat amount del(stomachContent) continue diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 06d8e9d02f..777f684dcb 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -75,7 +75,7 @@ var/druggy = 0 //Carbon var/confused = 0 //Carbon var/antitoxs = null - var/plasma = null + var/phoron = null var/sleeping = 0 //Carbon var/resting = 0 //Carbon var/lying = 0 diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm index 35be9ba4e8..a52a0e22ba 100644 --- a/code/modules/organs/organ_internal.dm +++ b/code/modules/organs/organ_internal.dm @@ -131,7 +131,7 @@ owner.adjustToxLoss(0.1 * process_accuracy) // Can't cope with toxins at all - for(var/toxin in list("toxin", "plasma", "sacid", "pacid", "cyanide", "lexorin", "amatoxin", "chloralhydrate", "carpotoxin", "zombiepowder", "mindbreaker")) + for(var/toxin in list("toxin", "phoron", "sacid", "pacid", "cyanide", "lexorin", "amatoxin", "chloralhydrate", "carpotoxin", "zombiepowder", "mindbreaker")) if(owner.reagents.has_reagent(toxin)) owner.adjustToxLoss(0.3 * process_accuracy) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 9c40db2da0..1082bfc9a8 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -352,7 +352,7 @@ /obj/item/weapon/paper/Toxin name = "Chemical Information" - info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Phoron:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter plasma after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in a enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Phoron.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure paralysis and sleep toxins.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administeredd to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tSleep Toxin T#054:
\n\t\t5 units wilkl induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization" + info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Phoron:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter phoron after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in a enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Phoron.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure paralysis and sleep toxins.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administeredd to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tSleep Toxin T#054:
\n\t\t5 units wilkl induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization" /obj/item/weapon/paper/courtroom name = "A Crash Course in Legal SOP on SS13" @@ -373,7 +373,7 @@ /obj/item/weapon/paper/jobs name = "Job Information" - info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\nTechnical Assistant 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\nDetective 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquieries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\nAtmospheric Technician 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\nEngineer 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Phoron Technicians as plasma is the material they routinly handle.
\n1. Research plasma
\n2. Make sure all plasma is properly handled.
\n
\nMedical Doctor (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Moniter usage of medical equipment.
\n
\nSecurity Officer 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\nHead of Security 4>5-2-2
\n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\nCaptain 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n" + info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\nTechnical Assistant 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\nDetective 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquieries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\nAtmospheric Technician 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\nEngineer 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Phoron Technicians as phoron is the material they routinly handle.
\n1. Research phoron
\n2. Make sure all phoron is properly handled.
\n
\nMedical Doctor (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Moniter usage of medical equipment.
\n
\nSecurity Officer 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\nHead of Security 4>5-2-2
\n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\nCaptain 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n" /obj/item/weapon/paper/photograph name = "photo" diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 59d49c39af..c2f248a5b8 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -9,7 +9,7 @@ proc/cardinalrange(var/center) /obj/machinery/am_shielding name = "antimatter reactor section" - desc = "This device was built using a plasma life-form that seems to increase plasma's natural ability to react with neutrinos while reducing the combustibility." + desc = "This device was built using a phoron life-form that seems to increase phoron's natural ability to react with neutrinos while reducing the combustibility." icon = 'icons/obj/machines/antimatter.dmi' icon_state = "shield" @@ -23,7 +23,7 @@ proc/cardinalrange(var/center) var/obj/machinery/power/am_control_unit/control_unit = null var/processing = 0//To track if we are in the update list or not, we need to be when we are damaged and if we ever var/stability = 100//If this gets low bad things tend to happen - var/efficiency = 1//How many cores this core counts for when doing power processing, plasma in the air and stability could affect this + var/efficiency = 1//How many cores this core counts for when doing power processing, phoron in the air and stability could affect this /obj/machinery/am_shielding/New(loc) @@ -82,7 +82,7 @@ proc/cardinalrange(var/center) /obj/machinery/am_shielding/process() if(!processing) . = PROCESS_KILL //TODO: core functions and stability - //TODO: think about checking the airmix for plasma and increasing power output + //TODO: think about checking the airmix for phoron and increasing power output return diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 486e71ded4..5c4b37ba26 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -77,12 +77,12 @@ user << "You inject the solution into the power cell." - if(S.reagents.has_reagent("plasma", 5)) + if(S.reagents.has_reagent("phoron", 5)) rigged = 1 - log_admin("LOG: [user.name] ([user.ckey]) injected a power cell with plasma, rigging it to explode.") - message_admins("LOG: [user.name] ([user.ckey]) injected a power cell with plasma, rigging it to explode.") + log_admin("LOG: [user.name] ([user.ckey]) injected a power cell with phoron, rigging it to explode.") + message_admins("LOG: [user.name] ([user.ckey]) injected a power cell with phoron, rigging it to explode.") S.reagents.clear_reagents() diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index dd6d971dc4..24465bc08f 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -712,7 +712,7 @@ // attack bulb/tube with object -// if a syringe, can inject plasma to make it explode +// if a syringe, can inject phoron to make it explode /obj/item/weapon/light/attackby(var/obj/item/I, var/mob/user) ..() if(istype(I, /obj/item/weapon/reagent_containers/syringe)) @@ -720,10 +720,10 @@ user << "You inject the solution into the [src]." - if(S.reagents.has_reagent("plasma", 5)) + if(S.reagents.has_reagent("phoron", 5)) - log_admin("LOG: [user.name] ([user.ckey]) injected a light with plasma, rigging it to explode.") - message_admins("LOG: [user.name] ([user.ckey]) injected a light with plasma, rigging it to explode.") + log_admin("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.") + message_admins("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.") rigged = 1 diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm index 89d65a6ae2..f3a147b9be 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -4,9 +4,9 @@ //Baseline portable generator. Has all the default handling. Not intended to be used on it's own (since it generates unlimited power). /obj/machinery/power/port_gen/pacman2 name = "Pacman II" - desc = "P.A.C.M.A.N. type II portable generator. Uses liquid plasma as a fuel source." + desc = "P.A.C.M.A.N. type II portable generator. Uses liquid phoron as a fuel source." power_gen = 4500 - var/obj/item/weapon/tank/plasma/P = null + var/obj/item/weapon/tank/phoron/P = null var/board_path = "/obj/item/weapon/circuitboard/pacman2" var/emagged = 0 var/heat = 0 @@ -73,14 +73,14 @@ explosion(get_turf(src), 2, 5, 2, -1) attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/weapon/tank/plasma)) + if(istype(O, /obj/item/weapon/tank/phoron)) if(P) - user << "\red The generator already has a plasma tank loaded!" + user << "\red The generator already has a phoron tank loaded!" return P = O user.drop_item() O.loc = src - user << "\blue You add the plasma tank to the generator." + user << "\blue You add the phoron tank to the generator." else if (istype(O, /obj/item/weapon/card/emag)) var/obj/item/weapon/card/emag/E = O if(E.uses) @@ -144,9 +144,9 @@ else dat += text("Generator: Off
") if(P) - dat += text("Currently loaded plasma tank: [P.air_contents.toxins]
") + dat += text("Currently loaded phoron tank: [P.air_contents.toxins]
") else - dat += text("No plasma tank currently loaded.
") + dat += text("No phoron tank currently loaded.
") dat += text("Power output: - [power_gen * power_output] +
") dat += text("Heat: [heat]
") dat += "
Close" diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 57cc6a04bd..7acdf9b560 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -33,7 +33,7 @@ tank [un]loading stuff turn on/off /obj/machinery/power/port_gen/examine() -display round(lastgen) and plasmatank amount +display round(lastgen) and phorontank amount */ @@ -98,7 +98,7 @@ display round(lastgen) and plasmatank amount var/sheets = 0 var/max_sheets = 100 var/sheet_name = "" - var/sheet_path = /obj/item/stack/sheet/mineral/plasma + var/sheet_path = /obj/item/stack/sheet/mineral/phoron var/board_path = "/obj/item/weapon/circuitboard/pacman" var/sheet_left = 0 // How much is left of the sheet var/time_per_sheet = 40 diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 2ff0125b7e..b04b1c4ac2 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -3,7 +3,7 @@ var/global/list/rad_collectors = list() /obj/machinery/power/rad_collector name = "Radiation Collector Array" - desc = "A device which uses Hawking Radiation and plasma to produce power." + desc = "A device which uses Hawking Radiation and phoron to produce power." icon = 'icons/obj/singularity.dmi' icon_state = "ca" anchored = 0 @@ -11,7 +11,7 @@ var/global/list/rad_collectors = list() directwired = 1 req_access = list(access_engine_equip) // use_power = 0 - var/obj/item/weapon/tank/plasma/P = null + var/obj/item/weapon/tank/phoron/P = null var/last_power = 0 var/active = 0 var/locked = 0 @@ -54,12 +54,12 @@ var/global/list/rad_collectors = list() if(istype(W, /obj/item/device/analyzer)) user << "\blue The [W.name] detects that [last_power]W were recently produced." return 1 - else if(istype(W, /obj/item/weapon/tank/plasma)) + else if(istype(W, /obj/item/weapon/tank/phoron)) if(!src.anchored) user << "\red The [src] needs to be secured to the floor first." return 1 if(src.P) - user << "\red There's already a plasma tank loaded." + user << "\red There's already a phoron tank loaded." return 1 user.drop_item() src.P = W @@ -71,7 +71,7 @@ var/global/list/rad_collectors = list() return 1 else if(istype(W, /obj/item/weapon/wrench)) if(P) - user << "\blue Remove the plasma tank first." + user << "\blue Remove the phoron tank first." return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) src.anchored = !src.anchored @@ -107,7 +107,7 @@ var/global/list/rad_collectors = list() /obj/machinery/power/rad_collector/proc/eject() locked = 0 - var/obj/item/weapon/tank/plasma/Z = src.P + var/obj/item/weapon/tank/phoron/Z = src.P if (!Z) return Z.loc = get_turf(src) diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 5701cae3a9..6dff673e1e 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -534,4 +534,4 @@ var/list/solars_list = list() /obj/item/weapon/paper/solar name = "paper- 'Going green! Setup your own solar array instructions.'" - info = "

Welcome

At greencorps we love the environment, and space. With this package you are able to help mother nature and produce energy without any usage of fossil fuel or plasma! Singularity energy is dangerous while solar energy is safe, which is why it's better. Now here is how you setup your own solar array.

You can make a solar panel by wrenching the solar assembly onto a cable node. Adding a glass panel, reinforced or regular glass will do, will finish the construction of your solar panel. It is that easy!.

Now after setting up 19 more of these solar panels you will want to create a solar tracker to keep track of our mother nature's gift, the sun. These are the same steps as before except you insert the tracker equipment circuit into the assembly before performing the final step of adding the glass. You now have a tracker! Now the last step is to add a computer to calculate the sun's movements and to send commands to the solar panels to change direction with the sun. Setting up the solar computer is the same as setting up any computer, so you should have no trouble in doing that. You do need to put a wire node under the computer, and the wire needs to be connected to the tracker.

Congratulations, you should have a working solar array. If you are having trouble, here are some tips. Make sure all solar equipment are on a cable node, even the computer. You can always deconstruct your creations if you make a mistake.

That's all to it, be safe, be green!

" + info = "

Welcome

At greencorps we love the environment, and space. With this package you are able to help mother nature and produce energy without any usage of fossil fuel or phoron! Singularity energy is dangerous while solar energy is safe, which is why it's better. Now here is how you setup your own solar array.

You can make a solar panel by wrenching the solar assembly onto a cable node. Adding a glass panel, reinforced or regular glass will do, will finish the construction of your solar panel. It is that easy!.

Now after setting up 19 more of these solar panels you will want to create a solar tracker to keep track of our mother nature's gift, the sun. These are the same steps as before except you insert the tracker equipment circuit into the assembly before performing the final step of adding the glass. You now have a tracker! Now the last step is to add a computer to calculate the sun's movements and to send commands to the solar panels to change direction with the sun. Setting up the solar computer is the same as setting up any computer, so you should have no trouble in doing that. You do need to put a wire node under the computer, and the wire needs to be connected to the tracker.

Congratulations, you should have a working solar array. If you are having trouble, here are some tips. Make sure all solar equipment are on a cable node, even the computer. You can always deconstruct your creations if you make a mistake.

That's all to it, be safe, be green!

" diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 2447661109..538e16f079 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -196,13 +196,13 @@ obj/item/weapon/gun/energy/staff/focus */ /obj/item/weapon/gun/energy/toxgun - name = "plasma pistol" + name = "phoron pistol" desc = "A specialized firearm designed to fire lethal bolts of toxins." icon_state = "toxgun" fire_sound = 'sound/effects/stealthoff.ogg' w_class = 3.0 - origin_tech = "combat=5;plasmatech=4" - projectile_type = "/obj/item/projectile/energy/plasma" + origin_tech = "combat=5;phorontech=4" + projectile_type = "/obj/item/projectile/energy/phoron" /obj/item/weapon/gun/energy/sniperrifle name = "L.W.A.P. Sniper Rifle" diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 6f719dafc9..7a6132d3ed 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -59,8 +59,8 @@ damage_type = TOX weaken = 5 -/obj/item/projectile/energy/plasma - name = "plasma bolt" +/obj/item/projectile/energy/phoron + name = "phoron bolt" icon_state = "energy" damage = 20 damage_type = TOX diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 5439a92fc6..4d827058a9 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -27,7 +27,7 @@ datum //Chemical Reactions - Initialises all /datum/chemical_reaction into a list // It is filtered into multiple lists within a list. // For example: - // chemical_reaction_list["plasma"] is a list of all reactions relating to plasma + // chemical_reaction_list["phoron"] is a list of all reactions relating to phoron var/paths = typesof(/datum/chemical_reaction) - /datum/chemical_reaction chemical_reactions_list = list() diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index bf8e233813..27b98eddf3 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -63,7 +63,7 @@ options[/obj/item/weapon/stock_parts/matter_bin/adv] = "Give it an advanced matter bin to fix it." options[/obj/item/stack/sheet/mineral/diamond] = "Line up a cut diamond with the nozzle to fix it." options[/obj/item/stack/sheet/mineral/uranium] = "Position a uranium sheet inside to fix it." - options[/obj/item/stack/sheet/mineral/plasma] = "Enter a block of plasma to fix it." + options[/obj/item/stack/sheet/mineral/phoron] = "Enter a block of phoron to fix it." options[/obj/item/stack/sheet/mineral/silver] = "Cover the internals with a silver lining to fix it." options[/obj/item/stack/sheet/mineral/gold] = "Wire a golden filament to fix it." options[/obj/item/stack/sheet/plasteel] = "Surround the outside with a plasteel cover to fix it." @@ -890,7 +890,7 @@ var/list/blend_items = list ( //Sheets - /obj/item/stack/sheet/mineral/plasma = list("plasma" = 20), + /obj/item/stack/sheet/mineral/phoron = list("phoron" = 20), /obj/item/stack/sheet/mineral/uranium = list("uranium" = 20), /obj/item/stack/sheet/mineral/clown = list("banana" = 20), /obj/item/stack/sheet/mineral/silver = list("silver" = 20), diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index a00c20b980..a42f451649 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1543,9 +1543,9 @@ datum ..() return - toxin/plasma + toxin/phoron name = "Phoron" - id = "plasma" + id = "phoron" description = "Phoron in its liquid form." reagent_state = LIQUID color = "#E71B00" // rgb: 231, 27, 0 diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 70ca9b2900..d061acc6e7 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -117,7 +117,7 @@ datum id = "oxycodone" result = "oxycodone" required_reagents = list("ethanol" = 1, "tramadol" = 1) - required_catalysts = list("plasma" = 1) + required_catalysts = list("phoron" = 1) result_amount = 1 //cyanide @@ -145,7 +145,7 @@ datum name = "Lexorin" id = "lexorin" result = "lexorin" - required_reagents = list("plasma" = 1, "hydrogen" = 1, "nitrogen" = 1) + required_reagents = list("phoron" = 1, "hydrogen" = 1, "nitrogen" = 1) result_amount = 3 space_drugs @@ -209,7 +209,7 @@ datum id = "peridaxon" result = "peridaxon" required_reagents = list("bicaridine" = 2, "clonexadone" = 2) - required_catalysts = list("plasma" = 5) + required_catalysts = list("phoron" = 5) result_amount = 2 virus_food @@ -224,7 +224,7 @@ datum id = "leporazine" result = "leporazine" required_reagents = list("silicon" = 1, "copper" = 1) - required_catalysts = list("plasma" = 5) + required_catalysts = list("phoron" = 5) result_amount = 2 cryptobiolin @@ -252,8 +252,8 @@ datum name = "Dexalin" id = "dexalin" result = "dexalin" - required_reagents = list("oxygen" = 2, "plasma" = 0.1) - required_catalysts = list("plasma" = 5) + required_reagents = list("oxygen" = 2, "phoron" = 0.1) + required_catalysts = list("phoron" = 5) result_amount = 1 dermaline @@ -302,8 +302,8 @@ datum name = "Clonexadone" id = "clonexadone" result = "clonexadone" - required_reagents = list("cryoxadone" = 1, "sodium" = 1, "plasma" = 0.1) - required_catalysts = list("plasma" = 5) + required_reagents = list("cryoxadone" = 1, "sodium" = 1, "phoron" = 0.1) + required_catalysts = list("phoron" = 5) result_amount = 2 spaceacillin @@ -401,7 +401,7 @@ datum name = "Napalm" id = "napalm" result = null - required_reagents = list("aluminum" = 1, "plasma" = 1, "sacid" = 1 ) + required_reagents = list("aluminum" = 1, "phoron" = 1, "sacid" = 1 ) result_amount = 1 on_reaction(var/datum/reagents/holder, var/created_volume) var/turf/location = get_turf(holder.my_atom.loc) @@ -483,7 +483,7 @@ datum name = "Potassium Chlorophoride" id = "potassium_chlorophoride" result = "potassium_chlorophoride" - required_reagents = list("potassium_chloride" = 1, "plasma" = 1, "chloralhydrate" = 1) + required_reagents = list("potassium_chloride" = 1, "phoron" = 1, "chloralhydrate" = 1) result_amount = 4 stoxin @@ -521,15 +521,15 @@ datum required_reagents = list("sodiumchloride" = 1, "ethanol" = 1, "radium" = 1) result_amount = 3 - plasmasolidification + phoronsolidification name = "Solid Phoron" - id = "solidplasma" + id = "solidphoron" result = null - required_reagents = list("iron" = 5, "frostoil" = 5, "plasma" = 20) + required_reagents = list("iron" = 5, "frostoil" = 5, "phoron" = 20) result_amount = 1 on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) - new /obj/item/stack/sheet/mineral/plasma(location) + new /obj/item/stack/sheet/mineral/phoron(location) return plastication @@ -592,7 +592,7 @@ datum id = "condensedcapsaicin" result = "condensedcapsaicin" required_reagents = list("capsaicin" = 2) - required_catalysts = list("plasma" = 5) + required_catalysts = list("phoron" = 5) result_amount = 1 /////////////////////////////////////////////////////////////////////////////////// @@ -1004,13 +1004,13 @@ datum name = "Slime Spawn" id = "m_spawn" result = null - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_container = /obj/item/slime_extract/grey required_other = 1 on_reaction(var/datum/reagents/holder) for(var/mob/O in viewers(get_turf_loc(holder.my_atom), null)) - O.show_message(text("\red Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!"), 1) + O.show_message(text("\red Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!"), 1) var/mob/living/carbon/slime/S = new /mob/living/carbon/slime S.loc = get_turf_loc(holder.my_atom) @@ -1033,7 +1033,7 @@ datum name = "Mutation Toxin" id = "mutationtoxin" result = "mutationtoxin" - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_other = 1 required_container = /obj/item/slime_extract/green @@ -1043,7 +1043,7 @@ datum name = "Slime Metal" id = "m_metal" result = null - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_container = /obj/item/slime_extract/metal required_other = 1 @@ -1060,7 +1060,7 @@ datum name = "Slime Crit" id = "m_tele" result = null - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_container = /obj/item/slime_extract/gold required_other = 1 @@ -1107,7 +1107,7 @@ datum name = "Slime Bork" id = "m_tele2" result = null - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_container = /obj/item/slime_extract/silver required_other = 1 @@ -1137,7 +1137,7 @@ datum name = "Slime Frost Oil" id = "m_frostoil" result = "frostoil" - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 10 required_container = /obj/item/slime_extract/blue required_other = 1 @@ -1146,7 +1146,7 @@ datum name = "Slime Freeze" id = "m_freeze" result = null - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_container = /obj/item/slime_extract/darkblue required_other = 1 @@ -1173,7 +1173,7 @@ datum name = "Slime fire" id = "m_fire" result = null - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_container = /obj/item/slime_extract/orange required_other = 1 @@ -1209,7 +1209,7 @@ datum name = "Slime Powercell" id = "m_cell" result = null - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_container = /obj/item/slime_extract/yellow required_other = 1 @@ -1236,7 +1236,7 @@ datum name = "Slime Steroid" id = "m_steroid" result = null - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_container = /obj/item/slime_extract/purple required_other = 1 @@ -1261,12 +1261,12 @@ datum name = "Slime Plasma" id = "m_plasma" result = null - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_container = /obj/item/slime_extract/darkpurple required_other = 1 on_reaction(var/datum/reagents/holder) - var/obj/item/stack/sheet/mineral/plasma/P = new /obj/item/stack/sheet/mineral/plasma + var/obj/item/stack/sheet/mineral/phoron/P = new /obj/item/stack/sheet/mineral/phoron P.amount = 10 P.loc = get_turf_loc(holder.my_atom) @@ -1275,7 +1275,7 @@ datum name = "Slime Glycerol" id = "m_glycerol" result = "glycerol" - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 8 required_container = /obj/item/slime_extract/red required_other = 1 @@ -1301,7 +1301,7 @@ datum name = "Slime Potion" id = "m_potion" result = null - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_container = /obj/item/slime_extract/pink required_other = 1 @@ -1315,7 +1315,7 @@ datum name = "Advanced Mutation Toxin" id = "mutationtoxin2" result = "amutationtoxin" - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_other = 1 required_container = /obj/item/slime_extract/black @@ -1325,7 +1325,7 @@ datum name = "Slime Explosion" id = "m_explosion" result = null - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_container = /obj/item/slime_extract/oil required_other = 1 @@ -1341,7 +1341,7 @@ datum result = null result_amount = 1 required_container = /obj/item/slime_extract/lightpink - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) required_other = 1 on_reaction(var/datum/reagents/holder) var/obj/item/weapon/slimepotion2/P = new /obj/item/weapon/slimepotion2 @@ -1351,7 +1351,7 @@ datum name = "Slime Golem" id = "m_golem" result = null - required_reagents = list("plasma" = 5) + required_reagents = list("phoron" = 5) result_amount = 1 required_container = /obj/item/slime_extract/adamantine required_other = 1 @@ -1655,7 +1655,7 @@ datum name = "Toxins Special" id = "toxinsspecial" result = "toxinsspecial" - required_reagents = list("rum" = 2, "vermouth" = 1, "plasma" = 2) + required_reagents = list("rum" = 2, "vermouth" = 1, "phoron" = 2) result_amount = 5 beepsky_smash diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 2f61948749..3f2f90ff06 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -382,7 +382,7 @@ if(4) reagents.add_reagent("sprinkles", 3) if(5) - reagents.add_reagent("plasma", 3) + reagents.add_reagent("phoron", 3) if(6) reagents.add_reagent("coco", 3) if(7) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index eb1b76957d..4ccdc43d87 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -11,7 +11,7 @@ they are simply references used as part of a "has materials?" type proc. They al The currently supporting non-reagent materials: - $metal (/obj/item/stack/metal). One sheet = 3750 units. - $glass (/obj/item/stack/glass). One sheet = 3750 units. -- $plasma (/obj/item/stack/plasma). One sheet = 3750 units. +- $phoron (/obj/item/stack/phoron). One sheet = 3750 units. - $silver (/obj/item/stack/silver). One sheet = 3750 units. - $gold (/obj/item/stack/gold). One sheet = 3750 units. - $uranium (/obj/item/stack/uranium). One sheet = 3750 units. @@ -24,7 +24,7 @@ Don't add new keyword/IDs if they are made from an existing one (such as rods wh Design Guidlines - The reliability formula for all R&D built items is reliability_base (a fixed number) + total tech levels required to make it + reliability_mod (starts at 0, gets improved through experimentation). Example: PACMAN generator. 79 base reliablity + 6 tech -(3 plasmatech, 3 powerstorage) + 0 (since it's completely new) = 85% reliability. Reliability is the chance it works CORRECTLY. +(3 phorontech, 3 powerstorage) + 0 (since it's completely new) = 85% reliability. Reliability is the chance it works CORRECTLY. - When adding new designs, check rdreadme.dm to see what kind of things have already been made and where new stuff is needed. - A single sheet of anything is 3750 units of material. Materials besides metal/glass require help from other jobs (mining for other types of metals and chemistry for reagents). @@ -585,7 +585,7 @@ datum/design/posibrain req_tech = list("engineering" = 4, "materials" = 6, "bluespace" = 2, "programming" = 4) build_type = PROTOLATHE - materials = list("$metal" = 2000, "$glass" = 1000, "$silver" = 1000, "$gold" = 500, "$plasma" = 500, "$diamond" = 100) + materials = list("$metal" = 2000, "$glass" = 1000, "$silver" = 1000, "$gold" = 500, "$phoron" = 500, "$diamond" = 100) build_path = "/obj/item/device/mmi/posibrain" /////////////////////////////////// @@ -803,13 +803,13 @@ datum/design/mech_repair_droid build_path = "/obj/item/mecha_parts/mecha_equipment/repair_droid" category = "Exosuit Equipment" -datum/design/mech_plasma_generator +datum/design/mech_phoron_generator name = "Exosuit Module Design (Phoron Generator Module)" desc = "Exosuit-mounted phoron generator." - id = "mech_plasma_generator" + id = "mech_phoron_generator" build_type = MECHFAB - req_tech = list("plasmatech" = 2, "powerstorage"= 2, "engineering" = 2) - build_path = "/obj/item/mecha_parts/mecha_equipment/plasma_generator" + req_tech = list("phorontech" = 2, "powerstorage"= 2, "engineering" = 2) + build_path = "/obj/item/mecha_parts/mecha_equipment/phoron_generator" category = "Exosuit Equipment" datum/design/mech_energy_relay @@ -1228,7 +1228,7 @@ datum/design/pacman name = "PACMAN-type Generator Board" desc = "The circuit board that for a PACMAN-type portable generator." id = "pacman" - req_tech = list("programming" = 3, "plasmatech" = 3, "powerstorage" = 3, "engineering" = 3) + req_tech = list("programming" = 3, "phorontech" = 3, "powerstorage" = 3, "engineering" = 3) build_type = IMPRINTER reliability_base = 79 materials = list("$glass" = 2000, "sacid" = 20) @@ -1384,7 +1384,7 @@ datum/design/bluespacebeaker id = "bluespacebeaker" req_tech = list("bluespace" = 2, "materials" = 6) build_type = PROTOLATHE - materials = list("$metal" = 3000, "$plasma" = 3000, "$diamond" = 500) + materials = list("$metal" = 3000, "$phoron" = 3000, "$diamond" = 500) reliability_base = 76 build_path = "/obj/item/weapon/reagent_containers/glass/beaker/bluespace" @@ -1565,13 +1565,13 @@ datum/design/stunshell materials = list("$metal" = 4000) build_path = "/obj/item/ammo_casing/shotgun/stunshell" -datum/design/plasmapistol - name = "plasma pistol" +datum/design/phoronpistol + name = "phoron pistol" desc = "A specialized firearm designed to fire lethal bolts of toxins." id = "ppistol" - req_tech = list("combat" = 5, "plasmatech" = 4) + req_tech = list("combat" = 5, "phorontech" = 4) build_type = PROTOLATHE - materials = list("$metal" = 5000, "$glass" = 1000, "$plasma" = 3000) + materials = list("$metal" = 5000, "$glass" = 1000, "$phoron" = 3000) build_path = "/obj/item/weapon/gun/energy/toxgun" ///////////////////////////////////////// /////////////////Mining////////////////// @@ -1599,9 +1599,9 @@ datum/design/plasmacutter name = "Plasma Cutter" desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff." id = "plasmacutter" - req_tech = list("materials" = 4, "plasmatech" = 3, "engineering" = 3) + req_tech = list("materials" = 4, "phorontech" = 3, "engineering" = 3) build_type = PROTOLATHE - materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$plasma" = 500) + materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$phoron" = 500) reliability_base = 79 build_path = "/obj/item/weapon/pickaxe/plasmacutter" @@ -1662,7 +1662,7 @@ datum/design/bluespace_crystal id = "bluespace_crystal" req_tech = list("bluespace" = 5, "materials" = 7) build_type = PROTOLATHE - materials = list("$gold" = 1500, "$diamond" = 3000, "$plasma" = 1500) + materials = list("$gold" = 1500, "$diamond" = 3000, "$phoron" = 1500) reliability_base = 100 build_path = "/obj/item/bluespace_crystal/artificial" diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 6f3c5378d0..3499601afc 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -110,4 +110,4 @@ Note: Must be placed within 3 tiles of the R&D Console icon_state = "d20" g_amt = 5000 m_amt = 5000 - origin_tech = "materials=5;plasmatech=5;syndicate=5;programming=9"*/ + origin_tech = "materials=5;phorontech=5;syndicate=5;programming=9"*/ diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index c4a523f8b1..71845ad6ff 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -17,7 +17,7 @@ Note: Must be placed west/left of and R&D console to function. var/g_amount = 0.0 var/gold_amount = 0.0 var/silver_amount = 0.0 - var/plasma_amount = 0.0 + var/phoron_amount = 0.0 var/uranium_amount = 0.0 var/diamond_amount = 0.0 var/clown_amount = 0.0 @@ -37,7 +37,7 @@ Note: Must be placed west/left of and R&D console to function. RefreshParts() /obj/machinery/r_n_d/protolathe/proc/TotalMaterials() //returns the total of all the stored materials. Makes code neater. - return m_amount + g_amount + gold_amount + silver_amount + plasma_amount + uranium_amount + diamond_amount + clown_amount + return m_amount + g_amount + gold_amount + silver_amount + phoron_amount + uranium_amount + diamond_amount + clown_amount /obj/machinery/r_n_d/protolathe/RefreshParts() var/T = 0 @@ -87,9 +87,9 @@ Note: Must be placed west/left of and R&D console to function. if(g_amount >= 3750) var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src.loc) G.amount = round(g_amount / G.perunit) - if(plasma_amount >= 2000) - var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma(src.loc) - G.amount = round(plasma_amount / G.perunit) + if(phoron_amount >= 2000) + var/obj/item/stack/sheet/mineral/phoron/G = new /obj/item/stack/sheet/mineral/phoron(src.loc) + G.amount = round(phoron_amount / G.perunit) if(silver_amount >= 2000) var/obj/item/stack/sheet/mineral/silver/G = new /obj/item/stack/sheet/mineral/silver(src.loc) G.amount = round(silver_amount / G.perunit) @@ -166,8 +166,8 @@ Note: Must be placed west/left of and R&D console to function. gold_amount += amount * 2000 if(/obj/item/stack/sheet/mineral/silver) silver_amount += amount * 2000 - if(/obj/item/stack/sheet/mineral/plasma) - plasma_amount += amount * 2000 + if(/obj/item/stack/sheet/mineral/phoron) + phoron_amount += amount * 2000 if(/obj/item/stack/sheet/mineral/uranium) uranium_amount += amount * 2000 if(/obj/item/stack/sheet/mineral/diamond) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 5c459092df..f98ce8279e 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -77,7 +77,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, return_name = "Gold" if("silver") return_name = "Silver" - if("plasma") + if("phoron") return_name = "Solid Phoron" if("uranium") return_name = "Uranium" @@ -377,8 +377,8 @@ won't update every console in existence) but it's more of a hassle to do. Also, linked_lathe.gold_amount = max(0, (linked_lathe.gold_amount-being_built.materials[M])) if("$silver") linked_lathe.silver_amount = max(0, (linked_lathe.silver_amount-being_built.materials[M])) - if("$plasma") - linked_lathe.plasma_amount = max(0, (linked_lathe.plasma_amount-being_built.materials[M])) + if("$phoron") + linked_lathe.phoron_amount = max(0, (linked_lathe.phoron_amount-being_built.materials[M])) if("$uranium") linked_lathe.uranium_amount = max(0, (linked_lathe.uranium_amount-being_built.materials[M])) if("$diamond") @@ -469,9 +469,9 @@ won't update every console in existence) but it's more of a hassle to do. Also, if("silver") type = /obj/item/stack/sheet/mineral/silver res_amount = "silver_amount" - if("plasma") - type = /obj/item/stack/sheet/mineral/plasma - res_amount = "plasma_amount" + if("phoron") + type = /obj/item/stack/sheet/mineral/phoron + res_amount = "phoron_amount" if("uranium") type = /obj/item/stack/sheet/mineral/uranium res_amount = "uranium_amount" @@ -739,8 +739,8 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(D.materials[M] > linked_lathe.gold_amount) check_materials = 0 if("$silver") if(D.materials[M] > linked_lathe.silver_amount) check_materials = 0 - if("$plasma") - if(D.materials[M] > linked_lathe.plasma_amount) check_materials = 0 + if("$phoron") + if(D.materials[M] > linked_lathe.phoron_amount) check_materials = 0 if("$uranium") if(D.materials[M] > linked_lathe.uranium_amount) check_materials = 0 if("$diamond") @@ -787,11 +787,11 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(linked_lathe.silver_amount >= 2000) dat += "(Max Sheets)" dat += "
" //Phoron - dat += "* [linked_lathe.plasma_amount] cm3 of Solid Phoron || " + dat += "* [linked_lathe.phoron_amount] cm3 of Solid Phoron || " dat += "Eject: " - if(linked_lathe.plasma_amount >= 2000) dat += "(1 Sheet) " - if(linked_lathe.plasma_amount >= 10000) dat += "(5 Sheets) " - if(linked_lathe.plasma_amount >= 2000) dat += "(Max Sheets)" + if(linked_lathe.phoron_amount >= 2000) dat += "(1 Sheet) " + if(linked_lathe.phoron_amount >= 10000) dat += "(5 Sheets) " + if(linked_lathe.phoron_amount >= 2000) dat += "(Max Sheets)" dat += "
" //Uranium dat += "* [linked_lathe.uranium_amount] cm3 of Uranium || " diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index dd5c9ebbbc..d7f488cf8c 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -188,10 +188,10 @@ datum/tech/engineering desc = "Development of new and improved engineering parts and." id = "engineering" -datum/tech/plasmatech +datum/tech/phorontech name = "Phoron Research" - desc = "Research into the mysterious substance colloqually known as 'plasma'." - id = "plasmatech" + desc = "Research into the mysterious substance colloqually known as 'phoron'." + id = "phorontech" datum/tech/powerstorage name = "Power Manipulation Technology" diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm b/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm index 0f47eeb110..9829c35ec8 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm @@ -20,11 +20,11 @@ /obj/structure/crystal/Del() src.visible_message("\red[src] shatters!") if(prob(75)) - new /obj/item/weapon/shard/plasma(src.loc) + new /obj/item/weapon/shard/phoron(src.loc) if(prob(50)) - new /obj/item/weapon/shard/plasma(src.loc) + new /obj/item/weapon/shard/phoron(src.loc) if(prob(25)) - new /obj/item/weapon/shard/plasma(src.loc) + new /obj/item/weapon/shard/phoron(src.loc) if(prob(75)) new /obj/item/weapon/shard(src.loc) if(prob(50)) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm index a81886b6c3..50e53cf755 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm @@ -44,7 +44,7 @@ var/list/valid_secondary_effect_types = list(\ /datum/artifact_effect/gasco2,\ /datum/artifact_effect/gasnitro,\ /datum/artifact_effect/gasoxy,\ - /datum/artifact_effect/gasplasma,\ + /datum/artifact_effect/gasphoron,\ /* /datum/artifact_effect/gassleeping,\*/ /datum/artifact_effect/goodfeeling,\ /datum/artifact_effect/heal,\ @@ -130,7 +130,7 @@ var/list/valid_secondary_effect_types = list(\ //if either of our effects rely on environmental factors, work that out var/trigger_cold = 0 var/trigger_hot = 0 - var/trigger_plasma = 0 + var/trigger_phoron = 0 var/trigger_oxy = 0 var/trigger_co2 = 0 var/trigger_nitro = 0 @@ -144,7 +144,7 @@ var/list/valid_secondary_effect_types = list(\ trigger_hot = 1 if(env.toxins >= 10) - trigger_plasma = 1 + trigger_phoron = 1 if(env.oxygen >= 10) trigger_oxy = 1 if(env.carbon_dioxide >= 10) @@ -177,7 +177,7 @@ var/list/valid_secondary_effect_types = list(\ secondary_effect.ToggleActivate(0) //PHORON GAS ACTIVATION - if(trigger_plasma) + if(trigger_phoron) if(my_effect.trigger == TRIGGER_PHORON && !my_effect.activated) my_effect.ToggleActivate() if(secondary_effect && secondary_effect.trigger == TRIGGER_PHORON && !secondary_effect.activated) @@ -262,7 +262,7 @@ var/list/valid_secondary_effect_types = list(\ my_effect.ToggleActivate() if(secondary_effect && secondary_effect.trigger == TRIGGER_ACID && prob(25)) secondary_effect.ToggleActivate(0) - else if(W.reagents.has_reagent("plasma", 1) || W.reagents.has_reagent("thermite", 1)) + else if(W.reagents.has_reagent("phoron", 1) || W.reagents.has_reagent("thermite", 1)) if(my_effect.trigger == TRIGGER_VOLATILE) my_effect.ToggleActivate() if(secondary_effect && secondary_effect.trigger == TRIGGER_VOLATILE && prob(25)) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasplasma.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasplasma.dm index c375e746e2..34f3070f38 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasplasma.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasplasma.dm @@ -1,22 +1,22 @@ -/datum/artifact_effect/gasplasma - effecttype = "gasplasma" +/datum/artifact_effect/gasphoron + effecttype = "gasphoron" var/max_pressure var/target_percentage -/datum/artifact_effect/gasplasma/New() +/datum/artifact_effect/gasphoron/New() ..() effect = pick(EFFECT_TOUCH, EFFECT_AURA) max_pressure = rand(115,1000) effect_type = pick(6,7) -/datum/artifact_effect/gasplasma/DoEffectTouch(var/mob/user) +/datum/artifact_effect/gasphoron/DoEffectTouch(var/mob/user) if(holder) var/datum/gas_mixture/env = holder.loc.return_air() if(env) env.toxins += rand(2,15) -/datum/artifact_effect/gasplasma/DoEffectAura() +/datum/artifact_effect/gasphoron/DoEffectAura() if(holder) var/datum/gas_mixture/env = holder.loc.return_air() if(env && env.total_moles < max_pressure) diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 0b776ca91f..5fdc25134a 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -203,8 +203,8 @@ else if(prob(50)) new_item = new /obj/item/weapon/tank/anesthetic(src.loc) else - new_item = new /obj/item/weapon/tank/plasma(src.loc) - icon_state = pick("oxygen","oxygen_fr","oxygen_f","plasma","anesthetic") + new_item = new /obj/item/weapon/tank/phoron(src.loc) + icon_state = pick("oxygen","oxygen_fr","oxygen_f","phoron","anesthetic") additional_desc = "It [pick("gloops","sloshes")] slightly when you shake it." if(13) item_type = "tool" @@ -224,7 +224,7 @@ possible_spawns += /obj/item/stack/sheet/plasteel possible_spawns += /obj/item/stack/sheet/glass possible_spawns += /obj/item/stack/sheet/rglass - possible_spawns += /obj/item/stack/sheet/mineral/plasma + possible_spawns += /obj/item/stack/sheet/mineral/phoron possible_spawns += /obj/item/stack/sheet/mineral/mythril possible_spawns += /obj/item/stack/sheet/mineral/gold possible_spawns += /obj/item/stack/sheet/mineral/silver @@ -298,7 +298,7 @@ if(prob(50)) new_item = new /obj/item/weapon/shard(src.loc) else - new_item = new /obj/item/weapon/shard/plasma(src.loc) + new_item = new /obj/item/weapon/shard/phoron(src.loc) apply_prefix = 0 apply_image_decorations = 0 apply_material_decorations = 0 @@ -477,7 +477,7 @@ if(prob(30)) descriptors.Add("is encircled with bands of [pick("quadrinium","cordite","ferritic-alloy","plasteel","duranium")]") if(prob(30)) - descriptors.Add("menaces with spikes of [pick("solid plasma","uranium","white pearl","black steel")]") + descriptors.Add("menaces with spikes of [pick("solid phoron","uranium","white pearl","black steel")]") if(descriptors.len > 0) decorations = "It " for(var/index=1, index <= descriptors.len, index++) diff --git a/code/modules/research/xenoarchaeology/finds/finds_defines.dm b/code/modules/research/xenoarchaeology/finds/finds_defines.dm index 6de9b4c806..a28742d6c5 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_defines.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_defines.dm @@ -119,7 +119,7 @@ return "carbon" if(ARCHAEO_REMAINS_XENO) return "carbon" - return "plasma" + return "phoron" //see /turf/simulated/mineral/New() in code/modules/mining/mine_turfs.dm /proc/get_random_digsite_type() @@ -215,7 +215,7 @@ var/list/responsive_carriers = list( \ "iron", \ "chlorine", \ "phosphorus", \ - "plasma") + "phoron") var/list/finds_as_strings = list( \ "Trace organic cells", \ diff --git a/code/modules/research/xenoarchaeology/finds/finds_misc.dm b/code/modules/research/xenoarchaeology/finds/finds_misc.dm index 0c626b8581..874bd907a4 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_misc.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_misc.dm @@ -1,39 +1,39 @@ -/obj/item/weapon/shard/plasma - name = "plasma shard" - desc = "A shard of plasma glass. Considerably tougher then normal glass shards. Apparently not tough enough to be a window." +/obj/item/weapon/shard/phoron + name = "phoron shard" + desc = "A shard of phoron glass. Considerably tougher then normal glass shards. Apparently not tough enough to be a window." force = 8.0 throwforce = 15.0 - icon_state = "plasmalarge" -/obj/item/weapon/shard/plasma/New() + icon_state = "phoronlarge" +/obj/item/weapon/shard/phoron/New() - src.icon_state = pick("plasmalarge", "plasmamedium", "plasmasmall") + src.icon_state = pick("phoronlarge", "phoronmedium", "phoronsmall") switch(src.icon_state) - if("plasmasmall") + if("phoronsmall") src.pixel_x = rand(-12, 12) src.pixel_y = rand(-12, 12) - if("plasmamedium") + if("phoronmedium") src.pixel_x = rand(-8, 8) src.pixel_y = rand(-8, 8) - if("plasmalarge") + if("phoronlarge") src.pixel_x = rand(-5, 5) src.pixel_y = rand(-5, 5) else return -/obj/item/weapon/shard/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/weapon/shard/phoron/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if ( istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) - var/obj/item/stack/sheet/glass/plasmaglass/NG = new (user.loc) - for (var/obj/item/stack/sheet/glass/plasmaglass/G in user.loc) + var/obj/item/stack/sheet/glass/phoronglass/NG = new (user.loc) + for (var/obj/item/stack/sheet/glass/phoronglass/G in user.loc) if(G==NG) continue if(G.amount>=G.max_amount) continue G.attackby(NG, user) - usr << "You add the newly-formed plasma glass to the stack. It now contains [NG.amount] sheets." + usr << "You add the newly-formed phoron glass to the stack. It now contains [NG.amount] sheets." //SN src = null del(src) return diff --git a/code/modules/research/xenoarchaeology/geosample.dm b/code/modules/research/xenoarchaeology/geosample.dm index 9628d5c003..a2ea98a430 100644 --- a/code/modules/research/xenoarchaeology/geosample.dm +++ b/code/modules/research/xenoarchaeology/geosample.dm @@ -89,13 +89,13 @@ age_thousand = rand(1,999) age_million = rand(1,999) age_billion = rand(10, 13) - find_presence["plasma"] = rand(1,1000) / 100 - source_mineral = "plasma" + find_presence["phoron"] = rand(1,1000) / 100 + source_mineral = "phoron" if("Clown") age = rand(-1,-999) //thats the joke age_thousand = rand(-1,-999) - find_presence["plasma"] = rand(1,1000) / 100 - source_mineral = "plasma" + find_presence["phoron"] = rand(1,1000) / 100 + source_mineral = "phoron" if(prob(75)) find_presence["phosphorus"] = rand(1,500) / 100 diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm index 7daa0a665a..5301aa9ddc 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm @@ -135,16 +135,16 @@ Structure is composed of a carbo-titanium alloy with interlaced reinforcing energy fields, and the contained liquid \ resembles proto-plasmic residue supportive of single cellular developmental conditions." if(/obj/machinery/power/supermatter) - return "Super dense plasma clump - Appears to have been shaped or hewn, structure is composed of matter 2000% denser than ordinary carbon matter residue.\ - Potential application as unrefined plasma source." + return "Super dense phoron clump - Appears to have been shaped or hewn, structure is composed of matter 2000% denser than ordinary carbon matter residue.\ + Potential application as unrefined phoron source." if(/obj/machinery/power/supermatter) - return "Super dense plasma clump - Appears to have been shaped or hewn, structure is composed of matter 2000% denser than ordinary carbon matter residue.\ - Potential application as unrefined plasma source." + return "Super dense phoron clump - Appears to have been shaped or hewn, structure is composed of matter 2000% denser than ordinary carbon matter residue.\ + Potential application as unrefined phoron source." if(/obj/structure/constructshell) return "Tribal idol - Item resembles statues/emblems built by superstitious pre-warp civilisations to honour their gods. Material appears to be a \ rock/plastcrete composite." if(/obj/machinery/giga_drill) - return "Automated mining drill - structure composed of titanium-carbide alloy, with tip and drill lines edged in an alloy of diamond and plasma." + return "Automated mining drill - structure composed of titanium-carbide alloy, with tip and drill lines edged in an alloy of diamond and phoron." if(/obj/structure/cult/pylon) return "Tribal pylon - Item resembles statues/emblems built by cargo cult civilisations to honour energy systems from post-warp civilisations." if(/obj/mecha/working/hoverpod) diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm index 62cd53dfa4..5c5f2b8eae 100644 --- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm +++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm @@ -88,8 +88,8 @@ dat += "[field_type=="mercury"?"":"" ]Mercury dispersion wave
" dat += "[field_type=="iron"?"":"" ]Iron wafer conduction field
" dat += "[field_type=="calcium"?"":"" ]Calcium binary deoxidiser
" - dat += "[field_type=="plasma"?"":"" ]Chlorine diffusion emissions
" - dat += "[field_type=="plasma"?"":"" ]Phoron saturated field
" + dat += "[field_type=="phoron"?"":"" ]Chlorine diffusion emissions
" + dat += "[field_type=="phoron"?"":"" ]Phoron saturated field
" else dat += "
" dat += "
" @@ -258,7 +258,7 @@ if("potassium") success = 1 // - if("plasma") + if("phoron") success = 1 // if("calcium") diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index f1ecc0f659..35179a85e4 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 PHORON_RELEASE_MODIFIER 1500 //Higher == less plasma released by reaction +#define PHORON_RELEASE_MODIFIER 1500 //Higher == less phoron 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 diff --git a/code/setup.dm b/code/setup.dm index d69215bfa2..93c0be5539 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -16,7 +16,7 @@ #define MOLES_O2STANDARD MOLES_CELLSTANDARD*O2STANDARD // O2 standard value (21%) #define MOLES_N2STANDARD MOLES_CELLSTANDARD*N2STANDARD // N2 standard value (79%) -#define MOLES_PHORON_VISIBLE 0.7 //Moles in a standard cell after which plasma is visible +#define MOLES_PHORON_VISIBLE 0.7 //Moles in a standard cell after which phoron is visible #define MIN_PHORON_DAMAGE 1 #define MAX_PHORON_DAMAGE 10 @@ -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_PHORON_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 phoron into the tile #define FIRE_GROWTH_RATE 40000 //For small fires #define WATER_BOIL_TEMP 393 */ @@ -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 PHORONGUARD 16384 //Does not get contaminated by plasma. +#define PHORONGUARD 16384 //Does not get contaminated by phoron. #define NOREACT 16384 //Reagents dont' react inside this container. diff --git a/code/unused/assemblies.dm b/code/unused/assemblies.dm index 0b6db49514..0b71aca6d2 100644 --- a/code/unused/assemblies.dm +++ b/code/unused/assemblies.dm @@ -703,7 +703,7 @@ src.status = 1 bombers += "[key_name(user)] welded a prox bomb. Temp: [src.part3.air_contents.temperature-T0C]" message_admins("[key_name_admin(user)] welded a prox bomb. Temp: [src.part3.air_contents.temperature-T0C]") - user.show_message("\blue A pressure hole has been bored to the plasma tank valve. The plasma tank can now be ignited.", 1) + user.show_message("\blue A pressure hole has been bored to the phoron tank valve. The phoron tank can now be ignited.", 1) else src.status = 0 bombers += "[key_name(user)] unwelded a prox bomb. Temp: [src.part3.air_contents.temperature-T0C]" @@ -737,7 +737,7 @@ /obj/item/assembly/m_i_ptank/emp_act(severity) - if(istype(part3,/obj/item/weapon/tank/plasma) && prob(100/severity)) + if(istype(part3,/obj/item/weapon/tank/phoron) && prob(100/severity)) part3.ignite() ..() @@ -792,7 +792,7 @@ src.status = 1 bombers += "[key_name(user)] welded a time bomb. Temp: [src.part3.air_contents.temperature-T0C]" message_admins("[key_name_admin(user)] welded a time bomb. Temp: [src.part3.air_contents.temperature-T0C]") - user.show_message("\blue A pressure hole has been bored to the plasma tank valve. The plasma tank can now be ignited.", 1) + user.show_message("\blue A pressure hole has been bored to the phoron tank valve. The phoron tank can now be ignited.", 1) else if(src) src.status = 0 @@ -823,7 +823,7 @@ return /obj/item/assembly/t_i_ptank/emp_act(severity) - if(istype(part3,/obj/item/weapon/tank/plasma) && prob(100/severity)) + if(istype(part3,/obj/item/weapon/tank/phoron) && prob(100/severity)) part3.ignite() ..() @@ -871,7 +871,7 @@ src.status = 1 bombers += "[key_name(user)] welded a radio bomb. Temp: [src.part3.air_contents.temperature-T0C]" message_admins("[key_name_admin(user)] welded a radio bomb. Temp: [src.part3.air_contents.temperature-T0C]") - user.show_message("\blue A pressure hole has been bored to the plasma tank valve. The plasma tank can now be ignited.", 1) + user.show_message("\blue A pressure hole has been bored to the phoron tank valve. The phoron tank can now be ignited.", 1) else src.status = 0 bombers += "[key_name(user)] unwelded a radio bomb. Temp: [src.part3.air_contents.temperature-T0C]" @@ -882,7 +882,7 @@ return /obj/item/assembly/r_i_ptank/emp_act(severity) - if(istype(part3,/obj/item/weapon/tank/plasma) && prob(100/severity)) + if(istype(part3,/obj/item/weapon/tank/phoron) && prob(100/severity)) part3.ignite() ..() @@ -919,7 +919,7 @@ src.status = 1 bombers += "[key_name(user)] welded a suicide bomb. Temp: [src.part4.air_contents.temperature-T0C]" message_admins("[key_name_admin(user)] welded a suicide bomb. Temp: [src.part4.air_contents.temperature-T0C]") - user.show_message("\blue A pressure hole has been bored to the plasma tank valve. The plasma tank can now be ignited.", 1) + user.show_message("\blue A pressure hole has been bored to the phoron tank valve. The phoron tank can now be ignited.", 1) else src.status = 0 bombers += "[key_name(user)] unwelded a suicide bomb. Temp: [src.part4.air_contents.temperature-T0C]" diff --git a/code/unused/computer2/med_rec.dm b/code/unused/computer2/med_rec.dm index 0f510da7b8..92e42e19e1 100644 --- a/code/unused/computer2/med_rec.dm +++ b/code/unused/computer2/med_rec.dm @@ -191,7 +191,7 @@
Possible Cure: Inaprovaline
Affected Species: Human and Monkey
-
Notes: With this disease the victim will need plasma to breathe. +
Notes: With this disease the victim will need phoron to breathe.

Severity: Major"} if("dna") diff --git a/code/unused/mining/datum_processing_recipe.dm b/code/unused/mining/datum_processing_recipe.dm index c9331cf072..3d6b9ca903 100644 --- a/code/unused/mining/datum_processing_recipe.dm +++ b/code/unused/mining/datum_processing_recipe.dm @@ -18,6 +18,6 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( new/datum/material_recipe("Gold",list(/obj/item/weapon/ore/gold),/obj/item/stack/sheet/mineral/gold), new/datum/material_recipe("Silver",list(/obj/item/weapon/ore/silver),/obj/item/stack/sheet/mineral/silver), new/datum/material_recipe("Diamond",list(/obj/item/weapon/ore/diamond),/obj/item/stack/sheet/mineral/diamond), - new/datum/material_recipe("Plasma",list(/obj/item/weapon/ore/plasma),/obj/item/stack/sheet/mineral/plasma), + new/datum/material_recipe("Phoron",list(/obj/item/weapon/ore/phoron),/obj/item/stack/sheet/mineral/phoron), new/datum/material_recipe("Bananium",list(/obj/item/weapon/ore/clown),/obj/item/stack/sheet/mineral/clown), ) \ No newline at end of file diff --git a/icons/obj/doors/Doorplasma.dmi b/icons/obj/doors/Doorphoron.dmi similarity index 100% rename from icons/obj/doors/Doorplasma.dmi rename to icons/obj/doors/Doorphoron.dmi diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 626af845c1..10c2f1a326 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index dba0bf3dfa..7b7f9a2371 100644 Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi index 8c7c88b689..debd1b13d0 100644 Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi index 501c4881c4..31333372f4 100644 Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index b33672160f..6d81d8b803 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -5289,6 +5289,7 @@ "bXK" = (/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bXL" = (/obj/machinery/door/firedoor,/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper) "bXM" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/turf/simulated/floor,/area/assembly/chargebay) +"bXN" = (/obj/structure/table/reinforced,/obj/item/stack/sheet/mineral/phoron,/obj/item/stack/sheet/mineral/phoron,/obj/item/stack/sheet/mineral/phoron,/obj/item/stack/sheet/mineral/phoron,/obj/item/stack/sheet/mineral/phoron,/obj/item/stack/sheet/mineral/phoron,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bXO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bXP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/asmaint) "bXQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -5541,12 +5542,15 @@ "ccD" = (/obj/machinery/atmospherics/pipe/simple/visible/green,/turf/simulated/floor{dir = 10; icon_state = "escape"},/area/atmos) "ccE" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics_cloning) "ccF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics_cloning) +"ccG" = (/obj/structure/closet/crate,/obj/item/stack/sheet/mineral/phoron{amount = 25},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/plating,/area/engine/storage_hard) "ccH" = (/obj/machinery/atmospherics/valve/digital{dir = 2; name = "N2O Outlet Valve"; pipe_color = "yellow"},/turf/simulated/floor{icon_state = "escape"; dir = 6},/area/atmos) "ccI" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "n2o_in"; name = "Nitrous Oxide Supply Control"; output_tag = "n2o_out"; sensors = list("n2o_sensor" = "Tank")},/turf/simulated/floor{dir = 7; icon_state = "escape"},/area/atmos) "ccJ" = (/obj/machinery/atmospherics/pipe/simple/visible/green,/obj/machinery/camera{c_tag = "Atmospherics South West"; dir = 1},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/atmos) "ccK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/virology) "ccL" = (/obj/machinery/atmospherics/valve/digital{dir = 2; name = "Plasma Outlet Valve"; pipe_color = "yellow"},/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/atmos) +"ccM" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/item/stack/sheet/mineral/phoron{amount = 5; layer = 2.9},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) "ccN" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "tox_in"; name = "Toxin Supply Control"; output_tag = "tox_out"; sensors = list("tox_sensor" = "Tank")},/turf/simulated/floor{icon_state = "warning"},/area/atmos) +"ccO" = (/obj/structure/dispenser{phorontanks = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/engine/engine_eva) "ccP" = (/obj/structure/sign/securearea{pixel_x = -32; pixel_y = 0},/obj/machinery/shower{icon_state = "shower"; dir = 4},/turf/simulated/floor{dir = 8; icon_state = "warnwhite"},/area/toxins/xenobiology) "ccQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) "ccR" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/junction{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) @@ -5852,7 +5856,6 @@ "ciH" = (/turf/simulated/floor/airless{icon_state = "white"},/area/medical/reception) "ciI" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "xenobio2"; name = "Containment Blast Doors"; opacity = 0},/obj/machinery/door/window/northleft{base_state = "right"; dir = 8; icon_state = "right"; name = "Containment Pen"; req_access_txt = "55"},/turf/simulated/floor/engine,/area/toxins/xenobiology) "ciJ" = (/obj/structure/stool/bed/chair{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) -"ciK" = (/obj/structure/closet/crate,/obj/item/stack/sheet/mineral/plasma{amount = 25},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/plating,/area/engine/storage_hard) "ciL" = (/obj/machinery/power/apc{dir = 8; name = "Engineering Hallway APC"; pixel_x = -25; pixel_y = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor,/area/engine/hallway) "ciM" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor,/area/engine/hallway) "ciN" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) @@ -5867,7 +5870,6 @@ "ciW" = (/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{tag = "icon-manifold (NORTH)"; icon_state = "manifold"; dir = 1},/turf/simulated/floor,/area/atmos) "ciX" = (/obj/machinery/atmospherics/binary/pump{dir = 4; icon_state = "intact_off"; name = "O2 to Pure"; on = 0},/turf/simulated/floor,/area/atmos) "ciY" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{tag = "icon-intact (SOUTHEAST)"; icon_state = "intact"; dir = 6},/obj/machinery/meter,/turf/simulated/floor,/area/atmos) -"ciZ" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/item/stack/sheet/mineral/plasma{amount = 5; layer = 2.9},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) "cja" = (/obj/structure/table,/obj/item/weapon/storage/box/monkeycubes,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) "cjb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor,/area/atmos) "cjc" = (/turf/simulated/floor{icon_state = "yellowfull"; dir = 8},/area/crew_quarters/sleep/engi) @@ -6277,7 +6279,6 @@ "cqQ" = (/obj/machinery/power/apc{dir = 4; name = "Engineering Locker Room APC"; pixel_x = 25; pixel_y = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/engine/locker_room) "cqR" = (/obj/structure/sign/fire{pixel_y = 32},/obj/structure/lattice,/turf/space,/area) "cqS" = (/obj/machinery/camera{c_tag = "Chemistry"; network = list("SS13")},/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = 30},/obj/machinery/chem_master,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) -"cqT" = (/obj/structure/table/reinforced,/obj/item/stack/sheet/mineral/plasma,/obj/item/stack/sheet/mineral/plasma,/obj/item/stack/sheet/mineral/plasma,/obj/item/stack/sheet/mineral/plasma,/obj/item/stack/sheet/mineral/plasma,/obj/item/stack/sheet/mineral/plasma,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "cqU" = (/obj/machinery/camera{c_tag = "Medbay Lobby Port"; network = list("SS13")},/obj/structure/stool,/turf/simulated/floor{tag = "icon-whiteblue (NORTH)"; icon_state = "whiteblue"; dir = 1},/area/medical/reception) "cqV" = (/obj/machinery/light{dir = 1},/obj/structure/stool,/turf/simulated/floor{tag = "icon-whiteblue (NORTH)"; icon_state = "whiteblue"; dir = 1},/area/medical/reception) "cqW" = (/obj/structure/closet/l3closet/scientist,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor{dir = 4; icon_state = "warnwhite"},/area/toxins/xenobiology) @@ -6304,7 +6305,6 @@ "crr" = (/obj/structure/shuttle/window,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/centcom/evac) "crs" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/door/airlock/engineering{name = "Engineering Washroom"; req_one_access_txt = "11;24"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1; layer = 2.4; name = "Engineering Firelock"},/turf/simulated/floor,/area/crew_quarters/sleep_male/toilet_male{name = "\improper Engineering Washroom"}) "crt" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "whiteyellow"},/area/crew_quarters/sleep_male/toilet_male{name = "\improper Engineering Washroom"}) -"cru" = (/obj/structure/dispenser{plasmatanks = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/engine/engine_eva) "crv" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/sign/pods,/turf/simulated/wall/r_wall,/area/engine/engine_eva) "crw" = (/obj/structure/rack{dir = 8; layer = 2.6},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig,/obj/machinery/light{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/southleft{name = "Engineering Hardsuits"; req_access_txt = "11"},/turf/simulated/floor,/area/engine/engine_eva) "crx" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/turf/simulated/floor,/area/hallway/primary/aft) @@ -11028,7 +11028,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdQbdQbdQbdQbdQbdQbdQbdQbdQbdQaaaaafbdRazTaxVbdSaCTbdUbdUbdUbdUbdUbdUbdVbdWaPBaXiaReaBPaCSaYyaYybdXbdYaYyaPEaPEaCUaPEbafbeabcObebaPEaBxaBtbalbecbedbbHbcQbeebalbbJbefbcSbcSbcSbegbehbarbeiaIOaYVaSFbekbgCbembenbeobepaRQbeqbaAbaBberbesbetbetbetbeubevbaBaCVbexbclbclbdpbeybdrbclaLfbaDbeAaIOaIOaNsbdubdvaZFaZFaZFaZFaZFaZFaZFbeBaZFaZFaZFaZFaZFaZFbeCaCYaCYaCYaCYaCYaCYaCZaCYaCYaCYaCYaCYaCYaCYaDlaDDaDCaDtaZFaZFaZFaZFaZFaBDaZFaZFaZFaZFaZFaZFaZFaZFaZFaZFaZFaZFbeIbdzbeJaSsaSsbcCaSsaSsbeKbeLaTMaTMaTNaJGaJGaJGaJGaJGaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdQbdQbdQbdQbdQbdQbdQbdQbdQbdQbdQaWEaWFbeMayWbeNbUVbePbePbeQbePbePbePbeRaPBaPBaPBaPBaBPaCSaZYbeSbeTbeUaYybeVbeWbUWaPEaPEaPEaPEbeYaPEaBxaBtbalbeZbbHbcQbfabfbbalbbJbarbfcbcSbcSbPhbfebarbffaIOaYVbUYbfhbgCbembfibfjbepaRQbfkbaAbflbfmbfnbetbfobetbdfbfpbfqaCVbfrbfsbftbfubfubfvbclbfwbaDcuRcuSaXNcvvcxRdPwdPxdTPdPxdPxdPxdPxdTQbSCdTSctbctbctaaZFaZFaZFaZFbfDaZFbfybfOaZFctcctectdbfIctfbfIbfIbfKdTUdTVdTWaZFaZFaZFaZFaZFbfObfPbfDaZFaZFaZFaZFaZFaZFaZFaZFaZFaZFaZFaZFbdzbfQbfRbfSbfTbfUbfVbbmbfWaafaaaaafaJGaJGaJGaJGaJGaJGaJGaJGaJGaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdQbdQbdQbdQbdQbdQbdQbdQbdQbdQbdQaYnavtaYnaxTbfXbePbfYbfZbgabgabgbbgcbgdbgebgebgebgebUibUubUrbUrbUtbUsbUrbUobUobUpbUobUnbUlbUlbUmbUlbUkbUObSTbUNbUHbUHbULbUCbSTbUybUBbgybcSbcSbPhbgzbgAbffaIOaYVbaAbgCbRcbdabdabdabdaaRQbgEbaAbaBbgFbgGbgHbgIbgJbgGbgKbaBaCVbURbUQbgNbgObgPbgQbgRbgSbaDcsoaHfaHfbgUbgUbgUbgUbgUbgUbgUcmTcmTcsUcsVcsrcsscsVcsUcmTcmTcmTckbckbckbckbckbbhbbhbbRqbhbbhbbhbbhbbhbbktcsXbxbcsYcsZaZFbhkbhkbhlbhlbhlbhlbhlbhmbhnbhnbhobhnaZFbhnbhobhnbhnbhpbhqbhqbhqbhqbhrbhgaPtaPtaPtaaaaaaaaaaJGaJGaJGaJGaJGaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdQbdQbdQbdQbdQbdQbdQbdQbdQbdQbdQaZLaZMbeMayWbhsbePbhtbePbhubhvbePbePbePaRebhwbhxbhxbTHaYyaZYbhzbcJbhAaYybUabTZbTTbTSbTVbTUbTXbTWbTYbTXbTMbTNbTObTPbTObTObTQbTRbTJbTKbhSbcSbcSbTLbhUbhVbffaIObhWbaAbhXbaAbhZbQKbibbicbPTbaAbaAbaBbiebifbigbihbiibijbikbaBaCVbTybimckrbiobipbgQbclbiqbaDaZoaIObirbgUcqlcqncqScqTcrDcrGcrMcsncqUcqVcrAcrBcogcofcpscoYcmTcmIcnrcmUcpMckbcqkcpNcpzcptcpLcktcktclSbktcggbiSbiScksbiSbiUbiUbhlbiVbiWbiXbhlbiYbiZbiYbhlbhmbhnbhpbhqbjabjbbjabhqbjcbjdbhqbjebjfbjgbhgaaaaaaaaaaaaaJGaJGaJGaJGaJGaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdQbdQbdQbdQbdQbdQbdQbdQbdQbdQbdQaZLaZMbeMayWbhsbePbhtbePbhubhvbePbePbePaRebhwbhxbhxbTHaYyaZYbhzbcJbhAaYybUabTZbTTbTSbTVbTUbTXbTWbTYbTXbTMbTNbTObTPbTObTObTQbTRbTJbTKbhSbcSbcSbTLbhUbhVbffaIObhWbaAbhXbaAbhZbQKbibbicbPTbaAbaAbaBbiebifbigbihbiibijbikbaBaCVbTybimckrbiobipbgQbclbiqbaDaZoaIObirbgUcqlcqncqSbXNcrDcrGcrMcsncqUcqVcrAcrBcogcofcpscoYcmTcmIcnrcmUcpMckbcqkcpNcpzcptcpLcktcktclSbktcggbiSbiScksbiSbiUbiUbhlbiVbiWbiXbhlbiYbiZbiYbhlbhmbhnbhpbhqbjabjbbjabhqbjcbjdbhqbjebjfbjgbhgaaaaaaaaaaaaaJGaJGaJGaJGaJGaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdQbdQbdQbdQbdQbdQbdQbdQbdQbdQaaaaaaaMYbbnaPybjhbePbjibePbjjbjkbjlbSjbePbjnaRebjoaRebTjaYyaYyaYyaYyaYyaYybTAbjrbjsaRebjtbalbalbalbTzbalbalbalbjvbalbalbalbalbjwbTCbTDbjzbcSbcSbPhbkNbgAbffaIObjBbaAbjCbaAbaAbTtbaAbaAbTkbaAbTmbTlbjGbjHbbXbjIbbXbjJbjKbTvbTxbTybjNbclbjObjPbgQbjQbjRbaDaZoaIOaIOcgQcglcgPcgjcgkchOciichMchNchochocgRcgScjtcjpciHciEciDciCciBciAckcckbcjDcgecjwcgecjvcjucgecgfbktcggbiSbkwcfKcgdbkzbkAbkBbkCbkDbkCbTEbkFbkGbkHbhlbkIbkJbkKbhqbkLbkMbqhbkObkPbkQbhqbkRbkSbkTbhgaaaaaaaaaaaeaJGaJGaJGaJGaJGaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazQasSbcFaAFaZMaTPaTPaTPbkUaTPbkVayWaxTaxTbePbkWbkXbkYbkZblablbblcbldbldbldbldbXnbWDbWDbWDbTXbTXbTXbWCblhblhblhblibalbljblkbWEblmblnbloblpblqblrblsbltblubVHbWAbWBbSWbTdbWwbWxbWxbXhbEvbXgbXmbWXbWXbWUbVAbXmbXlbXkbXjbXibTvbTvbTvbTvbWHbTvbTvbTvbTvbWFbWGbWQbWSbWObWPbWKbWNbVzbaDblZaIOaIObgUdVHdVIdVJdVKdVEbOIdVFdVGcjtcjtcjtcjtcjtcjpdVzdVydVBdVAdVDdVCdVuckbdVwdVvdVxcgecjvcjucgedVLbktcggdVNbYedVMbYbbXHbXMbXFbXGbXGbXGbXUbXWbXAbXzbXybXxbXEbXDbXCbXBbmLbkPbmMbmNbmObhqbmPbkSbmsbhgaaaaaaaaaaaaaaaaJGaJGaJGaJGaJGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmQbmRavtaYnawYawYawYaPyaxTaxTbePbmSbmTbkZbmUbePbePbePaPBbmVbmWbmXbmYbmXbmXbmXbmYbmXaPBaPBbalbalbalbmZbalblpblpbnablpblpblpblpblpbnbbncbndbnebWebWdbWdbWdbWabWcbVYbVZbWjbWibWnbUPbWfbWfbWhbWgbWqbWpbWsbWrbWobnxbnybnzbnAbnBbnCbnzbnDbnxbPVbTybnFbnGbnFbaDbaDbaDbVsbaDdUZaIOaIOcgQcglcgPdVadVbdUUbgUdUSdUTdUXdUYdUVdUWdVndVmdVldVkcmTdVpdUEdVodVfdVedVddVcdVjdVidVhdVgdVidVqbUedVrdVsdTXbnYdTYboabobbocbodboebofbofbogbkCbohbhlbWvbojbokbhqbolbombonboobopboqbhqbmPbkSborbhgaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -11058,7 +11058,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafbxkbwYbptbwTbwCbqmbwqbwrbwsccgbzSbzVccgccgbAlbAmbAnbAhbAibAjbAkbYpbyNbyRbyObyxbyJbyMbyLbzDbyJbyJbyybzpbznbzAcjcbfNbkabqZbqZbqZbqZbywbqZbqZbqZbysbyrbiDbyvbqJbytbtDbiDbylbynbyqbwUbmwbtybmwbiKbwWbwXbiGbyibwZbyhbwFbwEbwQbwPbwRbwRbwRbwVbhCbhCbhDbhCbhCbhCbhCbyubxEbhCbxQbxSbyabyjbykbyobxAbxBbxAbxCbxDbxAbxAbxAbxAbxAbxzbxybxxbVNbVObyVbyVbyVbyVaaaaafaaaaaaaaaanmanmanmaafaaaaaaaafaaaaaaaafaaaaaabJcbEPbHybEPbEPbGnbGnbGnbGnbGnbGnbGnbEPbEPaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafbpsbpsbptbpvbpubqmbqqbpwbpPccgbqvbqsbqubqCbqDbqwbqBbqObqQbqIbqKbqVbqUbqTbqSbstbrMbrGbribsdbsebsdbsvbsubsjbjpbshbfNbkabqZbqYbqWbqRbqXbqWbqMbqLbqPbqNbpxbppbqJbqJbsmbiDbsnbsobsibwUbmwbmxbmvbiKbsfbsgbiGbrObrVbsbbiGbssbidbvKboNbnHbmzbmyboJboGboibnRbnKbnEbnEbnwbprbnEbnEbpqbpgbplbpabpabpebpfbpbbngbpabnjboZbnhbnhbngbnjbnibAEbnkbnmbnlbWWbnfbWYbWZbXabXabXabXabXabXabXabXabXabXabXabXabXabXabXabXabXbbXcbXcbXdbEPbEPbGnbGnbXebGnbGnbEPbEPaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaafaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabSFbSFbSFbSFbSFbSFbSFbsqbsrccgccgccgccgccgbukbuAbuKbuKbuKbuMbuNbYpbjqbjxbtsbjybttbtxbtubtEbtCbtGbfNbtVbtHbtYbtWbfNbtRbtQbtPbtObtObtNbtMbtLbqZbspbscbiDbtIbtFbqJbtDbiDbtAbtBbtzbwUbmwbsabqHbiKbszbsAbiGbiGbiGbiGbiGbssbidbidbidbyBcmHbPybGKbXObXPbXQbGKbGKaaaaaaaaaaaabXRbXSbTrbtlbHkbtrbTnbthbTpbTqbsLbjmbSkbIEbIEbShbHkbyVbXVbswbXXbyVbyVbyVbyVaaaaafaaaaaaaaaanmanmanmaafaaaaaaaafaaaaaaaafaafaafbXYbXZbYabHzbEObEPbEPbGnbGobGnbEPbEPaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaafaafaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafbSFbSGcnjcngcnhcnQbSFdTRdRNcrvcrucsWcrwcqwcqwcqxcnEcnEcnDcnFbAkbYpbjqbjxcnCbwMcnzcnAcnBcnwcnxcnybfNbtVcnpcnqdTTbfNbkabqZdZLdZOdZOdZMdZNbqZdYtdZPdZQbiDdZTdZRdZSdZHbiDdZGbtBdZIbwUdWcdVtdWlbiKdZKdZJbiKbPxbPwbiddZUbssdZVdZWbidbyBdWwdXGbGKaaaaafaaaaaaaafaaaaaaaaaaaabYQbYRcolcokdPAcrRdPDcombTqdPPconcrfbIEbIEbIEdQRbHkbYUbYUcoebYWbYUaaaaaaaaaaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafbYXbEMbEMbENbEObEObEPbEPbEPbEPbEQaafaafaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaafaafaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafbSFbSGcnjcngcnhcnQbSFdTRdRNcrvccOcsWcrwcqwcqwcqxcnEcnEcnDcnFbAkbYpbjqbjxcnCbwMcnzcnAcnBcnwcnxcnybfNbtVcnpcnqdTTbfNbkabqZdZLdZOdZOdZMdZNbqZdYtdZPdZQbiDdZTdZRdZSdZHbiDdZGbtBdZIbwUdWcdVtdWlbiKdZKdZJbiKbPxbPwbiddZUbssdZVdZWbidbyBdWwdXGbGKaaaaafaaaaaaaafaaaaaaaaaaaabYQbYRcolcokdPAcrRdPDcombTqdPPconcrfbIEbIEbIEdQRbHkbYUbYUcoebYWbYUaaaaaaaaaaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafbYXbEMbEMbENbEObEObEPbEPbEPbEPbEQaafaafaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaafaafaafbTebTebTebTebTebTebTebTebTebTebTebTebTeaaaaaacmobSGbSGbSGbSGcmAbSFcpTcpSbvqcpIcpGcoLcpFcoLcoKcmscmrcmqcmpbAkbLjcmFcmCcmDbgXbgXbgXbgXbgXbgXbgXbfNbfNcmBbfNbfNbfNbkabqZbqZdZrdZsdZtdZubqZdZvdZwdZxbiDbkdbiDbiDbiDbiDbwUdZydZzbwUcpVcpUcpVbiKdZCdZBbiKbPybPybiddZDbssbidbidbidbyBcpWcmNbGKaaaaafaaaaaaaafaaaaaaaaaaaabZPbZQcjWcmXcmWcmVcnacmZcmYcmYcnecndcnbdPHbIEcqebHkbYUbZTcmGbZVbYUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaaaaaaaaaaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaaabTecnScqacnSbTecnOcpYcnObTecnMcpZcnMbTeaaaaaacphbSGcpXbSGbSGcpRbSFdYBdYAdYDdYCdYGdYEdYxdYvdYzcpHcpHcpJcpHcpKcpAdRMbjxcpCcpDcpucpucpEcpucpucoMcpvcpwcpxcpyeaqcoMbkabEaeaxbMXbMXeaveaweaDeaEeaBeaCeazeaAeayeaeeaeeaudXBbwUbwUbwUeatbslbskbiKbiKbiKbiKbPybPybidbssbsseareasbidbyBbGKbGKbGKaaaaafaaaaaaaafaaaaaaaaaaaacaucavcqdcqcdPYcqgcqjcpmbTqbTqdQadPZbIEbIEbIEdQTbHkbYUcaycqbcaAbYUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaaabTecnScnRcnSbTecnOcnPcnObTecnMcnNcnMbTeaaaaaacphbSGbSGbSGcpicoIcoHdYgdYfbvqdYudYmdYhdYedXIdXHcoycoEcoDcoCbAkbYpcpdcpbcpccpgcpfcpecpfcoOcoWcoMcoNcoZcpacoXdZZcoMbkabEaeabbMXbOsbMXeaaeageaheaieajeaceadeaeeafeaeeandXBdXEdYLeakeamealeapeakdYLdYLdYLdYLeaobidbidbidbidbidbidbyBbGKaafaafaafcbfaafaafaafaafaafaafaafcbgbXRcplcpkdPTdPSdPScpmbTqdPPdPVcrpbIEbIEbIEdQSbHkbYUcbjcpjcblbYUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -11068,10 +11068,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaafcsgclgcshclgcshclgccWclgccUclgccWclgccUclgccVbQGbQGbQGbQGbQGbQGbQGbQGcrPcrOcrUcrTcrSdTAdTNdTMdTLchBcsacrZcrYchBcaTchwchtcaOcsdcsecsbcscchhcaPcaOcpQcpQcsfclLclLcjXbkabEabEaebxebybEabEabEaebvdXXebwdXBdXBdXBebuebCdXBdXBbyBcpqdXFdYWdYcdYddXFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaafaafbXRcePceQcePceRceSbZQcsmcdVcskcslcskbXRbXRaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaafaaaceWaaaaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafcbMbSZcgtcgrcgqcgAcgGchrcgFbSZcgDcgBcgCcgAbSZcgycgzcgwcgxcgucgvcilchachgchfcgYcgXcgZchDcijchJcikcgUcgIcgHcgKcgJchjchkchlcaOcaPcaPcaPcaPchhchicaOcoVcoVcoVclLclLcjXdXUdXTbEadXWdXKdXLdXVbEadXZdXXdXYdXBdYadXRdXSdYbdXBbPybyBcpqdXFcmucmtcmvdXFaaaaaaaaaaaaaaaaaaacTcmweaVcmxacTaafaaaaaaaaaaaabXRcePcePcePcfNcfOcdTcgmcfQcgncgpcgocfUbXRaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaafaaacfVaaaaafaafaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaafcfqcfpcfmcbDcfmcbDcfmcbDcfocbDcfmcbDcfncbkcbkcbkcflbSZbSZcfkbSZcgccbkcgbcgacfZcfTcfSchDchCchbcgWcfJcfGcfFcfAcfzcducfycfxcaOcfwcfvcfvcfvcftcfucaOcfscfgcfgcfgcfrcjXbGKbkabEadXJdXKdXLdXLdXMdXNdXOdXPdXQdXRdXRdXSdXCdXBdXEdXDbGKeaQdXFccYdXFeaQaaaaaaaafaaaaaaaaaacTceVceuceTacTaafaafaaaaaaaaabXRcdVcdVcdVcdVcgVbZQcffcfecfdcfjcficfhbXRaaaaaaaaaaaaaaachcchcchcchdaafaafaafaafcfVaafaafaafaafaafampchcchcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaafaafaafcbMciccibbSZcibciYchYciXciabSZcibbSZbSZbSZbSZbSZciUcbkciWciVcbkciqcipciscirciucitciwdRUcrXcrWcsEchBcincimciochBciLciMciQciRciSciSciTciTchqcixcaOciycfgcizcfgciKcjXbGKbkabEadYodYpdXLdYnbEadYtdYsdYtdXBdYrdXRdYqdYwdXBbyBbGKbGKdXFcoAcozcoFdXFacTacTcoBacTacTacTbVucsjbXKcbdbVuacTacTcodaaaaaabXRcdOcdPcdQchPchQcdTcifcihcigciebZQchVbXRaaaaaaaaaaaaaaachcaaaaafaaaaafaaaaaaaaachWaaaaafaafaaaaaaaaaaaachcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaafaafaafcbMciccibbSZcibciYchYciXciabSZcibbSZbSZbSZbSZbSZciUcbkciWciVcbkciqcipciscirciucitciwdRUcrXcrWcsEchBcincimciochBciLciMciQciRciSciSciTciTchqcixcaOciycfgcizcfgccGcjXbGKbkabEadYodYpdXLdYnbEadYtdYsdYtdXBdYrdXRdYqdYwdXBbyBbGKbGKdXFcoAcozcoFdXFacTacTcoBacTacTacTbVucsjbXKcbdbVuacTacTcodaaaaaabXRcdOcdPcdQchPchQcdTcifcihcigciebZQchVbXRaaaaaaaaaaaaaaachcaaaaafaaaaafaaaaaaaaachWaaaaafaafaaaaaaaaaaaachcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaafaafaaaaaacbMciccibbSZcidchUchXchHchGchHchYchZciachLchHchHchRchHchSchTchHchIchIchHchGcfTchKbWlcrVcrQckLcivchBchFchBchBchBchvchwchtchuchzchAchxchychqdypcaOchpcfgchscfgcfgcjXbGKbkabEabEadYibEabEabEadYkbtSdYldXBdXBdXBdYjdXBdXBbyBbGKaaabVucnGdYFdYycaZcoccnLcnIcnHcnKcnJbVudWFbXKdWLbVucmzcmyacTaafaafbXRcePcePcePciIceSbZQciJchnchmcgsbZQciNbXRbXRbXRbXRaaaaaachcaaaciOciOciOciOciOaafciPaafciOciOciOciOciOaaachcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaaacbMciccidchHchHchHchHchHchGchHchHchHchGchYckockmcknckkcklckhckickwckwckickGbSZckpckvclqckMdTzckNckHckIckHckKckJckHckQckRckSckOckPckPckPckVckPckWckXckTckUclHclHcjXbGKdYMdYNdYQdYRdYOdYPdYLdYLdYKdYLdYLdYLdYLdYLdYLdYUdXDbGKaaacaZdZqbsxdZpcaZdZodZnbXKbXKdZmcbbdZkdWqdZldWsdZjbXKbXKbVuaaaaaabXRcePcePcePchPcjxcdTcjyckeckdckgckfckfdYXcjEcjFbXRaafaafchcaafcjGcjHcjHcjHcjHcjIciPcjJcjKcjKcjKcjKcjLaafchcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaactvctvctvctvctvctvctvctvctvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaaacbMcjlbSZbSZcjjcjbcjbcjbcjdcjbcjbcjbcjdcjbcjbcjhcjicjecjdcjfcjgcjScjRcjbcjQcjPcjOcjCcjBckqcjZcjYcjqcjVcjUcjTcjqcjqcjrcjncjocjmcjkcjkckacjkcjkcjAcjscjscjzclHclHcjXbGKbfMbTBbTBbTBbTBdYHbTBbTBbTBbTBbPybPybGKbGKbGKbGKbGKbGKaaacaZdXmdZicaZcaZdZhdZgdZddZcdZfdZedZadZbcspcsqdYZbXKdYYbVuaaaaaabXRcdVcdVcdVcdVckubZQciJcjaciZcgsbZQbZQckxbZQckybXRaaaaaachcaafckzckzckzckzckzaaaciPaaackzckzckzckzckzaafchcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaactvctvctvctvctvctvctvctvctvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaaacbMcjlbSZbSZcjjcjbcjbcjbcjdcjbcjbcjbcjdcjbcjbcjhcjicjecjdcjfcjgcjScjRcjbcjQcjPcjOcjCcjBckqcjZcjYcjqcjVcjUcjTcjqcjqcjrcjncjocjmcjkcjkckacjkcjkcjAcjscjscjzclHclHcjXbGKbfMbTBbTBbTBbTBdYHbTBbTBbTBbTBbPybPybGKbGKbGKbGKbGKbGKaaacaZdXmdZicaZcaZdZhdZgdZddZcdZfdZedZadZbcspcsqdYZbXKdYYbVuaaaaaabXRcdVcdVcdVcdVckubZQciJcjaccMcgsbZQbZQckxbZQckybXRaaaaaachcaafckzckzckzckzckzaaaciPaaackzckzckzckzckzaafchcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaactvctvctvctvctvctvctvctvctvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaachdaaaaaaaaaaaacbMcicbSZbSZbSZbSZbSZbSZcmmbSZbSZbSZcmmbSZbSZcmmcicbSZcmmcidcmnclTcaiclUcljcbsclVbSZbSZcbXcpBbQGbQGbQGbQGclXclrcaTcaSccsciRclYcaPcmbcmjcaPcmkcaOcqicmlcfgcqGcencjXbPybfMbTBbhNbhMbhLbYhbhKbhQbhPbTBbSabhObGKaaaaaaaaaaaaaaaaaabVudWhdWidWkcoJdWjcsidWndWodWmcsTcsQdWdcsRdWedWfbVudWgbVuaaaaaabXRcdOcdPcdQcllchQcdTclmckZclRclOclNclQclPclMclsbXRaaaaaachcaaaaafaaaaafaafaafaaaciPaaaaafaaaaafaaaaafaaachcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaactvctvctvctvctvctvctvctvctvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaaacbMcicbSZbSZclKckickickiclBckickickiclBckickiclDclGckiclIckiclJclhcljcliclhclnclnclnclnclWclpclockiclAclzclxclrclbcdzccsclacldcaPcaPclccaPclecaOcqhcqhclfcqGcencjXbPybfMbTBbvhbvibVTbVSbvmbVSbvbbTBbTfbvgbGKaaaaaaaaaaaaaaaaaabVudWtdWudWvcoGdWxdWydWzdWAdWqdWBcgidWrdWqdWpdWsbVubVubVuaaaaaabXRcePceQcePcmaceSbZQbZRckZckYcmJbZQcmccdVcdVcdVbXRaaaaaachcaaaciOciOciOciOciOaafciPaafciOciOciOciOciOaafchcaaaaaaaaaaaaaaaaaaaaaaaacmdaaaaaaaaacmdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaactvctvctvctvctvctvctvctvctvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalQaaaaaaaaaaaacbMcbJcbKcbDcbIcbDcbHcbDcbGcbDcbFcbDcbEcbDcbDcbCcbBcbAcbzcbwcbvcbscbubSZcbmcbmcbqcbrcbrbSZcbhcbicbkcaVcaVcaXcaYcaTcaScaUcaOcaQcaPcaRcaPcaNcaMcaOcjXcjXcjXcjXcjXcjXbPybfMbTBbyGbyIbvibYgbvibVSbyFbTBbyEbUjbGKaaaaaaaaaaaaaaaaaabVudWDdWEcaZcaZdWHdWIdWGcgTdWFbXKdWLdWMdWFbXKdWLbVubWTbWTaaaaaabXRcePcePcePcllcmEcbRcbScbTcbUcmJbZQcmJbZQcmKbZQbYQaafaafchcaafcjGcjHcjHcjHcjHcjIciPcjJcjKcjKcjKcjKcjLaafchcaaaaaaaaaaaaaaaaaaaaaaaacmdcmdcmdcmdcmdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index 3a2dff64f7..5101d072b2 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -380,10 +380,10 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{:~string('{1}%', aircontents.carbon_dioxide > 5 ? 'bad' : 'good' , aircontents.carbon_dioxide)}}
- Plasma: + phoron:
- {{:~string('{1}%', aircontents.plasma > 0 ? 'bad' : 'good' , aircontents.plasma)}} + {{:~string('{1}%', aircontents.phoron > 0 ? 'bad' : 'good' , aircontents.phoron)}}
{{if aircontents.other > 0}}