replaced carrier reagents with existing chemical reagents

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/research/xenoarchaeology/chemistry.dm

@@ -2,7 +2,7 @@
 //chemistry stuff here so that it can be easily viewed/modified
 datum
 	reagent
-		tungsten	//purely used to make lith-sodi-tungs
+		tungsten
 			name = "Tungsten"
 			id = "tungsten"
 			description = "A chemical element, and a strong oxidising agent."
@@ -10,30 +10,6 @@ datum
 			color = "#808080"	// rgb: 128, 128, 128
 								//todo: make this silvery grey
 
-		neon		//purely used as a carrier
-			name = "Neon"
-			id = "neon"
-			description = "A chemical element, commonly used in lighting."
-			reagent_state = LIQUID
-			color = "#808080"	// rgb: 128, 128, 128,
-								//todo: make this fluro/bright purple
-
-		beryllium	//purely used as a carrier
-			name = "Beryllium"
-			id = "beryllium"
-			description = "A chemical element, prized for it's rigidity, thermal stability and low density when used in alloys."
-			reagent_state = LIQUID
-			color = "#808080"	// rgb: 128, 128, 128,
-								//todo: make this dark grey
-
-		calcium		//purely used as a carrier
-			name = "Calcium"
-			id = "calcium"
-			description = "An extremely common chemical element found throughout living organisms."
-			reagent_state = LIQUID
-			color = "#808080"	// rgb: 128, 128, 128,
-								//todo: make this bone-white colour
-
 		lithiumsodiumtungstate
 			name = "Lithium Sodium Tungstate"
 			id = "lithiumsodiumtungstate"
@@ -53,7 +29,7 @@ datum
 		density_separated_sample
 			name = "Density separated sample"
 			id = "density_separated_sample"
-			description = "A watery paste used in chemical analysis, this one has some chunks floating in it."
+			description = "A watery paste used in chemical analysis, there are some chunks floating in it."
 			reagent_state = LIQUID
 			color = "#C81040" 	//rgb: 200, 16, 64
 								//todo: make this browny-white

code/modules/research/xenoarchaeology/finds/finds_defines.dm

@@ -52,61 +52,61 @@
 /proc/get_responsive_reagent(var/find_type)
 	switch(find_type)
 		if(ARCHAEO_BOWL)
-			return "aluminium"
+			return "mercury"
 		if(ARCHAEO_URN)
-			return "aluminium"
+			return "mercury"
 		if(ARCHAEO_CUTLERY)
-			return "aluminium"
+			return "mercury"
 		if(ARCHAEO_STATUETTE)
-			return "aluminium"
+			return "mercury"
 		if(ARCHAEO_INSTRUMENT)
-			return "aluminium"
+			return "mercury"
 		if(ARCHAEO_COIN)
-			return "silicon"
+			return "iron"
 		if(ARCHAEO_KNIFE)
-			return "silicon"
+			return "iron"
 		if(ARCHAEO_HANDCUFFS)
-			return "aluminium"
+			return "mercury"
 		if(ARCHAEO_BEARTRAP)
-			return "aluminium"
+			return "mercury"
 		if(ARCHAEO_LIGHTER)
-			return "aluminium"
+			return "mercury"
 		if(ARCHAEO_BOX)
-			return "aluminium"
+			return "mercury"
 		if(ARCHAEO_GASTANK)
-			return "aluminium"
+			return "mercury"
 		if(ARCHAEO_TOOL)
-			return "silicon"
+			return "iron"
 		if(ARCHAEO_METAL)
-			return "silicon"
+			return "iron"
 		if(ARCHAEO_PEN)
-			return "aluminium"
+			return "mercury"
 		if(ARCHAEO_CRYSTAL)
-			return "helium"
+			return "nitrogen"
 		if(ARCHAEO_CULTBLADE)
-			return "neon"
+			return "potassium"
 		if(ARCHAEO_TELEBEACON)
-			return "neon"
+			return "potassium"
 		if(ARCHAEO_CLAYMORE)
-			return "silicon"
+			return "iron"
 		if(ARCHAEO_CULTROBES)
-			return "neon"
+			return "potassium"
 		if(ARCHAEO_SOULSTONE)
-			return "helium"
+			return "nitrogen"
 		if(ARCHAEO_SHARD)
-			return "helium"
+			return "nitrogen"
 		if(ARCHAEO_RODS)
-			return "silicon"
+			return "iron"
 		if(ARCHAEO_STOCKPARTS)
-			return "neon"
+			return "potassium"
 		if(ARCHAEO_KATANA)
-			return "silicon"
+			return "iron"
 		if(ARCHAEO_LASER)
-			return "silicon"
+			return "iron"
 		if(ARCHAEO_GUN)
-			return "silicon"
+			return "iron"
 		if(ARCHAEO_UNKNOWN)
-			return "beryllium"
+			return "mercury"
 		if(ARCHAEO_FOSSIL)
 			return "carbon"
 		if(ARCHAEO_SHELL)
@@ -119,7 +119,7 @@
 			return "carbon"
 		if(ARCHAEO_REMAINS_XENO)
 			return "carbon"
-	return "chlorine"
+	return "plasma"
 
 //see /turf/simulated/mineral/New() in code/modules/mining/mine_turfs.dm
 /proc/get_random_digsite_type()

code/modules/research/xenoarchaeology/geosample.dm

@@ -31,26 +31,24 @@
 
 var/list/responsive_carriers = list( \
 	"carbon", \
-	"carbon", \
-	"neon", \
-	"beryllium", \
-	"helium", \
-	"silicon", \
-	"calcium", \
+	"potassium", \
+	"hydrogen", \
+	"nitrogen", \
+	"mercury", \
+	"iron", \
 	"chlorine", \
-	"aluminium", \
-	"plasma" )
+	"phosphorus", \
+	"plasma")
 
 var/list/finds_as_strings = list( \
-	"Dead plant cells", \
-	"Dead organism cells", \
+	"Trace organic cells", \
 	"Long exposure particles", \
 	"Trace water particles", \
 	"Crystalline structures", \
-	"Metallics", \
-	"Metamorphic/generic rock", \
-	"Igneous/generic rock", \
-	"Sedimentary/generic rock", \
+	"Metallic derivative", \
+	"Metallic composite", \
+	"Metamorphic/igneous rock composite", \
+	"Metamorphic/sedimentary rock composite", \
 	"Anomalous material" )
 
 var/list/artifact_spawning_turfs = list()
@@ -64,8 +62,8 @@ var/list/artifact_spawning_turfs = list()
 	var/age_million = 0
 	var/age_billion = 0
 	var/artifact_id = ""					//id of a nearby artifact, if there is one
-	var/artifact_distance = 9999				//proportional to distance
-	var/source_mineral = "calcium"
+	var/artifact_distance = -1				//proportional to distance
+	var/source_mineral = "chlorine"			//machines will pop up a warning telling players that the sample may be confused
 	var/total_spread = 0
 	//
 	//var/source_mineral
@@ -81,71 +79,53 @@ var/list/artifact_spawning_turfs = list()
 	if(!container || !istype(container))
 		return
 
-	//source_mineral = container.mineralName
 	age = rand(1,999)
+	total_spread = 0
 
-	//find_presence[FIND_METEORIC] = rand(1,10) / 10
-	//var/comp_remaining = 1 - find_presence[FIND_METEORIC]
 	switch(container.mineralName)
 		if("Uranium")
 			age_million = rand(1, 704)
 			age_thousand = rand(1,999)
-			//find_presence[FIND_METALLIC] = comp_remaining * (rand(25, 75) / 100)
-			//comp_remaining -= find_presence[FIND_METALLIC]
-			find_presence["silicon"] = rand(1,1000) / 100
-			source_mineral = "silicon"
+			find_presence["potassium"] = rand(1,1000) / 100
+			source_mineral = "potassium"
 		if("Iron")
 			age_thousand = rand(1, 999)
 			age_million = rand(1, 999)
-			//find_presence[FIND_METALLIC] = comp_remaining * (rand(25, 75) / 100)
-			//comp_remaining -= find_presence[FIND_METALLIC]
-			find_presence["silicon"] = rand(1,1000) / 100
-			source_mineral = "silicon"
+			find_presence["iron"] = rand(1,1000) / 100
+			source_mineral = "iron"
 		if("Diamond")
 			age_thousand = rand(1,999)
 			age_million = rand(1,999)
-			//find_presence[FIND_CRYSTALLINE] = comp_remaining * (rand(25, 75) / 100)
-			//comp_remaining -= find_presence[FIND_CRYSTALLINE]
-			find_presence["helium"] = rand(1,1000) / 100
-			source_mineral = "helium"
+			find_presence["nitrogen"] = rand(1,1000) / 100
+			source_mineral = "nitrogen"
 		if("Gold")
 			age_thousand = rand(1,999)
 			age_million = rand(1,999)
 			age_billion = rand(3,4)
-			//find_presence[FIND_METALLIC] = comp_remaining * (rand(25, 75) / 100)
-			//comp_remaining -= find_presence[FIND_METALLIC]
-			find_presence["silicon"] = rand(1,1000) / 100
-			source_mineral = "silicon"
+			find_presence["iron"] = rand(1,1000) / 100
+			source_mineral = "iron"
 		if("Silver")
 			age_thousand = rand(1,999)
 			age_million = rand(1,999)
-			//find_presence[FIND_METALLIC] = comp_remaining * (rand(25, 75) / 100)
-			//comp_remaining -= find_presence[FIND_METALLIC]
-			find_presence["silicon"] = rand(1,1000) / 100
-			source_mineral = "silicon"
+			find_presence["iron"] = rand(1,1000) / 100
+			source_mineral = "iron"
 		if("Plasma")
 			age_thousand = rand(1,999)
 			age_million = rand(1,999)
 			age_billion = rand(10, 13)
-			//find_presence[FIND_METALLIC] = comp_remaining * (rand(25, 75) / 100)
-			//comp_remaining -= find_presence[FIND_METALLIC]
-			find_presence["silicon"] = rand(1,1000) / 100
-			source_mineral = "silicon"
+			find_presence["plasma"] = rand(1,1000) / 100
+			source_mineral = "plasma"
 		if("Clown")
-			age = rand(-1,-999)				//thats_the_joke.mp4
+			age = rand(-1,-999)				//thats the joke
 			age_thousand = rand(-1,-999)
 			find_presence["plasma"] = rand(1,1000) / 100
 			source_mineral = "plasma"
-			//find_presence[FIND_IGNEOUS] = comp_remaining * (rand(25, 75) / 100)
-			//comp_remaining -= find_presence[FIND_IGNEOUS]
 
-	find_presence["neon"] = rand(1,500) / 100
-	/*if(prob(20))
-		find_presence["carbon"] = rand(1,10) / 100*/
-
-	//find_presence[FIND_METAMORPHIC] = comp_remaining
-	//allocate the rest to ordinary rock
-	find_presence["calcium"] = rand(500,2500) / 100
+	if(prob(75))
+		find_presence["phosphorus"] = rand(1,500) / 100
+	if(prob(25))
+		find_presence["mercury"] = rand(1,500) / 100
+	find_presence["chlorine"] = rand(500,2500) / 100
 
 	//loop over finds, grab any relevant stuff
 	for(var/datum/find/F in container.finds)

code/modules/research/xenoarchaeology/tools/suspension_generator.dm

@@ -33,7 +33,7 @@
 				if(prob(5))
 					M << "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]"
 
-		if(field_type == "silicon")
+		if(field_type == "iron")
 			for(var/mob/living/silicon/M in T)
 				M.weakened = max(M.weakened, 3)
 				cell.charge -= power_use
@@ -83,13 +83,12 @@
 	if(!locked)
 		dat += "<b>Select field mode</b><br>"
 		dat += "[field_type=="carbon"?"<b>":""			]<A href='?src=\ref[src];select_field=carbon'>Diffracted CO2 laser</A></b><br>"
-		dat += "[field_type=="helium"?"<b>":""		]<A href='?src=\ref[src];select_field=helium'>Helium tracer field</A></b><br>"
-		dat += "[field_type=="beryllium"?"<b>":""	]<A href='?src=\ref[src];select_field=beryllium'>Beryllium dispersion wave</A></b><br>"
-		dat += "[field_type=="neon"?"<b>":""		]<A href='?src=\ref[src];select_field=neon'>Neon refrigerant cloud</A></b><br>"
-		dat += "[field_type=="aluminium"?"<b>":""	]<A href='?src=\ref[src];select_field=aluminium'>Aluminium transmitted field</A></b><br>"
-		dat += "[field_type=="silicon"?"<b>":""		]<A href='?src=\ref[src];select_field=silicon'>Silicon wafer conduction</A></b><br>"
+		dat += "[field_type=="nitrogen"?"<b>":""		]<A href='?src=\ref[src];select_field=nitrogen'>Nitrogen tracer field</A></b><br>"
+		dat += "[field_type=="potassium"?"<b>":""		]<A href='?src=\ref[src];select_field=potassium'>Potassium refrigerant cloud</A></b><br>"
+		dat += "[field_type=="mercury"?"<b>":""	]<A href='?src=\ref[src];select_field=mercury'>Mercury dispersion wave</A></b><br>"
+		dat += "[field_type=="iron"?"<b>":""		]<A href='?src=\ref[src];select_field=iron'>Iron wafer conduction field</A></b><br>"
 		dat += "[field_type=="calcium"?"<b>":""	]<A href='?src=\ref[src];select_field=calcium'>Calcium binary deoxidiser</A></b><br>"
-		dat += "[field_type=="chlorine"?"<b>":""	]<A href='?src=\ref[src];select_field=chlorine'>Chlorine alkalising field</A></b><br>"
+		dat += "[field_type=="plasma"?"<b>":""	]<A href='?src=\ref[src];select_field=chlorine'>Plasma saturated field</A></b><br>"
 	else
 		dat += "<br>"
 		dat += "<br>"
@@ -246,28 +245,26 @@
 			for(var/mob/living/carbon/C in T)
 				C.weakened += 5
 				C.visible_message("\blue \icon[C] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.")
-		if("helium")
+		if("nitrogen")
 			success = 1
 			//
-		if("beryllium")
-			success = 1
-			//
-		if("neon")
-			success = 1
-			//
-		if("aluminium")
+		if("mercury")
 			success = 1
 			//
 		if("chlorine")
 			success = 1
 			//
-		if("silicon")
+		if("potassium")
+			success = 1
+			//
+		if("plasma")
+			success = 1
+			//
+		if("iron")
 			success = 1
 			for(var/mob/living/silicon/R in T)
 				R.weakened += 5
 				R.visible_message("\blue \icon[R] [R] begins to float in the air!","You feel tingly and light, but it is difficult to move.")
-		if("calcium")
-			success = 1
 			//
 	//in case we have a bad field type
 	if(!success)
@@ -328,7 +325,7 @@
 	icon = 'icons/effects/effects.dmi'
 	anchored = 1
 	density = 1
-	var/field_type = "calcium"
+	var/field_type = "chlorine"
 
 /obj/effect/suspension_field/Del()
 	for(var/obj/I in src)