Pass I

code/modules/assembly/assembly.dm

@@ -5,8 +5,7 @@
 	icon_state = ""
 	flags = CONDUCT
 	w_class = 2.0
-	m_amt = 100
-	g_amt = 0
+	materials = list(MAT_METAL=100)
 	throwforce = 2
 	throw_speed = 3
 	throw_range = 10

code/modules/assembly/igniter.dm

@@ -2,8 +2,7 @@
 	name = "igniter"
 	desc = "A small electronic device able to ignite combustable substances."
 	icon_state = "igniter"
-	m_amt = 500
-	g_amt = 50
+	materials = list(MAT_METAL=500, MAT_GLASS=50)
 	w_amt = 10
 	origin_tech = "magnets=1"
 

code/modules/assembly/infrared.dm

@@ -2,8 +2,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
+	materials = list(MAT_METAL=1000, MAT_GLASS=500)
 	origin_tech = "magnets=2"
 
 	bomb_name = "tripwire mine"

code/modules/assembly/mousetrap.dm

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

code/modules/assembly/proximity.dm

@@ -2,8 +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
+	materials = list(MAT_METAL=800, MAT_GLASS=200)
 	origin_tech = "magnets=1"
 
 	secured = 0

code/modules/assembly/signaler.dm

@@ -3,8 +3,7 @@
 	desc = "Used to remotely activate devices."
 	icon_state = "signaller"
 	item_state = "signaler"
-	m_amt = 400
-	g_amt = 120
+	materials = list(MAT_METAL=400, MAT_GLASS=120)
 	origin_tech = "magnets=1"
 	wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
 
@@ -18,7 +17,7 @@
 	var/delay = 0
 	var/datum/radio_frequency/radio_connection
 	var/airlock_wire = null
-	
+
 	New()
 		..()
 		if(!radio_controller)

code/modules/assembly/timer.dm

@@ -2,8 +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
+	materials = list(MAT_METAL=500, MAT_GLASS=50)
 	origin_tech = "magnets=1"
 
 	secured = 0

code/modules/assembly/voice.dm

@@ -2,8 +2,7 @@
 	name = "voice analyzer"
 	desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated."
 	icon_state = "voice"
-	m_amt = 500
-	g_amt = 50
+	materials = list(MAT_METAL=500, MAT_GLASS=50)
 	origin_tech = "magnets=1"
 	var/listening = 0
 	var/recorded = null	//the activation message