Changes most viable, used entries of plasma with phoron.

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"

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)]&deg;C"

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()

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)
+	//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 plasma slightly differently because it's the default wall type
+	//treat phoron slightly differently because it's the default wall type
-	var/mineral = pick("uranium","sandstone","gold","iron","silver","diamond","clown","plasma")
+	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")
+		if(mineral != "phoron")
-			T.icon_state = replacetext(T.icon_state, "plasma", mineral)
+			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"

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")
+		trap_type = pick(50;"thrower","sawburst","poison_dart","flame_burst",10;"phoron_gas",5;"n2_gas")
-		if( (trap_type == "plasma_gas" || trap_type == "n2_gas") && prob(10))
+		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")
+		if("phoron_gas")
-			//spawn a bunch of plasma
+			//spawn a bunch of phoron
 		if("n2_gas")
 			//spawn a bunch of sleeping gas
 		if("thrower")

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_turfs.dm

@@ -174,5 +174,5 @@
 	desc = ""
 	density = 1
 	icon = 'icons/turf/walls.dmi'
-	icon_state = "plasma0"
+	icon_state = "phoron0"
-	var/mineral = "plasma"
+	var/mineral = "phoron"

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"

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
+	//hack in some stuff to remove phoron 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
+	//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)
+		phoron_captured.toxins = round(gas_covered.toxins * transfer_ratio)
-		//world << "\blue[plasma_captured.toxins] moles of plasma captured"
+		//world << "\blue[phoron_captured.toxins] moles of phoron captured"
-		plasma_captured.temperature = gas_covered.temperature
+		phoron_captured.temperature = gas_covered.temperature
-		plasma_captured.update_values()
+		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)
+	if(mega_energy > 0 && held_phoron.toxins)
-		var/heat_capacity = held_plasma.heat_capacity()//200 * number of plasma moles
+		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 there is too much phoron in the field, lose some
-	/*if( held_plasma.toxins > (MOLES_CELLSTANDARD * 7) * (50 / field_strength) )
+	/*if( held_phoron.toxins > (MOLES_CELLSTANDARD * 7) * (50 / field_strength) )
 		LosePhoron()*/
-	if(held_plasma.toxins > 1)
+	if(held_phoron.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)
+		//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
+		var/datum/gas_mixture/phoron_lost = new
-		plasma_lost.temperature = held_plasma.temperature
+		phoron_lost.temperature = held_phoron.temperature
 		//
-		plasma_lost.toxins = held_plasma.toxins * loss_ratio
+		phoron_lost.toxins = held_phoron.toxins * loss_ratio
-		//plasma_lost.update_values()
+		//phoron_lost.update_values()
-		held_plasma.toxins -= held_plasma.toxins * loss_ratio
+		held_phoron.toxins -= held_phoron.toxins * loss_ratio
-		//held_plasma.update_values()
+		//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_phoron.toxins = 0
-		//held_plasma.update_values()
+		//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)
 	//

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
+the field is constantly pulling in phoron 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
+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
 
 */
 

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"

code/WorkInProgress/Mini/atmos_control.dm

@@ -332,7 +332,7 @@ table tr:first-child th:first-child { border: none;}
 			var/list/gases = list(
 				"oxygen"         = "O<sub>2</sub>",
 				"carbon dioxide" = "CO<sub>2</sub>",
-				"plasma"         = "Toxin",
+				"phoron"         = "Toxin",
 				"other"          = "Other",
 			)
 			var/list/tlv

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)

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?",

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

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 )
 

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
+Separate gas into oxygen and phoron components
-Obtain plasma and oxygen tanks filled up about 50-75% with normal-temp gas
+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.
 

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)

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 <b>[key_name(user)] changed the global plasma/ZAS settings to \"[def]\"</b>"
+	world << "\blue <b>[key_name(user)] changed the global phoron/ZAS settings to \"[def]\"</b>"
 
 /pl_control/var/list/settings = list()
 

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
+				phoron_burn_rate = (temperature_scale*(oxygen/PLASMA_OXYGEN_FULLBURN))/4
-			if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY)
+			if(phoron_burn_rate > MINIMUM_HEAT_CAPACITY)
-				toxins -= plasma_burn_rate
+				toxins -= phoron_burn_rate
-				oxygen -= plasma_burn_rate*oxygen_burn_rate
+				oxygen -= phoron_burn_rate*oxygen_burn_rate
-				carbon_dioxide += plasma_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()

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"
 								)
 
 /*

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

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,
+	contains = list(/obj/item/weapon/tank/phoron,
-					/obj/item/weapon/tank/plasma,
+					/obj/item/weapon/tank/phoron,
-					/obj/item/weapon/tank/plasma,
+					/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/phoron,
-					/obj/item/weapon/tank/plasma,
+					/obj/item/weapon/tank/phoron,
-					/obj/item/weapon/tank/plasma,
+					/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" */

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

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/phoron_level = environment.toxins/total_moles
-					var/unknown_level =  1-(o2_level+n2_level+co2_level+plasma_level)
+					var/unknown_level =  1-(o2_level+n2_level+co2_level+phoron_level)
 					dat += "<ul>"
 					dat += "<li>Nitrogen: [round(n2_level*100)]%</li>"
 					dat += "<li>Oxygen: [round(o2_level*100)]%</li>"
 					dat += "<li>Carbon Dioxide: [round(co2_level*100)]%</li>"
-					dat += "<li>Phoron: [round(plasma_level*100)]%</li>"
+					dat += "<li>Phoron: [round(phoron_level*100)]%</li>"
 					dat += "</ul>"
 					if(unknown_level > 0.01)
 						dat += "OTHER: [round(unknown_level)]%<br>"

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"

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"]
+	current_settings = TLV["phoron"]
-	var/plasma_dangerlevel = get_danger_level(environment.toxins*partial_pressure, current_settings)
+	var/phoron_dangerlevel = get_danger_level(environment.toxins*partial_pressure, current_settings)
-	var/plasma_percent = round(environment.toxins / total * 100, 2)
+	var/phoron_percent = round(environment.toxins / total * 100, 2)
 
 	current_settings = TLV["other"]
 	var/other_moles = 0.0
@@ -746,7 +746,7 @@
 Pressure: <span class='dl[pressure_dangerlevel]'>[environment_pressure]</span>kPa<br>
 Oxygen: <span class='dl[oxygen_dangerlevel]'>[oxygen_percent]</span>%<br>
 Carbon dioxide: <span class='dl[co2_dangerlevel]'>[co2_percent]</span>%<br>
-Toxins: <span class='dl[plasma_dangerlevel]'>[plasma_percent]</span>%<br>
+Toxins: <span class='dl[phoron_dangerlevel]'>[phoron_percent]</span>%<br>
 "}
 	if (other_dangerlevel==2)
 		output += "Notice: <span class='dl2'>High Concentration of Unknown Particles Detected</span><br>"
@@ -757,7 +757,7 @@ Toxins: <span class='dl[plasma_dangerlevel]'>[plasma_percent]</span>%<br>
 
 	//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 += "<span class='dl2'>DANGER: Internals Required</span>"
 		if(1)
@@ -930,7 +930,7 @@ table tr:first-child th:first-child { border: none;}
 			var/list/gases = list(
 				"oxygen"         = "O<sub>2</sub>",
 				"carbon dioxide" = "CO<sub>2</sub>",
-				"plasma"         = "Toxin",
+				"phoron"         = "Toxin",
 				"other"          = "Other",)
 
 			var/list/selected

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)]&deg;C"

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

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))

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,

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'
+	icon = 'icons/obj/doors/Doorphoron.dmi'
-	mineral = "plasma"
+	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))
 	..()

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

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)

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,

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
 

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")
+		if("phoron")
-			type = /obj/item/stack/sheet/mineral/plasma
+			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)
+			if(src.resources["phoron"] >= 2000)
-				var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma(src.loc)
+				var/obj/item/stack/sheet/mineral/phoron/G = new /obj/item/stack/sheet/mineral/phoron(src.loc)
-				G.amount = round(src.resources["plasma"] / G.perunit)
+				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)
+		if(/obj/item/stack/sheet/mineral/phoron)
-			material = "plasma"
+			material = "phoron"
 		if(/obj/item/stack/sheet/metal)
 			material = "metal"
 		if(/obj/item/stack/sheet/glass)

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

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

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"

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"

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

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/phoron_level = environment.toxins/total_moles
-				var/unknown_level =  1-(o2_level+n2_level+co2_level+plasma_level)
+				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)]&deg;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)]&deg;C"

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)
+		if(phoron_concentration > 0.01)
-			user.show_message("\red Phoron: [round(plasma_concentration*100)]%", 1)
+			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)

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
 

code/game/objects/items/stacks/sheets/glass.dm

@@ -302,23 +302,23 @@
 /*
  * Phoron Glass sheets
  */
-/obj/item/stack/sheet/glass/plasmaglass
+/obj/item/stack/sheet/glass/phoronglass
-	name = "plasma glass"
+	name = "phoron glass"
-	desc = "A very strong and very resistant sheet of a plasma-glass alloy."
+	desc = "A very strong and very resistant sheet of a phoron-glass alloy."
-	singular_name = "plasma glass sheet"
+	singular_name = "phoron glass sheet"
-	icon_state = "sheet-plasmaglass"
+	icon_state = "sheet-phoronglass"
 	g_amt = 7500
-	origin_tech = "materials=3;plasma=2"
+	origin_tech = "materials=3;phoron=2"
-	created_window = /obj/structure/window/plasmabasic
+	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
+/obj/item/stack/sheet/glass/phoronrglass
-	name = "reinforced plasma glass"
+	name = "reinforced phoron glass"
 	desc = "Phoron glass which seems to have rods or something stuck in them."
-	singular_name = "reinforced plasma glass sheet"
+	singular_name = "reinforced phoron glass sheet"
-	icon_state = "sheet-plasmarglass"
+	icon_state = "sheet-phoronrglass"
 	g_amt = 7500
 	m_amt = 1875
-	origin_tech = "materials=4;plasma=2"
+	origin_tech = "materials=4;phoron=2"
-	created_window = /obj/structure/window/plasmareinforced
+	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)

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
+/obj/item/stack/sheet/mineral/phoron
-	name = "solid plasma"
+	name = "solid phoron"
-	icon_state = "sheet-plasma"
+	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 ( \
+var/global/list/datum/stack_recipe/phoron_recipes = list ( \
-	new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
+	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)
+/obj/item/stack/sheet/mineral/phoron/New(var/loc, var/amount=null)
-	recipes = plasma_recipes
+	recipes = phoron_recipes
 	pixel_x = rand(0,4)-4
 	pixel_y = rand(0,4)-4
 	..()

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

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

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 << "<span class='notice'>There appears to already be a plasma tank loaded in [src]!</span>"
+			user << "<span class='notice'>There appears to already be a phoron tank loaded in [src]!</span>"
 			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)]&deg;C"
@@ -146,9 +146,9 @@
 	if(user.stat || user.restrained() || user.lying)	return
 	user.set_machine(src)
 	if(!ptank)
-		user << "<span class='notice'>Attach a plasma tank first!</span>"
+		user << "<span class='notice'>Attach a phoron tank first!</span>"
 		return
-	var/dat = text("<TT><B>Flamethrower (<A HREF='?src=\ref[src];light=1'>[lit ? "<font color='red'>Lit</font>" : "Unlit"]</a>)</B><BR>\n Tank Pressure: [ptank.air_contents.return_pressure()]<BR>\nAmount to throw: <A HREF='?src=\ref[src];amount=-100'>-</A> <A HREF='?src=\ref[src];amount=-10'>-</A> <A HREF='?src=\ref[src];amount=-1'>-</A> [throw_amount] <A HREF='?src=\ref[src];amount=1'>+</A> <A HREF='?src=\ref[src];amount=10'>+</A> <A HREF='?src=\ref[src];amount=100'>+</A><BR>\n<A HREF='?src=\ref[src];remove=1'>Remove plasmatank</A> - <A HREF='?src=\ref[src];close=1'>Close</A></TT>")
+	var/dat = text("<TT><B>Flamethrower (<A HREF='?src=\ref[src];light=1'>[lit ? "<font color='red'>Lit</font>" : "Unlit"]</a>)</B><BR>\n Tank Pressure: [ptank.air_contents.return_pressure()]<BR>\nAmount to throw: <A HREF='?src=\ref[src];amount=-100'>-</A> <A HREF='?src=\ref[src];amount=-10'>-</A> <A HREF='?src=\ref[src];amount=-1'>-</A> [throw_amount] <A HREF='?src=\ref[src];amount=1'>+</A> <A HREF='?src=\ref[src];amount=10'>+</A> <A HREF='?src=\ref[src];amount=100'>+</A><BR>\n<A HREF='?src=\ref[src];remove=1'>Remove phorontank</A> - <A HREF='?src=\ref[src];close=1'>Close</A></TT>")
 	user << browse(dat, "window=flamethrower;size=600x300")
 	onclose(user, "flamethrower")
 	return

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)
 

code/game/objects/items/weapons/manuals.dm

@@ -87,7 +87,7 @@
 
 			<center><b>Notes on starting the basic function mode, dubbed .Heat-Primary Mode..</b></center></br></br>
 
-			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.</br></br>
+			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.</br></br>
 
 			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.</br></br>
 
@@ -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.</br></br>
 
-			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.</br></br>
+			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.</br></br>
 
 			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.</br></br>
 
-			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.</br></br>
+			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.</br></br>
 
 			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.</br></br>
 
@@ -131,18 +131,18 @@
 
 			*Radiation (which is converted into power by the collectors,)</br>
 			*Heat (which is removed via the gas exchange system and coolers,)</br>
-			*External gas (in the form of plasma and O2.)</br>
+			*External gas (in the form of phoron and O2.)</br>
 
-			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.</br></br>
+			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.</br></br>
 
-			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.</br></br>
+			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.</br></br>
 
 			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.</br></br>
 
 
 			Notes on Supermatter Containment and Emergency Procedures-</br></br>
 
-			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.</br></br>
+			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.</br></br>
 
 			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.</br></br>
 
@@ -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.
 
 				<h2>Protolathe</h2>
-				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.
 
 				<h1>Reliability and You</h1>

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"

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -94,15 +94,15 @@
 /*
  * Phoron
  */
-/obj/item/weapon/tank/plasma
+/obj/item/weapon/tank/phoron
-	name = "plasma tank"
+	name = "phoron tank"
-	desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
+	desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable."
-	icon_state = "plasma"
+	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))

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)]&deg;C"

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
 
 

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,

code/game/objects/structures/crates_lockers/crates.dm

@@ -375,12 +375,12 @@
 	icon_opened = "weaponcrateopen"
 	icon_closed = "weaponcrate"
 
-/obj/structure/closet/crate/secure/plasma
+/obj/structure/closet/crate/secure/phoron
-	desc = "A secure plasma crate."
+	desc = "A secure phoron crate."
 	name = "Phoron crate"
-	icon_state = "plasmacrate"
+	icon_state = "phoroncrate"
-	icon_opened = "plasmacrateopen"
+	icon_opened = "phoroncrateopen"
-	icon_closed = "plasmacrate"
+	icon_closed = "phoroncrate"
 
 /obj/structure/closet/crate/secure/gear
 	desc = "A secure gear crate."

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
+/obj/structure/falsewall/phoron
-	name = "plasma wall"
+	name = "phoron wall"
-	desc = "A wall with plasma plating. This is definately a bad idea."
+	desc = "A wall with phoron plating. This is definately a bad idea."
 	icon_state = ""
-	mineral = "plasma"
+	mineral = "phoron"
 
 //-----------wtf?-----------start
 /obj/structure/falsewall/clown

code/game/objects/structures/mineral_doors.dm

@@ -188,8 +188,8 @@
 		..()
 		opacity = 0
 
-/obj/structure/mineral_door/transparent/plasma
+/obj/structure/mineral_door/transparent/phoron
-	mineralType = "plasma"
+	mineralType = "phoron"
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
 		if(istype(W,/obj/item/weapon/weldingtool))

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)
+	switch(phorontanks)
-		if(1 to 4)	overlays += "plasma-[plasmatanks]"
+		if(1 to 4)	overlays += "phoron-[phorontanks]"
-		if(5 to INFINITY) overlays += "plasma-5"
+		if(5 to INFINITY) overlays += "phoron-5"
 
 
 /obj/structure/dispenser/attack_hand(mob/user as mob)
 	user.set_machine(src)
 	var/dat = "[src]<br><br>"
 	dat += "Oxygen tanks: [oxygentanks] - [oxygentanks ? "<A href='?src=\ref[src];oxygen=1'>Dispense</A>" : "empty"]<br>"
-	dat += "Phoron tanks: [plasmatanks] - [plasmatanks ? "<A href='?src=\ref[src];plasma=1'>Dispense</A>" : "empty"]"
+	dat += "Phoron tanks: [phorontanks] - [phorontanks ? "<A href='?src=\ref[src];phoron=1'>Dispense</A>" : "empty"]"
 	user << browse(dat, "window=dispenser")
 	onclose(user, "dispenser")
 	return
@@ -54,12 +54,12 @@
 			user << "<span class='notice'>[src] is full.</span>"
 		updateUsrDialog()
 		return
-	if(istype(I, /obj/item/weapon/tank/plasma))
+	if(istype(I, /obj/item/weapon/tank/phoron))
-		if(plasmatanks < 10)
+		if(phorontanks < 10)
 			user.drop_item()
 			I.loc = src
 			platanks.Add(I)
-			plasmatanks++
+			phorontanks++
 			user << "<span class='notice'>You put [I] in [src].</span>"
 		else
 			user << "<span class='notice'>[src] is full.</span>"
@@ -91,17 +91,17 @@
 				usr << "<span class='notice'>You take [O] out of [src].</span>"
 				oxygentanks--
 				update_icon()
-		if(href_list["plasma"])
+		if(href_list["phoron"])
-			if(plasmatanks > 0)
+			if(phorontanks > 0)
-				var/obj/item/weapon/tank/plasma/P
+				var/obj/item/weapon/tank/phoron/P
-				if(platanks.len == plasmatanks)
+				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 << "<span class='notice'>You take [P] out of [src].</span>"
-				plasmatanks--
+				phorontanks--
 				update_icon()
 		add_fingerprint(usr)
 		updateUsrDialog()

code/game/objects/structures/window.dm

@@ -368,29 +368,29 @@
 	icon_state = "window"
 	basestate = "window"
 
-/obj/structure/window/plasmabasic
+/obj/structure/window/phoronbasic
-	name = "plasma window"
+	name = "phoron window"
-	desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through."
+	desc = "A phoron-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through."
-	basestate = "plasmawindow"
+	basestate = "phoronwindow"
-	icon_state = "plasmawindow"
+	icon_state = "phoronwindow"
-	shardtype = /obj/item/weapon/shard/plasma
+	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
+/obj/structure/window/phoronreinforced
-	name = "reinforced plasma window"
+	name = "reinforced phoron 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."
+	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 = "plasmarwindow"
+	basestate = "phoronrwindow"
-	icon_state = "plasmarwindow"
+	icon_state = "phoronrwindow"
-	shardtype = /obj/item/weapon/shard/plasma
+	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

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
+					// Sell phoron
-					if(istype(A, /obj/item/stack/sheet/mineral/plasma))
+					if(istype(A, /obj/item/stack/sheet/mineral/phoron))
-						var/obj/item/stack/sheet/mineral/plasma/P = A
+						var/obj/item/stack/sheet/mineral/phoron/P = A
-						plasma_count += P.amount
+						phoron_count += P.amount
 			del(MA)
 
-		if(plasma_count)
+		if(phoron_count)
-			points += Floor(plasma_count / plasma_per_point)
+			points += Floor(phoron_count / phoron_per_point)
 
 	//Buyin
 	proc/buy()

code/game/turfs/simulated/walls_mineral.dm

@@ -76,20 +76,20 @@
 	radiate()
 	..()
 
-/turf/simulated/wall/mineral/plasma
+/turf/simulated/wall/mineral/phoron
-	name = "plasma wall"
+	name = "phoron wall"
-	desc = "A wall with plasma plating. This is definately a bad idea."
+	desc = "A wall with phoron plating. This is definately a bad idea."
-	icon_state = "plasma0"
+	icon_state = "phoron0"
-	walltype = "plasma"
+	walltype = "phoron"
-	mineral = "plasma"
+	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))

code/modules/admin/admin.dm

@@ -563,7 +563,7 @@ var/global/floorIsLava = 0
 		<A href='?src=\ref[src];create_turf=1'>Create Turf</A><br>
 		<A href='?src=\ref[src];create_mob=1'>Create Mob</A><br>
 		<br><A href='?src=\ref[src];vsc=airflow'>Edit Airflow Settings</A><br>
-		<A href='?src=\ref[src];vsc=plasma'>Edit Phoron Settings</A><br>
+		<A href='?src=\ref[src];vsc=phoron'>Edit Phoron Settings</A><br>
 		<A href='?src=\ref[src];vsc=default'>Choose a default ZAS setting</A><br>
 		"}
 
@@ -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)

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)

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

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)

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()
 	..()

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()

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."
 

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

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).

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",

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)

code/modules/mining/machine_processing.dm

@@ -39,7 +39,7 @@
 
 	var/dat = "<b>Smelter control console</b><br><br>"
 	//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("<A href='?src=\ref[src];sel_iron=no'><font color='green'>Smelting</font></A> ")
@@ -59,13 +59,13 @@
 		else
 			machine.selected &= ~ORE_PROC_GLASS
 
-		//plasma
+		//phoron
-		if(machine.ore_plasma)
+		if(machine.ore_phoron)
 			if (machine.selected & ORE_PROC_PHORON)
-				dat += text("<A href='?src=\ref[src];sel_plasma=no'><font color='green'>Smelting</font></A> ")
+				dat += text("<A href='?src=\ref[src];sel_phoron=no'><font color='green'>Smelting</font></A> ")
 			else
-				dat += text("<A href='?src=\ref[src];sel_plasma=yes'><font color='red'>Not smelting</font></A> ")
+				dat += text("<A href='?src=\ref[src];sel_phoron=yes'><font color='red'>Not smelting</font></A> ")
-			dat += text("Phoron: [machine.ore_plasma]<br>")
+			dat += text("Phoron: [machine.ore_phoron]<br>")
 		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_phoron"])
-		if (href_list["sel_plasma"] == "yes")
+		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)
+					if (ore_phoron > 0)
-						ore_plasma--;
+						ore_phoron--;
-						new /obj/item/stack/sheet/mineral/plasma(output.loc)
+						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))
+				if (istype(O,/obj/item/weapon/ore/phoron))
-					ore_plasma++
+					ore_phoron++
 					O.loc = null
 					//del(O)
 					continue

code/modules/mining/machine_stacking.dm

@@ -40,12 +40,12 @@
 		dat += text("Glass: [machine.ore_glass] <A href='?src=\ref[src];release=glass'>Release</A><br>")
 	if(machine.ore_rglass)
 		dat += text("Reinforced Glass: [machine.ore_rglass] <A href='?src=\ref[src];release=rglass'>Release</A><br>")
-	if(machine.ore_plasma)
+	if(machine.ore_phoron)
-		dat += text("Phoron: [machine.ore_plasma] <A href='?src=\ref[src];release=plasma'>Release</A><br>")
+		dat += text("Phoron: [machine.ore_phoron] <A href='?src=\ref[src];release=phoron'>Release</A><br>")
-	if(machine.ore_plasmaglass)
+	if(machine.ore_phoronglass)
-		dat += text("Phoron Glass: [machine.ore_plasmaglass] <A href='?src=\ref[src];release=plasmaglass'>Release</A><br>")
+		dat += text("Phoron Glass: [machine.ore_phoronglass] <A href='?src=\ref[src];release=phoronglass'>Release</A><br>")
-	if(machine.ore_plasmarglass)
+	if(machine.ore_phoronrglass)
-		dat += text("Reinforced Phoron Glass: [machine.ore_plasmarglass] <A href='?src=\ref[src];release=plasmarglass'>Release</A><br>")
+		dat += text("Reinforced Phoron Glass: [machine.ore_phoronrglass] <A href='?src=\ref[src];release=phoronrglass'>Release</A><br>")
 	if(machine.ore_gold)
 		dat += text("Gold: [machine.ore_gold] <A href='?src=\ref[src];release=gold'>Release</A><br>")
 	if(machine.ore_silver)
@@ -81,24 +81,24 @@
 	src.add_fingerprint(usr)
 	if(href_list["release"])
 		switch(href_list["release"])
-			if ("plasma")
+			if ("phoron")
-				if (machine.ore_plasma > 0)
+				if (machine.ore_phoron > 0)
-					var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma
+					var/obj/item/stack/sheet/mineral/phoron/G = new /obj/item/stack/sheet/mineral/phoron
-					G.amount = machine.ore_plasma
+					G.amount = machine.ore_phoron
 					G.loc = machine.output.loc
-					machine.ore_plasma = 0
+					machine.ore_phoron = 0
-			if ("plasmaglass")
+			if ("phoronglass")
-				if (machine.ore_plasmaglass > 0)
+				if (machine.ore_phoronglass > 0)
-					var/obj/item/stack/sheet/glass/plasmaglass/G = new /obj/item/stack/sheet/glass/plasmaglass
+					var/obj/item/stack/sheet/glass/phoronglass/G = new /obj/item/stack/sheet/glass/phoronglass
-					G.amount = machine.ore_plasmaglass
+					G.amount = machine.ore_phoronglass
 					G.loc = machine.output.loc
-					machine.ore_plasmaglass = 0
+					machine.ore_phoronglass = 0
-			if ("plasmarglass")
+			if ("phoronrglass")
-				if (machine.ore_plasmarglass > 0)
+				if (machine.ore_phoronrglass > 0)
-					var/obj/item/stack/sheet/glass/plasmarglass/G = new /obj/item/stack/sheet/glass/plasmarglass
+					var/obj/item/stack/sheet/glass/phoronrglass/G = new /obj/item/stack/sheet/glass/phoronrglass
-					G.amount = machine.ore_plasmarglass
+					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_phoron = 0;
-	var/ore_plasmaglass = 0;
+	var/ore_phoronglass = 0;
-	var/ore_plasmarglass = 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))
+			if (istype(O,/obj/item/stack/sheet/mineral/phoron))
-				ore_plasma+= O.amount
+				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))
+			if (istype(O,/obj/item/stack/sheet/glass/phoronglass))
-				ore_plasmaglass+= O.amount
+				ore_phoronglass+= O.amount
 				O.loc = null
 				//del(O)
 				continue
-			if (istype(O,/obj/item/stack/sheet/glass/plasmarglass))
+			if (istype(O,/obj/item/stack/sheet/glass/phoronrglass))
-				ore_plasmarglass+= O.amount
+				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)
+	if (ore_phoron >= stack_amt)
-		var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma
+		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)
+	if (ore_phoronglass >= stack_amt)
-		var/obj/item/stack/sheet/glass/plasmaglass/G = new /obj/item/stack/sheet/glass/plasmaglass
+		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)
+	if (ore_phoronrglass >= stack_amt)
-		var/obj/item/stack/sheet/glass/plasmarglass/G = new /obj/item/stack/sheet/glass/plasmarglass
+		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

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"
 

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, i<quantity, i++)
-						new /obj/item/weapon/shard/plasma(src)
+						new /obj/item/weapon/shard/phoron(src)
 
 				if(7)
 					var/obj/item/stack/sheet/mineral/uranium/R = new(src)

code/modules/mining/minerals.dm

@@ -58,11 +58,11 @@ mineral/silver
 	spread_chance = 10
 	ore = /obj/item/weapon/ore/silver
 
-mineral/plasma
+mineral/phoron
 	name = "Phoron"
 	result_amount = 5
 	spread_chance = 25
-	ore = /obj/item/weapon/ore/plasma
+	ore = /obj/item/weapon/ore/phoron
 
 mineral/clown
 	display_name = "Bananium"

code/modules/mining/mint.dm

@@ -13,7 +13,7 @@
 	var/amt_gold = 0   //amount of gold
 	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
@@ -52,8 +52,8 @@
 			if (istype(O,/obj/item/stack/sheet/mineral/diamond))
 				amt_diamond += 100 * O.amount
 				del(O)
-			if (istype(O,/obj/item/stack/sheet/mineral/plasma))
+			if (istype(O,/obj/item/stack/sheet/mineral/phoron))
-				amt_plasma += 100 * O.amount
+				amt_phoron += 100 * O.amount
 				del(O)
 			if (istype(O,/obj/item/stack/sheet/mineral/uranium))
 				amt_uranium += 100 * O.amount
@@ -100,11 +100,11 @@
 		dat += text("chosen")
 	else
 		dat += text("<A href='?src=\ref[src];choose=diamond'>Choose</A>")
-	dat += text("<br><font color='#FF8800'><b>Phoron inserted: </b>[amt_plasma]</font> ")
+	dat += text("<br><font color='#FF8800'><b>Phoron inserted: </b>[amt_phoron]</font> ")
-	if (chosen == "plasma")
+	if (chosen == "phoron")
 		dat += text("chosen")
 	else
-		dat += text("<A href='?src=\ref[src];choose=plasma'>Choose</A>")
+		dat += text("<A href='?src=\ref[src];choose=phoron'>Choose</A>")
 	dat += text("<br><font color='#008800'><b>uranium inserted: </b>[amt_uranium]</font> ")
 	if (chosen == "uranium")
 		dat += text("chosen")
@@ -202,14 +202,14 @@
 						newCoins++
 						src.updateUsrDialog()
 						sleep(5);
-				if("plasma")
+				if("phoron")
-					while(amt_plasma > 0 && coinsToProduce > 0)
+					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)
+						new /obj/item/weapon/coin/phoron(M)
-						amt_plasma -= 20
+						amt_phoron -= 20
 						coinsToProduce--
 						newCoins++
 						src.updateUsrDialog()

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))
+		if (istype(C,/obj/item/weapon/coin/phoron))
-			amt_plasma++;
+			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] <A href='?src=\ref[src];remove=iron'>Remove one</A><br>")
 	if (amt_diamond)
 		dat += text("Diamond coins: [amt_diamond] <A href='?src=\ref[src];remove=diamond'>Remove one</A><br>")
-	if (amt_plasma)
+	if (amt_phoron)
-		dat += text("Phoron coins: [amt_plasma] <A href='?src=\ref[src];remove=plasma'>Remove one</A><br>")
+		dat += text("Phoron coins: [amt_phoron] <A href='?src=\ref[src];remove=phoron'>Remove one</A><br>")
 	if (amt_uranium)
 		dat += text("Uranium coins: [amt_uranium] <A href='?src=\ref[src];remove=uranium'>Remove one</A><br>")
 	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")
+			if("phoron")
-				COIN = locate(/obj/item/weapon/coin/plasma,src.contents)
+				COIN = locate(/obj/item/weapon/coin/phoron,src.contents)
 			if("uranium")
 				COIN = locate(/obj/item/weapon/coin/uranium,src.contents)
 			if("clown")

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
+/obj/item/weapon/coin/phoron
-	name = "solid plasma coin"
+	name = "solid phoron coin"
-	icon_state = "coin_plasma"
+	icon_state = "coin_phoron"
 
 /obj/item/weapon/coin/uranium
 	name = "uranium coin"

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))
+		if (istype(C,/obj/item/weapon/ore/phoron))
-			amt_plasma++;
+			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]<br>")
 	if (amt_diamond)
 		dat += text("Diamond ore: [amt_diamond]<br>")
-	if (amt_plasma)
+	if (amt_phoron)
-		dat += text("Phoron ore: [amt_plasma]<br>")
+		dat += text("Phoron ore: [amt_phoron]<br>")
 	if (amt_uranium)
 		dat += text("Uranium ore: [amt_uranium]<br>")
 	if (amt_clown)

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)
+		if(phoron_concentration > 0.01)
-			src << "\red Phoron: [round(plasma_concentration*100)]% ([round(environment.toxins,0.01)] moles)"
+			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)"

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

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

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)

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

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

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/phoron_level = environment.toxins/total_moles
-			var/unknown_level =  1-(o2_level+n2_level+co2_level+plasma_level)
+			var/unknown_level =  1-(o2_level+n2_level+co2_level+phoron_level)
 			dat += "Nitrogen: [round(n2_level*100)]%<br>"
 			dat += "Oxygen: [round(o2_level*100)]%<br>"
 			dat += "Carbon Dioxide: [round(co2_level*100)]%<br>"
-			dat += "Phoron: [round(plasma_level*100)]%<br>"
+			dat += "Phoron: [round(phoron_level*100)]%<br>"
 			if(unknown_level > 0.01)
 				dat += "OTHER: [round(unknown_level)]%<br>"
 		dat += "Temperature: [round(environment.temperature-T0C)]&deg;C<br>"

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
 

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.name = "Drone phoron overcharge counter"
-			C.origin_tech = "plasma=[rand(3,6)]"
+			C.origin_tech = "phoron=[rand(3,6)]"
 
 		if(spawnees & 256)
 			C = new(src.loc)

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

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
 

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

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)
 

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
 
 

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.")
+			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 plasma, 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()
 

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.")
+			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 plasma, rigging it to explode.")
+			message_admins("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.")
 
 			rigged = 1