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/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()