Merge pull request #1424 from Fox-McCloud/phoron-is-for-morons

Phoron is for morons

code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm

@@ -8,13 +8,13 @@
 #define ATM_O2		3
 #define ATM_N2		4
 #define ATM_CO2		5
-#define ATM_P		6	//Phoron
+#define ATM_P		6	//Plasma
 #define ATM_N2O		7
 
 //--------------------------------------------
 // Omni port datum
 //
-// Used by omni devices to manage connections 
+// Used by omni devices to manage connections
 //  to other atmospheric objects.
 //--------------------------------------------
 /datum/omni_port
@@ -70,10 +70,10 @@
 			string = "East"
 		if(WEST)
 			string = "West"
-	
+
 	if(!capitalize && string)
 		string = lowertext(string)
-	
+
 	return string
 
 //returns a direction flag based on the string passed to it

code/game/machinery/embedded_controller/docking_program.dm

@@ -51,7 +51,7 @@
 	*** Override, what is it? ***
 
 	The purpose of enabling the override is to prevent the docking program from automatically doing things with the docking port when docking or undocking.
-	Maybe the shuttle is full of plamsa/phoron for some reason, and you don't want the door to automatically open, or the airlock to cycle.
+	Maybe the shuttle is full of plasma for some reason, and you don't want the door to automatically open, or the airlock to cycle.
 	This means that the prepare_for_docking/undocking and finish_docking/undocking procs don't get called.
 
 	The docking controller will still check the state of the docking port, and thus prevent the shuttle from launching unless they force the launch (handling forced

code/game/machinery/suit_storage_unit.dm

@@ -585,7 +585,7 @@
 	var/active = 0          // PLEASE HOLD.
 	var/safeties = 1        // The cycler won't start with a living thing inside it unless safeties are off.
 	var/irradiating = 0     // If this is > 0, the cycler is decontaminating whatever is inside it.
-	var/radiation_level = 2 // 1 is removing germs, 2 is removing blood, 3 is removing phoron.
+	var/radiation_level = 2 // 1 is removing germs, 2 is removing blood, 3 is removing plasma.
 	var/model_text = ""     // Some flavour text for the topic box.
 	var/locked = 1          // If locked, nothing can be taken from or added to the cycler.
 

code/game/supplyshuttle.dm

@@ -222,7 +222,7 @@ var/list/mechtoys = list(
 							points += points_per_slip
 							find_slip = 0
 
-					// Sell phoron
+					// Sell plasma
 					else if(istype(A, /obj/item/stack/sheet/mineral/plasma))
 						var/obj/item/stack/sheet/mineral/plasma/P = A
 						plasma_count += P.amount

code/modules/flufftext/Dreaming.dm

@@ -3,7 +3,7 @@ var/list/dreams = list(
 	"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","phoron","air","the medical bay","the bridge","blinking lights",
+	"a hat","the Luna","a ruined station","a planet","plasma","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/mining/drilling/distribution.dm

@@ -37,7 +37,7 @@ Rare minerals:
 	diamond
 
 Deep minerals:
-	phoron
+	plasma
 	xerxium (adamantine)
 	fulgurium (mythril)
 */
@@ -178,7 +178,7 @@ Deep minerals:
 								target_turf.resources["silver"] =     rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
 								target_turf.resources["uranium"] =    rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
 								target_turf.resources["diamond"] =    0
-								target_turf.resources["phoron"] =     0
+								target_turf.resources["plasma"] =     0
 								target_turf.resources["osmium"] =     0
 								target_turf.resources["hydrogen"] =   0
 							if(100 to 124)
@@ -187,7 +187,7 @@ Deep minerals:
 								target_turf.resources["silver"] =     rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
 								target_turf.resources["uranium"] =    rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
 								target_turf.resources["diamond"] =    0
-								target_turf.resources["phoron"] =     rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
+								target_turf.resources["plasma"] =     rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
 								target_turf.resources["osmium"] =     rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
 								target_turf.resources["hydrogen"] =   0
 							if(125 to 255)
@@ -196,7 +196,7 @@ Deep minerals:
 								target_turf.resources["silver"] =     0
 								target_turf.resources["uranium"] =    rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
 								target_turf.resources["diamond"] =    rand(RESOURCE_LOW_MIN,RESOURCE_LOW_MAX)
-								target_turf.resources["phoron"] =     rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX)
+								target_turf.resources["plasma"] =     rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX)
 								target_turf.resources["osmium"] =     rand(RESOURCE_HIGH_MIN,RESOURCE_HIGH_MAX)
 								target_turf.resources["hydrogen"] =   rand(RESOURCE_MID_MIN,RESOURCE_MID_MAX)
 

code/modules/mining/drilling/drill.dm

@@ -22,7 +22,7 @@
 		"gold" = /obj/item/weapon/ore/gold,
 		"silver" = /obj/item/weapon/ore/silver,
 		"diamond" = /obj/item/weapon/ore/diamond,
-		"phoron" = /obj/item/weapon/ore/plasma,
+		"plasma" = /obj/item/weapon/ore/plasma,
 		"osmium" = /obj/item/weapon/ore/osmium,
 		"hydrogen" = /obj/item/weapon/ore/hydrogen,
 		"silicates" = /obj/item/weapon/ore/glass,

code/modules/mining/drilling/scanner.dm

@@ -36,7 +36,7 @@
 				if("silicates" || "carbonaceous rock" || "iron") ore_type = "surface minerals"
 				if("gold" || "silver" || "diamond")              ore_type = "precious metals"
 				if("uranium")                                    ore_type = "nuclear fuel"
-				if("phoron" || "osmium" || "hydrogen")           ore_type = "exotic matter"
+				if("plasma" || "osmium" || "hydrogen")           ore_type = "exotic matter"
 
 			if(ore_type) metals[ore_type] += T.resources[metal]
 

code/modules/mining/machine_processing.dm

@@ -99,7 +99,7 @@
 
 
 /obj/machinery/mineral/processing_unit
-	name = "material processor" //This isn't actually a goddamn furnace, we're in space and it's processing platinum and flammable phoron...
+	name = "material processor" //This isn't actually a goddamn furnace, we're in space and it's processing platinum and flammable plasma...
 	icon = 'icons/obj/machines/mining_machines.dmi'
 	icon_state = "furnace"
 	density = 1