Changes all appropriate instances of toxins to phoron

code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm

@@ -4,7 +4,7 @@ Deuterium-deuterium fusion : 40 x 10^7 K
 Deuterium-tritium fusion: 4.5 x 10^7 K
 */
 
-//#DEFINE MAX_STORED_ENERGY (held_phoron.toxins * held_phoron.toxins * SPECIFIC_HEAT_TOXIN)
+//#DEFINE MAX_STORED_ENERGY (held_phoron.phoron * held_phoron.phoron * SPECIFIC_HEAT_TOXIN)
 
 /obj/effect/rust_em_field
 	name = "EM Field"
@@ -140,19 +140,19 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
 	//the amount of phoron pulled in each update is relative to the field strength, with 50T (max field strength) = 100% of area covered by the field
 	//at minimum strength, 0.25% of the field volume is pulled in per update (?)
 	//have a max of 1000 moles suspended
-	if(held_phoron.toxins < transfer_ratio * 1000)
+	if(held_phoron.phoron < transfer_ratio * 1000)
 		var/moles_covered = environment.return_pressure()*volume_covered/(environment.temperature * R_IDEAL_GAS_EQUATION)
 		//world << "\blue moles_covered: [moles_covered]"
 		//
 		var/datum/gas_mixture/gas_covered = environment.remove(moles_covered)
 		var/datum/gas_mixture/phoron_captured = new /datum/gas_mixture()
 		//
-		phoron_captured.toxins = round(gas_covered.toxins * transfer_ratio)
-		//world << "\blue[phoron_captured.toxins] moles of phoron captured"
+		phoron_captured.phoron = round(gas_covered.phoron * transfer_ratio)
+		//world << "\blue[phoron_captured.phoron] moles of phoron captured"
 		phoron_captured.temperature = gas_covered.temperature
 		phoron_captured.update_values()
 		//
-		gas_covered.toxins -= phoron_captured.toxins
+		gas_covered.phoron -= phoron_captured.phoron
 		gas_covered.update_values()
 		//
 		held_phoron.merge(phoron_captured)
@@ -171,15 +171,15 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
 
 	//change held phoron temp according to energy levels
 	//SPECIFIC_HEAT_TOXIN
-	if(mega_energy > 0 && held_phoron.toxins)
+	if(mega_energy > 0 && held_phoron.phoron)
 		var/heat_capacity = held_phoron.heat_capacity()//200 * number of phoron moles
 		if(heat_capacity > 0.0003)	//formerly MINIMUM_HEAT_CAPACITY
 			held_phoron.temperature = (heat_capacity + mega_energy * 35000)/heat_capacity
 
 	//if there is too much phoron in the field, lose some
-	/*if( held_phoron.toxins > (MOLES_CELLSTANDARD * 7) * (50 / field_strength) )
+	/*if( held_phoron.phoron > (MOLES_CELLSTANDARD * 7) * (50 / field_strength) )
 		LosePhoron()*/
-	if(held_phoron.toxins > 1)
+	if(held_phoron.phoron > 1)
 		//lose a random amount of phoron back into the air, increased by the field strength (want to switch this over to frequency eventually)
 		var/loss_ratio = rand() * (0.05 + (0.05 * 50 / field_strength))
 		//world << "lost [loss_ratio*100]% of held phoron"
@@ -187,16 +187,16 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
 		var/datum/gas_mixture/phoron_lost = new
 		phoron_lost.temperature = held_phoron.temperature
 		//
-		phoron_lost.toxins = held_phoron.toxins * loss_ratio
+		phoron_lost.phoron = held_phoron.phoron * loss_ratio
 		//phoron_lost.update_values()
-		held_phoron.toxins -= held_phoron.toxins * loss_ratio
+		held_phoron.phoron -= held_phoron.phoron * loss_ratio
 		//held_phoron.update_values()
 		//
 		environment.merge(phoron_lost)
 		radiation += loss_ratio * mega_energy * 0.1
 		mega_energy -= loss_ratio * mega_energy * 0.1
 	else
-		held_phoron.toxins = 0
+		held_phoron.phoron = 0
 		//held_phoron.update_values()
 
 	//handle some reactants formatting

code/WorkInProgress/Cib/amorph/life.dm

@@ -2,7 +2,7 @@
 	var/obj/item/weapon/card/id/wear_id = null // Fix for station bounced radios -- Skie
 
 	var/oxygen_alert = 0
-	var/toxins_alert = 0
+	var/phoron_alert = 0
 	var/fire_alert = 0
 
 	var/temperature_alert = 0
@@ -455,7 +455,7 @@
 			if(src.pullin)	src.pullin.icon_state = "pull[src.pulling ? 1 : 0]"
 
 
-			if (src.toxin)	src.toxin.icon_state = "tox[src.toxins_alert ? 1 : 0]"
+			if (src.toxin)	src.toxin.icon_state = "tox[src.phoron_alert ? 1 : 0]"
 			if (src.oxygen) src.oxygen.icon_state = "oxy[src.oxygen_alert ? 1 : 0]"
 			if (src.fire) src.fire.icon_state = "fire[src.fire_alert ? 1 : 0]"
 			//NOTE: the alerts dont reset when youre out of danger. dont blame me,

code/WorkInProgress/Mini/atmos_control.dm

@@ -282,7 +282,7 @@ siphoning
 Carbon Dioxide
 <A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=co2_scrub;val=[!data["filter_co2"]]'>[data["filter_co2"]?"on":"off"]</A>;
 Toxins
-<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=tox_scrub;val=[!data["filter_toxins"]]'>[data["filter_toxins"]?"on":"off"]</A>;
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=tox_scrub;val=[!data["filter_phoron"]]'>[data["filter_phoron"]?"on":"off"]</A>;
 Nitrous Oxide
 <A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=n2o_scrub;val=[!data["filter_n2o"]]'>[data["filter_n2o"]?"on":"off"]</A>
 <BR>

code/WorkInProgress/Sigyn/Softcurity/wardrobe.dm

@@ -193,12 +193,12 @@
 	return
 
 
-/obj/structure/closet/wardrobe/toxins_white
-	name = "toxins wardrobe"
+/obj/structure/closet/wardrobe/science_white
+	name = "science wardrobe"
 	icon_state = "white"
 	icon_closed = "white"
 
-/obj/structure/closet/wardrobe/toxins_white/New()
+/obj/structure/closet/wardrobe/science_white/New()
 	new /obj/item/clothing/under/rank/scientist(src)
 	new /obj/item/clothing/under/rank/scientist(src)
 	new /obj/item/clothing/under/rank/scientist(src)

code/WorkInProgress/SkyMarshal/wardrobes.dm

@@ -340,7 +340,7 @@
 		var/obj/item/weapon/storage/backpack/BPK = new /obj/item/weapon/storage/backpack(src)
 		new /obj/item/weapon/storage/box(BPK)
 		new /obj/item/weapon/pen(src)
-		new /obj/item/device/pda/toxins(src)
+		new /obj/item/device/pda/science(src)
 		new /obj/item/weapon/tank/oxygen(src)
 		new /obj/item/clothing/mask/gas(src)
 		new /obj/item/clothing/suit/storage/labcoat/science(src)
@@ -360,7 +360,7 @@
 		new /obj/item/device/radio/headset/headset_medsci(src)
 		new /obj/item/clothing/under/rank/chemist(src)
 		new /obj/item/clothing/shoes/white(src)
-		new /obj/item/device/pda/toxins(src)
+		new /obj/item/device/pda/science(src)
 		new /obj/item/clothing/suit/storage/labcoat/chemist(src)
 
 /obj/item/wardrobe/hos

code/WorkInProgress/Tastyfish/Eliza_Data.dm

@@ -246,8 +246,8 @@
 			list("bomb", "explosive", "toxin", "phoron"),
 			list(
 				"Do you worry about bombs often?",
-				"Do you work in toxins?",
-				"Do you find it odd to worry about bombs on a toxins research vessel?")),
+				"Do you work in science?",
+				"Do you find it odd to worry about bombs on a science research vessel?")),
 		new/datum/text_parser/keyword(
 			list("work", "job", "head", "staff", "transen"),
 			list(