Bay Merge 05NOV2014

Known errors:

* A set of errors tied to updating the fire overlays.
* A single error related to a dischephency between new and old slime
code
* A set of errors related to the recharging of stun batons
* A single error due to old machinery code coming from your grav
generator file
* A single error error from your space cooler code, due to old
atmopsherics code
* A playerpanel warning
* An error tied to extinguishing and old atmos code.

code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm

@@ -140,20 +140,19 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
 	//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
 	//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_plasma.gas["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()
 		//
-		plasma_captured.toxins = round(gas_covered.toxins * transfer_ratio)
-		//world << "\blue[plasma_captured.toxins] moles of plasma captured"
+		plasma_captured.gas["toxins"] = round(gas_covered.gas["toxins"] * transfer_ratio)
+		//world << "\blue[phoron_captured.toxins] moles of phoron captured"
 		plasma_captured.temperature = gas_covered.temperature
 		plasma_captured.update_values()
 		//
-		gas_covered.toxins -= plasma_captured.toxins
-		gas_covered.update_values()
+		gas_covered.adjust_gas("toxins", -plasma_captured.gas["toxins"])
 		//
 		held_plasma.merge(plasma_captured)
 		//
@@ -171,15 +170,15 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
 
 	//change held plasma temp according to energy levels
 	//SPECIFIC_HEAT_TOXIN
-	if(mega_energy > 0 && held_plasma.toxins)
-		var/heat_capacity = held_plasma.heat_capacity()//200 * number of plasma moles
+	if(mega_energy > 0 && held_plasma.gas["toxins"])
+		var/heat_capacity = held_plasma.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
 
 	//if there is too much plasma in the field, lose some
 	/*if( held_plasma.toxins > (MOLES_CELLSTANDARD * 7) * (50 / field_strength) )
 		LosePlasma()*/
-	if(held_plasma.toxins > 1)
+	if(held_plasma.gas["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)
 		var/loss_ratio = rand() * (0.05 + (0.05 * 50 / field_strength))
 		//world << "lost [loss_ratio*100]% of held plasma"
@@ -187,16 +186,16 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
 		var/datum/gas_mixture/plasma_lost = new
 		plasma_lost.temperature = held_plasma.temperature
 		//
-		plasma_lost.toxins = held_plasma.toxins * loss_ratio
+		plasma_lost.gas["toxins"] = held_plasma.gas["toxins"] * loss_ratio
 		//plasma_lost.update_values()
-		held_plasma.toxins -= held_plasma.toxins * loss_ratio
+		held_plasma.gas["toxins"] -= held_plasma.gas["toxins"] * loss_ratio
 		//held_plasma.update_values()
 		//
 		environment.merge(plasma_lost)
 		radiation += loss_ratio * mega_energy * 0.1
 		mega_energy -= loss_ratio * mega_energy * 0.1
 	else
-		held_plasma.toxins = 0
+		held_plasma.gas["toxins"] = null
 		//held_plasma.update_values()
 
 	//handle some reactants formatting

code/WorkInProgress/Chinsky/ashtray.dm

@@ -82,8 +82,7 @@
 	icon_broken  = "ashtray_bork_bl"
 	max_butts = 14
 	health = 24.0
-	g_amt = 30
-	m_amt = 30
+	matter = list("metal" = 20,"glass" = 30)
 	empty_desc = "Cheap plastic ashtray."
 	throwforce = 3.0
 	die()
@@ -103,7 +102,7 @@
 	icon_broken  = "ashtray_bork_br"
 	max_butts = 10
 	health = 72.0
-	m_amt = 80
+	matter = list("metal" = 80)
 	empty_desc = "Massive bronze ashtray."
 	throwforce = 10.0
 
@@ -124,7 +123,7 @@
 	icon_broken  = "ashtray_bork_gl"
 	max_butts = 12
 	health = 12.0
-	g_amt = 60
+	matter = list("glass" = 60)
 	empty_desc = "Glass ashtray. Looks fragile."
 	throwforce = 6.0
 

code/WorkInProgress/Mini/atmos_control.dm

@@ -11,7 +11,7 @@
 	circuit = "/obj/item/weapon/circuitboard/atmoscontrol"
 	var/obj/machinery/alarm/current
 	var/overridden = 0 //not set yet, can't think of a good way to do it
-	req_access = list(access_ce)
+	req_access = list(access_atmospherics)
 
 
 /obj/machinery/computer/atmoscontrol/attack_ai(var/mob/user as mob)
@@ -156,12 +156,14 @@
 				src.updateUsrDialog()
 			return
 
-		if(href_list["atmos_unlock"])
-			switch(href_list["atmos_unlock"])
-				if("0")
-					current.air_doors_close(1)
-				if("1")
-					current.air_doors_open(1)
+		//commenting this out because it causes compile errors
+		//I tried fixing it but wasn't sucessful.
+		//if(href_list["atmos_unlock"])
+		//	switch(href_list["atmos_unlock"])
+		//		if("0")
+		//			current.alarm_area.air_doors_close()
+		//		if("1")
+		//			current.alarm_area.air_doors_open()
 
 		if(href_list["atmos_alarm"])
 			if (current.alarm_area.atmosalert(2))