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/modules/assembly/assembly.dm

@@ -5,9 +5,7 @@
 	icon_state = ""
 	flags = FPRINT | TABLEPASS| CONDUCT
 	w_class = 2.0
-	m_amt = 100
-	g_amt = 0
-	w_amt = 0
+	matter = list("metal" = 100)
 	throwforce = 2
 	throw_speed = 3
 	throw_range = 10

code/modules/assembly/bomb.dm

@@ -101,7 +101,7 @@
 	return
 
 /obj/item/weapon/tank/proc/ignite()	//This happens when a bomb is told to explode
-	var/fuel_moles = air_contents.toxins + air_contents.oxygen/6
+	var/fuel_moles = air_contents.gas["toxins"] + air_contents.gas["oxygen"] / 6
 	var/strength = 1
 
 	var/turf/ground_zero = get_turf(loc)
@@ -149,7 +149,7 @@
 	del(src)
 
 /obj/item/weapon/tank/proc/release()	//This happens when the bomb is not welded. Tank contents are just spat out.
-	var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles())
+	var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles)
 	var/turf/simulated/T = get_turf(src)
 	if(!T)
 		return

code/modules/assembly/igniter.dm

@@ -2,9 +2,7 @@
 	name = "igniter"
 	desc = "A small electronic device able to ignite combustable substances."
 	icon_state = "igniter"
-	m_amt = 500
-	g_amt = 50
-	w_amt = 10
+	matter = list("metal" = 500, "glass" = 50, "waste" = 10)
 	origin_tech = "magnets=1"
 
 	secured = 1

code/modules/assembly/infrared.dm

@@ -4,9 +4,7 @@
 	name = "infrared emitter"
 	desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted."
 	icon_state = "infrared"
-	m_amt = 1000
-	g_amt = 500
-	w_amt = 100
+	matter = list("metal" = 1000, "glass" = 500, "waste" = 100)
 	origin_tech = "magnets=2"
 
 	wires = WIRE_PULSE

code/modules/assembly/mousetrap.dm

@@ -2,8 +2,7 @@
 	name = "mousetrap"
 	desc = "A handy little spring-loaded trap for catching pesty rodents."
 	icon_state = "mousetrap"
-	m_amt = 100
-	w_amt = 10
+	matter = list("metal" = 100, "waste" = 10)
 	origin_tech = "combat=1"
 	var/armed = 0
 

code/modules/assembly/proximity.dm

@@ -2,9 +2,7 @@
 	name = "proximity sensor"
 	desc = "Used for scanning and alerting when someone enters a certain proximity."
 	icon_state = "prox"
-	m_amt = 800
-	g_amt = 200
-	w_amt = 50
+	matter = list("metal" = 800, "glass" = 200, "waste" = 50)
 	origin_tech = "magnets=1"
 
 	wires = WIRE_PULSE

code/modules/assembly/signaler.dm

@@ -3,9 +3,7 @@
 	desc = "Used to remotely activate devices."
 	icon_state = "signaller"
 	item_state = "signaler"
-	m_amt = 1000
-	g_amt = 200
-	w_amt = 100
+	matter = list("metal" = 1000, "glass" = 200, "waste" = 100)
 	origin_tech = "magnets=1"
 	wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
 

code/modules/assembly/timer.dm

@@ -2,9 +2,7 @@
 	name = "timer"
 	desc = "Used to time things. Works well with contraptions which has to count down. Tick tock."
 	icon_state = "timer"
-	m_amt = 500
-	g_amt = 50
-	w_amt = 10
+	matter = list("metal" = 500, "glass" = 50, "waste" = 10)
 	origin_tech = "magnets=1"
 
 	wires = WIRE_PULSE
@@ -20,7 +18,7 @@
 
 	activate()
 		if(!..())	return 0//Cooldown check
-		
+
 		timing = !timing
 
 		update_icon()