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

Phoron is for morons

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