The various assemblies should be working now.

Old style bombs and suicide vests temporarily removed.
Players can now be job banned from being a pAI.
Added null checks to explosion() due to runtime errors. 
Changelog updated


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1980 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/bombspawner.dm

@@ -1,3 +1,28 @@
+/* The old single tank bombs that dont really work anymore
+/obj/spawner/bomb
+	name = "bomb"
+	icon = 'screen1.dmi'
+	icon_state = "x"
+	var/btype = 0  //0 = radio, 1= prox, 2=time
+	var/explosive = 1	// 0= firebomb
+	var/btemp = 500	// bomb temperature (degC)
+	var/active = 0
+
+/obj/spawner/bomb/radio
+	btype = 0
+
+/obj/spawner/bomb/proximity
+	btype = 1
+
+/obj/spawner/bomb/timer
+	btype = 2
+
+/obj/spawner/bomb/timer/syndicate
+	btemp = 450
+
+/obj/spawner/bomb/suicide
+	btype = 3
+
 /obj/spawner/bomb/New()
 	..()
 
@@ -16,7 +41,7 @@
 			p3.master = R
 			R.status = explosive
 			p1.b_stat = 0
-			p2.status = 1
+			p2.secured = 1
 			p3.air_contents.temperature = btemp + T0C
 
 		// proximity
@@ -34,10 +59,10 @@
 			R.status = explosive
 
 			p3.air_contents.temperature = btemp + T0C
-			p2.status = 1
+			p2.secured = 1
 
 			if(src.active)
-				R.part1.state = 1
+				R.part1.secured = 1
 				R.part1.icon_state = text("motion[]", 1)
 				R.c_state(1, src)
 
@@ -56,7 +81,7 @@
 			R.status = explosive
 
 			p3.air_contents.temperature = btemp + T0C
-			p2.status = 1
+			p2.secured = 1
 		//bombvest
 		if(3)
 			var/obj/item/clothing/suit/armor/a_i_a_ptank/R = new /obj/item/clothing/suit/armor/a_i_a_ptank(src.loc)
@@ -75,9 +100,31 @@
 			R.status = explosive
 
 			p4.air_contents.temperature = btemp + T0C
-			p2.status = 1
+			p2.secured = 1
 
 	del(src)
+*/
+
+/obj/spawner/newbomb
+	name = "bomb"
+	icon = 'screen1.dmi'
+	icon_state = "x"
+	var/btype = 0 // 0=radio, 1=prox, 2=time
+	var/btemp1 = 1500
+	var/btemp2 = 1000	// tank temperatures
+
+	timer
+		btype = 2
+
+		syndicate
+			btemp1 = 150
+			btemp2 = 20
+
+	proximity
+		btype = 1
+
+	radio
+		btype = 0
 
 
 /obj/spawner/newbomb/New()
@@ -97,7 +144,8 @@
 			V.tank_two = OT
 			V.attached_device = S
 
-			S.master = V
+			S.holder = V
+			S.Secure()
 			PT.master = V
 			OT.master = V
 
@@ -121,7 +169,8 @@
 			V.tank_two = OT
 			V.attached_device = P
 
-			P.master = V
+			P.holder = V
+			P.Secure()
 			PT.master = V
 			OT.master = V
 
@@ -144,7 +193,8 @@
 			V.tank_two = OT
 			V.attached_device = T
 
-			T.master = V
+			T.holder = V
+			T.Secure()
 			PT.master = V
 			OT.master = V
 			T.time = 30

code/game/objects/devices/PDA/cart.dm

@@ -585,9 +585,6 @@ Code:
 				active3 = S
 
 		if("Send Signal")
-			for(var/obj/item/assembly/r_i_ptank/R in world) //Bomblist stuff
-				if((R.part1.code == src/radio:code) && (R.part1.frequency == radio:frequency))
-					bombers += "[key_name(usr)] has activated a radio bomb (Freq: [format_frequency(radio:frequency)], Code: [radio:code]). Temp = [R.part3.air_contents.temperature-T0C]."
 			spawn( 0 )
 				radio:send_signal("ACTIVATE")
 				return

code/game/objects/devices/igniter.dm

@@ -1,149 +0,0 @@
-
-/obj/item/device/igniter/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if ((istype(W, /obj/item/device/radio/signaler) && !( src.status )))
-		var/obj/item/device/radio/signaler/S = W
-		if (!( S.b_stat ))
-			return
-		var/obj/item/assembly/rad_ignite/R = new /obj/item/assembly/rad_ignite( user )
-		S.loc = R
-		R.part1 = S
-		S.layer = initial(S.layer)
-		if (user.client)
-			user.client.screen -= S
-		if (user.r_hand == S)
-			user.u_equip(S)
-			user.r_hand = R
-		else
-			user.u_equip(S)
-			user.l_hand = R
-		S.master = R
-		src.master = R
-		src.layer = initial(src.layer)
-		user.u_equip(src)
-		if (user.client)
-			user.client.screen -= src
-		src.loc = R
-		R.part2 = src
-		R.layer = 20
-		R.loc = user
-		src.add_fingerprint(user)
-
-	else if ((istype(W, /obj/item/device/prox_sensor) && !( src.status )))
-
-		var/obj/item/assembly/prox_ignite/R = new /obj/item/assembly/prox_ignite( user )
-		W.loc = R
-		R.part1 = W
-		W.layer = initial(W.layer)
-		if (user.client)
-			user.client.screen -= W
-		if (user.r_hand == W)
-			user.u_equip(W)
-			user.r_hand = R
-		else
-			user.u_equip(W)
-			user.l_hand = R
-		W.master = R
-		src.master = R
-		src.layer = initial(src.layer)
-		user.u_equip(src)
-		if (user.client)
-			user.client.screen -= src
-		src.loc = R
-		R.part2 = src
-		R.layer = 20
-		R.loc = user
-		src.add_fingerprint(user)
-
-	else if ((istype(W, /obj/item/device/timer) && !( src.status )))
-
-		var/obj/item/assembly/time_ignite/R = new /obj/item/assembly/time_ignite( user )
-		W.loc = R
-		R.part1 = W
-		W.layer = initial(W.layer)
-		if (user.client)
-			user.client.screen -= W
-		if (user.r_hand == W)
-			user.u_equip(W)
-			user.r_hand = R
-		else
-			user.u_equip(W)
-			user.l_hand = R
-		W.master = R
-		src.master = R
-		src.layer = initial(src.layer)
-		user.u_equip(src)
-		if (user.client)
-			user.client.screen -= src
-		src.loc = R
-		R.part2 = src
-		R.layer = 20
-		R.loc = user
-		src.add_fingerprint(user)
-	else if ((istype(W, /obj/item/device/healthanalyzer) && !( src.status )))
-
-		var/obj/item/assembly/anal_ignite/R = new /obj/item/assembly/anal_ignite( user ) // Hehehe anal
-		W.loc = R
-		R.part1 = W
-		W.layer = initial(W.layer)
-		if (user.client)
-			user.client.screen -= W
-		if (user.r_hand == W)
-			user.u_equip(W)
-			user.r_hand = R
-		else
-			user.u_equip(W)
-			user.l_hand = R
-		W.master = R
-		src.master = R
-		src.layer = initial(src.layer)
-		user.u_equip(src)
-		if (user.client)
-			user.client.screen -= src
-		src.loc = R
-		R.part2 = src
-		R.layer = 20
-		R.loc = user
-		src.add_fingerprint(user)
-
-	if (!( istype(W, /obj/item/weapon/screwdriver) ))
-		return
-	src.status = !( src.status )
-	if (src.status)
-		user.show_message("\blue The igniter is ready!")
-	else
-		user.show_message("\blue The igniter can now be attached!")
-	src.add_fingerprint(user)
-	return
-
-/obj/item/device/igniter/attack_self(mob/user as mob)
-
-	src.add_fingerprint(user)
-	spawn( 5 )
-		ignite()
-		return
-	return
-
-/obj/item/device/igniter/proc/ignite()
-	if (src.status)
-		var/turf/location = src.loc
-
-		if (src.master)
-			location = src.master.loc
-
-		location = get_turf(location)
-		if(location)
-			location.hotspot_expose(1000,1000)
-
-	return
-
-/obj/item/device/igniter/examine()
-	set src in view()
-
-	..()
-	if ((in_range(src, usr) || src.loc == usr))
-		if (src.status)
-			usr.show_message("The igniter is ready!")
-		else
-			usr.show_message("The igniter can be attached!")
-	return

code/game/objects/devices/infra_sensor.dm

@@ -10,8 +10,8 @@
 
 /obj/item/device/infra_sensor/proc/burst()
 	for(var/obj/beam/i_beam/I in range(src.loc))
-		I.left = 10
-	for(var/obj/item/device/infra/I in range(src.loc))
+		I.left = 8
+/*	for(var/obj/item/device/infra/I in range(src.loc))ugh will have to fix this
 		I.visible = 1
 		spawn( 0 )
 			if ((I && I.first))
@@ -22,7 +22,7 @@
 		spawn( 0 )
 			if ((I.part2 && I.part2.first))
 				I.part2.first.vis_spread(1)
-			return
+			return*/
 	return
 
 /obj/item/device/infra_sensor/attack_self(mob/user as mob)
@@ -67,148 +67,4 @@
 		return
 	return
 
-/obj/item/device/infra/proc/hit()
-	if (src.master)
-		spawn()
-			var/datum/signal/signal = new
-			signal.data["message"] = "ACTIVATE"
-			src.master.receive_signal(signal)
-			del(signal)
-			return
-	else
-		for(var/mob/O in hearers(null, null))
-			O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
-	return
 
-/obj/item/device/infra/process()
-	if(!state)
-		processing_items.Remove(src)
-		return null
-
-	if ((!( src.first ) && (src.state && (istype(src.loc, /turf) || (src.master && istype(src.master.loc, /turf))))))
-		var/obj/beam/i_beam/I = new /obj/beam/i_beam( (src.master ? src.master.loc : src.loc) )
-		//world << "infra spawning beam : \ref[I]"
-		I.master = src
-		I.density = 1
-		I.dir = src.dir
-		step(I, I.dir)
-		if (I)
-			//world << "infra: beam at [I.x] [I.y] [I.z]"
-			I.density = 0
-			src.first = I
-			//world << "infra : vis_spread"
-			I.vis_spread(src.visible)
-			spawn( 0 )
-				if (I)
-					//world << "infra: setting limit"
-					I.limit = 20
-					//world << "infra: processing beam \ref[I]"
-					I.process()
-				return
-	if (!( src.state ))
-		//src.first = null
-		del(src.first)
-	return
-
-/obj/item/device/infra/attackby(obj/item/device/radio/signaler/S as obj, mob/user as mob)
-	..()
-	if ((!( istype(S, /obj/item/device/radio/signaler) ) || !( S.b_stat )))
-		return
-	var/obj/item/assembly/rad_infra/R = new /obj/item/assembly/rad_infra( user )
-	S.loc = R
-	R.part1 = S
-	S.layer = initial(S.layer)
-	if (user.client)
-		user.client.screen -= S
-	if (user.r_hand == S)
-		user.u_equip(S)
-		user.r_hand = R
-	else
-		user.u_equip(S)
-		user.l_hand = R
-	S.master = R
-	src.master = R
-	src.layer = initial(src.layer)
-	user.u_equip(src)
-	if (user.client)
-		user.client.screen -= src
-	src.loc = R
-	R.part2 = src
-	R.layer = 20
-	R.loc = user
-	R.dir = src.dir
-	src.add_fingerprint(user)
-	return
-
-/obj/item/device/infra/attack_self(mob/user as mob)
-	user.machine = src
-	var/dat = text("<TT><B>Infrared Laser</B>\n<B>Status</B>: []<BR>\n<B>Visibility</B>: []<BR>\n</TT>", (src.state ? text("<A href='?src=\ref[];state=0'>On</A>", src) : text("<A href='?src=\ref[];state=1'>Off</A>", src)), (src.visible ? text("<A href='?src=\ref[];visible=0'>Visible</A>", src) : text("<A href='?src=\ref[];visible=1'>Invisible</A>", src)))
-	user << browse(dat, "window=infra")
-	onclose(user, "infra")
-	return
-
-/obj/item/device/infra/Topic(href, href_list)
-	..()
-	if (usr.stat || usr.restrained())
-		return
-	if ((usr.contents.Find(src) || usr.contents.Find(src.master) || in_range(src, usr) && istype(src.loc, /turf)))
-		usr.machine = src
-		if (href_list["state"])
-			src.state = !( src.state )
-			src.icon_state = text("infrared[]", src.state)
-			if (src.master)
-				src.master:c_state(src.state, src)
-			if(state)
-				processing_items.Add(src)
-		if (href_list["visible"])
-			src.visible = !( src.visible )
-			spawn( 0 )
-				if (src.first)
-					src.first.vis_spread(src.visible)
-				return
-		if (!( src.master ))
-			if (istype(src.loc, /mob))
-				attack_self(src.loc)
-			else
-				for(var/mob/M in viewers(1, src))
-					if (M.client)
-						src.attack_self(M)
-					//Foreach goto(211)
-		else
-			if (istype(src.master.loc, /mob))
-				src.attack_self(src.master.loc)
-			else
-				for(var/mob/M in viewers(1, src.master))
-					if (M.client)
-						src.attack_self(M)
-					//Foreach goto(287)
-	else
-		usr << browse(null, "window=infra")
-		onclose(usr, "infra")
-		return
-	return
-
-/obj/item/device/infra/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
-/obj/item/device/infra/attack_hand()
-	//src.first = null
-	del(src.first)
-	..()
-	return
-
-/obj/item/device/infra/Move()
-	var/t = src.dir
-	..()
-	src.dir = t
-	//src.first = null
-	del(src.first)
-	return
-
-/obj/item/device/infra/verb/rotate()
-	set name = "Rotate Infrared Laser"
-	set category = "Object"
-	set src in usr
-
-	src.dir = turn(src.dir, 90)
-	return

code/game/objects/devices/proxy_sensor.dm

@@ -1,171 +0,0 @@
-/obj/item/device/prox_sensor/dropped()
-	spawn(0)
-		src.sense()
-		return
-	return
-
-/obj/item/device/prox_sensor/proc/c_state(n)
-	src.icon_state = text("motion[]", n)
-
-	if(src.master)
-		src.master:c_state(n)
-
-	return
-
-/obj/item/device/prox_sensor/proc/sense()
-	if (src.state)
-		if (src.master)
-			spawn(0)
-				src.master.receive_signal()
-				return
-		else
-			for(var/mob/O in hearers(null, null))
-				O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
-	return
-
-/obj/item/device/prox_sensor/process()
-	if (src.timing)
-		if (src.time > 0)
-			if(!src.state)
-				src.c_state(2)
-			src.time = round(src.time) - 1
-		else
-			time()
-			src.time = 0
-			src.timing = 0
-		if (!src.master)
-			if (istype(src.loc, /mob))
-				attack_self(src.loc)
-			else
-				for(var/mob/M in viewers(1, src))
-					if (M.client && (M.machine == src.master || M.machine == src))
-						src.attack_self(M)
-		else
-			if (istype(src.master.loc, /mob))
-				src.attack_self(src.master.loc)
-			else
-				for(var/mob/M in viewers(1, src.master))
-					if (M.client && (M.machine == src.master || M.machine == src))
-						src.attack_self(M)
-	else
-		processing_items.Remove(src)
-		return
-	return
-
-/obj/item/device/prox_sensor/proc/time()
-	if (src.state == 0)
-		src.state = !( src.state )
-		src.icon_state = text("motion[]", src.state)
-		if (src.master)
-			src.master:c_state(src.state, src)
-	return
-
-/obj/item/device/prox_sensor/HasProximity(atom/movable/AM as mob|obj)
-	if (istype(AM, /obj/beam))
-		return
-	if (AM.move_speed < 12)
-		src.sense()
-	return
-
-/obj/item/device/prox_sensor/attackby(obj/item/device/radio/signaler/S as obj, mob/user as mob)
-	..()
-	if ((!( istype(S, /obj/item/device/radio/signaler) ) || !( S.b_stat )))
-		return
-	var/obj/item/assembly/rad_prox/R = new /obj/item/assembly/rad_prox( user )
-	S.loc = R
-	R.part1 = S
-	S.layer = initial(S.layer)
-	if (user.client)
-		user.client.screen -= S
-	if (user.r_hand == S)
-		user.u_equip(S)
-		user.r_hand = R
-	else
-		user.u_equip(S)
-		user.l_hand = R
-	S.master = R
-	src.master = R
-	src.layer = initial(src.layer)
-	user.u_equip(src)
-	if (user.client)
-		user.client.screen -= src
-	src.loc = R
-	R.part2 = src
-	R.layer = 20
-	R.loc = user
-	R.dir = src.dir
-	src.add_fingerprint(user)
-	return
-
-/obj/item/device/prox_sensor/attack_self(mob/user as mob)
-	if (user.stat || user.restrained() || user.lying)
-		return
-	if ((user.contents.Find(src) || user.contents.Find(src.master) || get_dist(src, user) <= 1 && istype(src.loc, /turf)))
-		user.machine = src
-		var/second = src.time % 60
-		var/minute = (src.time - second) / 60
-		var/dat = text("<TT><B>Proximity Sensor</B>\n[] []:[]\n<A href='?src=\ref[];tp=-30'>-</A> <A href='?src=\ref[];tp=-1'>-</A> <A href='?src=\ref[];tp=1'>+</A> <A href='?src=\ref[];tp=30'>+</A>\n</TT>", (src.timing ? text("<A href='?src=\ref[];time=0'>Arming</A>", src) : text("<A href='?src=\ref[];time=1'>Not Arming</A>", src)), minute, second, src, src, src, src)
-		dat += "<BR><A href='?src=\ref[src];state=1'>[state?"Armed":"Unarmed"]</A> (Movement sensor active when armed!)"
-		dat += "<BR><BR><A href='?src=\ref[src];close=1'>Close</A>"
-		user << browse(dat, "window=prox")
-		onclose(user, "prox")
-	else
-		user << browse(null, "window=prox")
-		user.machine = null
-		return
-
-/obj/item/device/prox_sensor/Topic(href, href_list)
-	..()
-	if (usr.stat || usr.restrained() || usr.lying)
-		return
-	if ((usr.contents.Find(src) || usr.contents.Find(src.master) || (get_dist(src, usr) <= 1) && istype(src.loc, /turf)))
-		usr.machine = src
-		if (href_list["state"])
-			src.state = !( src.state )
-			src.icon_state = text("motion[]", src.state)
-			if (src.master)
-				src.master:c_state(src.state, src)
-			if(state)
-				processing_items.Add(src)
-
-		if (href_list["time"])
-			src.timing = text2num(href_list["time"])
-			if(timing)
-				src.c_state(1)
-
-		if (href_list["tp"])
-			var/tp = text2num(href_list["tp"])
-			src.time += tp
-			src.time = min(max(round(src.time), 0), 600)
-
-		if (href_list["close"])
-			usr << browse(null, "window=prox")
-			usr.machine = null
-			return
-
-		if (!src.master)
-			if (istype(src.loc, /mob))
-				attack_self(src.loc)
-			else
-				for(var/mob/M in viewers(1, src))
-					if (M.client && (M.machine == src.master || M.machine == src))
-						src.attack_self(M)
-		else
-			if (istype(src.master.loc, /mob))
-				src.attack_self(src.master.loc)
-			else
-				for(var/mob/M in viewers(1, src.master))
-					if (M.client && (M.machine == src.master || M.machine == src))
-						src.attack_self(M)
-	else
-		usr << browse(null, "window=prox")
-		return
-	return
-
-/obj/item/device/prox_sensor/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
-/obj/item/device/prox_sensor/Move()
-	..()
-	src.sense()
-	return

code/game/objects/devices/scanners.dm

@@ -9,6 +9,16 @@ PLANT ANALYZER
 MASS SPECTROMETER
 
 */
+/obj/item/device/t_scanner
+	name = "T-ray scanner"
+	desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
+	icon_state = "t-ray0"
+	var/on = 0
+	flags = FPRINT|ONBELT|TABLEPASS
+	w_class = 2
+	item_state = "electronic"
+	m_amt = 150
+	origin_tech = "magnets=1;engineering=1"
 
 /obj/item/device/t_scanner/attack_self(mob/user)
 
@@ -49,6 +59,17 @@ MASS SPECTROMETER
 				if(M)
 					M.invisibility = 2
 
+/obj/item/device/detective_scanner
+	name = "Scanner"
+	desc = "Used to scan objects for DNA and fingerprints."
+	icon_state = "forensic0"
+	var/amount = 20.0
+	var/printing = 0.0
+	w_class = 3.0
+	item_state = "electronic"
+	flags = FPRINT | TABLEPASS | ONBELT | CONDUCT | USEDELAY
+
+
 /obj/item/device/detective_scanner/attackby(obj/item/weapon/f_card/W as obj, mob/user as mob)
 	..()
 
@@ -142,6 +163,20 @@ MASS SPECTROMETER
 		//Foreach goto(186)
 	return
 
+
+/obj/item/device/healthanalyzer
+	name = "Health Analyzer"
+	icon_state = "health"
+	item_state = "analyzer"
+	desc = "A hand-held body scanner able to distinguish vital signs of the subject."
+	flags = FPRINT | ONBELT | TABLEPASS | CONDUCT
+	throwforce = 3
+	w_class = 1.0
+	throw_speed = 5
+	throw_range = 10
+	m_amt = 200
+	origin_tech = "magnets=1;biotech=1"
+
 /obj/item/device/healthanalyzer/attack(mob/M as mob, mob/user as mob)
 	if ((user.mutations & CLOWN || user.brainloss >= 60) && prob(50))
 		user << text("\red You try to analyze the floor's vitals!")
@@ -187,6 +222,21 @@ MASS SPECTROMETER
 	src.add_fingerprint(user)
 	return
 
+
+/obj/item/device/analyzer
+	desc = "A hand-held environmental scanner which reports current gas levels."
+	name = "analyzer"
+	icon_state = "atmos"
+	item_state = "analyzer"
+	w_class = 2.0
+	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
+	throwforce = 5
+	throw_speed = 4
+	throw_range = 20
+	m_amt = 30
+	g_amt = 20
+	origin_tech = "magnets=1;engineering=1"
+
 /obj/item/device/analyzer/attack_self(mob/user as mob)
 
 	if (user.stat)

code/game/objects/devices/timer.dm

@@ -1,156 +0,0 @@
-/obj/item/device/timer/proc/time()
-	src.c_state(0)
-
-	if (src.master)
-		spawn( 0 )
-			var/datum/signal/signal = new
-			signal.source = src
-			signal.data["message"] = "ACTIVATE"
-			src.master.receive_signal(signal)
-			del(signal)
-			return
-	else
-		for(var/mob/O in hearers(null, null))
-			O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
-	return
-
-//*****RM
-
-
-/obj/item/device/timer/proc/c_state(n)
-	src.icon_state = text("timer[]", n)
-
-	if(src.master)
-		src.master:c_state(n)
-
-	return
-
-//*****
-
-/obj/item/device/timer/process()
-	if (src.timing)
-		if (src.time > 0)
-			src.time = round(src.time) - 1
-			if(time<5)
-				src.c_state(2)
-			else
-				// they might increase the time while it is timing
-				src.c_state(1)
-		else
-			time()
-			src.time = 0
-			src.timing = 0
-		if (!src.master)
-			if (istype(src.loc, /mob))
-				attack_self(src.loc)
-			else
-				for(var/mob/M in viewers(1, src))
-					if (M.client && (M.machine == src.master || M.machine == src))
-						src.attack_self(M)
-		else
-			if (istype(src.master.loc, /mob))
-				src.attack_self(src.master.loc)
-			else
-				for(var/mob/M in viewers(1, src.master))
-					if (M.client && (M.machine == src.master || M.machine == src))
-						src.attack_self(M)
-	else
-		// If it's not timing, reset the icon so it doesn't look like it's still about to go off.
-		src.c_state(0)
-		processing_items.Remove(src)
-
-	return
-
-/obj/item/device/timer/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if (istype(W, /obj/item/device/radio/signaler) )
-		var/obj/item/device/radio/signaler/S = W
-		if(!S.b_stat)
-			return
-
-		var/obj/item/assembly/rad_time/R = new /obj/item/assembly/rad_time( user )
-		S.loc = R
-		R.part1 = S
-		S.layer = initial(S.layer)
-		if (user.client)
-			user.client.screen -= S
-		if (user.r_hand == S)
-			user.u_equip(S)
-			user.r_hand = R
-		else
-			user.u_equip(S)
-			user.l_hand = R
-		S.master = R
-		src.master = R
-		src.layer = initial(src.layer)
-		user.u_equip(src)
-		if (user.client)
-			user.client.screen -= src
-		src.loc = R
-		R.part2 = src
-		R.layer = 20
-		R.loc = user
-		R.dir = src.dir
-		src.add_fingerprint(user)
-		R.add_fingerprint(user)
-		return
-
-/obj/item/device/timer/attack_self(mob/user as mob)
-	..()
-	if (user.stat || user.restrained() || user.lying)
-		return
-	if ((user.contents.Find(src) || user.contents.Find(src.master) || get_dist(src, user) <= 1 && istype(src.loc, /turf)))
-		user.machine = src
-		var/second = src.time % 60
-		var/minute = (src.time - second) / 60
-		var/dat = text("<TT><B>Timing Unit</B>\n[] []:[]\n<A href='?src=\ref[];tp=-30'>-</A> <A href='?src=\ref[];tp=-1'>-</A> <A href='?src=\ref[];tp=1'>+</A> <A href='?src=\ref[];tp=30'>+</A>\n</TT>", (src.timing ? text("<A href='?src=\ref[];time=0'>Timing</A>", src) : text("<A href='?src=\ref[];time=1'>Not Timing</A>", src)), minute, second, src, src, src, src)
-		dat += "<BR><BR><A href='?src=\ref[src];close=1'>Close</A>"
-		user << browse(dat, "window=timer")
-		onclose(user, "timer")
-	else
-		user << browse(null, "window=timer")
-		user.machine = null
-
-	return
-
-/obj/item/device/timer/Topic(href, href_list)
-	..()
-	if (usr.stat || usr.restrained() || usr.lying)
-		return
-	if ((usr.contents.Find(src) || usr.contents.Find(src.master) || in_range(src, usr) && istype(src.loc, /turf)))
-		usr.machine = src
-		if (href_list["time"])
-			src.timing = text2num(href_list["time"])
-			if(timing)
-				src.c_state(1)
-				processing_items.Add(src)
-
-		if (href_list["tp"])
-			var/tp = text2num(href_list["tp"])
-			src.time += tp
-			src.time = min(max(round(src.time), 0), 600)
-
-		if (href_list["close"])
-			usr << browse(null, "window=timer")
-			usr.machine = null
-			return
-
-		if (!src.master)
-			if (istype(src.loc, /mob))
-				attack_self(src.loc)
-			else
-				for(var/mob/M in viewers(1, src))
-					if (M.client && (M.machine == src.master || M.machine == src))
-						src.attack_self(M)
-		else
-			if (istype(src.master.loc, /mob))
-				src.attack_self(src.master.loc)
-			else
-				for(var/mob/M in viewers(1, src.master))
-					if (M.client && (M.machine == src.master || M.machine == src))
-						src.attack_self(M)
-		src.add_fingerprint(usr)
-	else
-		usr << browse(null, "window=timer")
-		return
-	return

code/game/objects/explosion.dm

@@ -37,28 +37,37 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
 			if(distance < devastation_range)
 				for(var/atom/object in T.contents)
 					spawn()
-						object.ex_act(1)
+						if(object)
+							object.ex_act(1)
 				if(prob(5))
-					T.ex_act(2)
+					if(T)
+						T.ex_act(2)
 				else
-					T.ex_act(1)
+					if(T)
+						T.ex_act(1)
 			else if(distance < heavy_impact_range)
 				for(var/atom/object in T.contents)
 					spawn()
-						object.ex_act(2)
-				T.ex_act(2)
+						if(object)
+							object.ex_act(2)
+				if(T)
+					T.ex_act(2)
 			else if (distance == heavy_impact_range)
 				for(var/atom/object in T.contents)
-					object.ex_act(2)
+					if(object)
+						object.ex_act(2)
 				if(prob(15) && devastation_range > 2 && heavy_impact_range > 2)
 					secondaryexplosion(T, 1)
 				else
-					T.ex_act(2)
+					if(T)
+						T.ex_act(2)
 			else if(distance <= light_impact_range)
 				for(var/atom/object in T.contents)
 					spawn()
-						object.ex_act(3)
-				T.ex_act(3)
+						if(object)
+							object.ex_act(3)
+				if(T)
+					T.ex_act(3)
 			for(var/mob/living/carbon/mob in T)
 				flick("flash", mob:flash)
 

code/game/objects/items/shock_kit.dm

@@ -1,3 +1,13 @@
+/obj/item/assembly/shock_kit
+	name = "Shock Kit"
+	desc = "This appears to be made from both an Electric Pack and a Helmet."
+	icon_state = "shock_kit"
+	var/obj/item/clothing/head/helmet/part1 = null
+	var/obj/item/device/radio/electropack/part2 = null
+	var/status = 0.0
+	w_class = 5.0
+	flags = FPRINT | TABLEPASS| CONDUCT
+
 /obj/item/assembly/shock_kit/Del()
 	//src.part1 = null
 	del(src.part1)

code/game/objects/items/weapons/flamethrower.dm

@@ -4,6 +4,39 @@ GETLINEEEEEEEEEEEEEEEEEEEEE
 (well not really but it should)
 
 */
+/obj/item/assembly/weld_rod
+	desc = "A welding torch with metal rods attached to the flame tip."
+	name = "Welder/Rods Assembly"
+	icon_state = "welder-rods"
+	item_state = "welder"
+	var/obj/item/weapon/weldingtool/part1 = null
+	var/obj/item/stack/rods/part2 = null
+	var/status = null
+	flags = FPRINT | TABLEPASS| CONDUCT
+	force = 3.0
+	throwforce = 5.0
+	throw_speed = 1
+	throw_range = 5
+	w_class = 2.0
+
+/obj/item/assembly/w_r_ignite
+	desc = "A welding torch and igniter connected by metal rods."
+	name = "Welder/Rods/Igniter Assembly"
+	icon_state = "welder-rods-igniter"
+	item_state = "welder"
+	var/obj/item/weapon/weldingtool/part1 = null
+	var/obj/item/stack/rods/part2 = null
+	var/obj/item/device/igniter/part3 = null
+	var/status = null
+	flags = FPRINT | TABLEPASS| CONDUCT
+	force = 3.0
+	throwforce = 5.0
+	throw_speed = 1
+	throw_range = 5
+	w_class = 2.0
+
+
+//TODO:Change this over to a slightly better build system
 /obj/item/weapon/flamethrower
 	name = "flamethrower"
 	icon_state = "flamethrower"
@@ -79,7 +112,7 @@ GETLINEEEEEEEEEEEEEEEEEEEEE
 
 	if (istype(W, /obj/item/device/igniter))
 		var/obj/item/device/igniter/I = W
-		if (!( I.status ))
+		if (!( I.secured ))
 			return
 		var/obj/item/assembly/weld_rod/S = src
 		var/obj/item/assembly/w_r_ignite/R = new /obj/item/assembly/w_r_ignite( user )
@@ -127,7 +160,7 @@ GETLINEEEEEEEEEEEEEEEEEEEEE
 		src.part3.loc = T
 		src.part1.master = null
 		src.part2.master = null
-		src.part3.master = null
+		src.part3.holder = null
 		src.part1 = null
 		src.part2 = null
 		src.part3 = null
@@ -221,7 +254,7 @@ GETLINEEEEEEEEEEEEEEEEEEEEE
 		S.part2.master = R
 		R.part3 = S.part3
 		S.part3.loc = R
-		S.part3.master = R
+		S.part3.holder = R
 		S.layer = initial(S.layer)
 		if (user.client)
 			user.client.screen -= S

code/game/objects/radio/electropack.dm

@@ -1,3 +1,15 @@
+/obj/item/device/radio/electropack
+	name = "Electropack"
+	desc = "Dance my monkeys! DANCE!!!"
+	icon_state = "electropack0"
+	var/code = 2
+	var/on = 0
+	var/e_pads = 0.0
+	frequency = 1449
+	w_class = 5.0
+	flags = 323
+	item_state = "electropack"
+
 /obj/item/device/radio/electropack/examine()
 	set src in view()
 

code/game/objects/radio/signaler.dm

@@ -1,15 +1,91 @@
+/obj/item/device/radio/signaler
+	name = "Remote Signaling Device"
+	desc = "Used to remotely activate devices."
+	icon = 'new_assemblies.dmi'
+	icon_state = "signaller"
+	item_state = "signaler"
+	var/code = 30
+	w_class = 1
+	frequency = 1457
+	var/delay = 0
+	var/airlock_wire = null
 
-/*
-/obj/item/device/radio/signaler/examine()
-	set src in view()
-	..()
-	if ((in_range(src, usr) || src.loc == usr))
-		if (src.b_stat)
-			usr.show_message("\blue The signaler can be attached and modified!")
+	var
+		secured = 1
+		small_icon_state_left = "signaller_left"
+		small_icon_state_right = "signaller_right"
+		list/small_icon_state_overlays = null
+		obj/holder = null
+		cooldown = 0//To prevent spam
+
+	proc
+		Activate()//Called when this assembly is pulsed by another one
+		Secure()//Code that has to happen when the assembly is ready goes here
+		Unsecure()//Code that has to happen when the assembly is taken off of the ready state goes here
+		Attach_Assembly(var/obj/A, var/mob/user)//Called when an assembly is attacked by another
+		Process_cooldown()//Call this via spawn(10) to have it count down the cooldown var
+
+
+	IsAssembly()
+		return 1
+
+
+	Process_cooldown()
+		cooldown--
+		if(cooldown <= 0)	return 0
+		spawn(10)
+			Process_cooldown()
+		return 1
+
+
+	Activate()
+		if((!secured) || (cooldown > 0))
+			return 0
+		cooldown = 2
+		send_signal()
+		spawn(10)
+			Process_cooldown()
+		return 0
+
+
+	Secure()
+		if(secured)
+			return 0
+		secured = 1
+		return 1
+
+
+	Unsecure()
+		if(!secured)
+			return 0
+		secured = 0
+		return 1
+
+
+	Attach_Assembly(var/obj/A, var/mob/user)
+		holder = new/obj/item/device/assembly_holder(get_turf(src))
+		if(holder:attach(A,src,user))
+			user.show_message("\blue You attach the [A.name] to the [src.name]!")
+			return 1
+		return 0
+
+
+	attackby(obj/item/weapon/W as obj, mob/user as mob)
+		if(W.IsAssembly())
+			var/obj/item/device/D = W
+			if((!D:secured) && (!src.secured))
+				Attach_Assembly(D,user)
+		if(isscrewdriver(W))
+			if(src.secured)
+				Unsecure()
+				user.show_message("\blue The [src.name] can now be attached!")
+			else
+				Secure()
+				user.show_message("\blue The [src.name] is ready!")
+			return
 		else
-			usr.show_message("\blue The signaler can not be modified or attached!")
-	return
-*/
+			..()
+		return
 
 /obj/item/device/radio/signaler/attack_self(mob/user as mob, flag1)
 	user.machine = src
@@ -53,23 +129,28 @@ Code:
 
 
 /obj/item/device/radio/signaler/receive_signal(datum/signal/signal)
-	if(!signal || (signal.encryption != code))
-		return
+	if(cooldown > 0)	return 0
+	if(!signal || (signal.encryption != code))	return 0
 
 	if (!( src.wires & 2 ))
 		return
 	if(istype(src.loc, /obj/machinery/door/airlock) && src.airlock_wire && src.wires & 1)
-//		world << "/obj/.../signaler/r_signal([signal]) has master = [src.master] and type [(src.master?src.master.type : "none")]"
-//		world << "[src.airlock_wire] - [src] - [usr] - [signal]"
 		var/obj/machinery/door/airlock/A = src.loc
 		A.pulse(src.airlock_wire)
-//		src.master:r_signal(signal)
-	if(src.master && (src.wires & 1))
-		src.master.receive_signal(signal)
+	if((src.holder) && (holder.IsAssemblyHolder()) && (secured) && (src.wires & 1))
+		spawn(0)
+			holder:Process_Activation(src)
+			return
+//		src.holder.receive_signal(signal)
+
 	for(var/mob/O in hearers(1, src.loc))
 		O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
+	cooldown = 2
+	spawn(10)
+		Process_cooldown()
 	return
 
+
 /obj/item/device/radio/signaler/proc/send_signal(message="ACTIVATE")
 
 	if(last_transmission && world.time < (last_transmission + TRANSMISSION_DELAY))
@@ -79,8 +160,9 @@ Code:
 	if (!( src.wires & 4 ))
 		return
 
-	var/time = time2text(world.realtime,"hh:mm:ss")
-	lastsignalers.Add("[time] <B>:</B> [usr.key] used [src] @ location ([src.loc.x],[src.loc.y],[src.loc.z]) <B>:</B> [format_frequency(frequency)]/[code]")
+	if((usr)&&(ismob(usr)))
+		var/time = time2text(world.realtime,"hh:mm:ss")
+		lastsignalers.Add("[time] <B>:</B> [usr.key] used [src] @ location ([src.loc.x],[src.loc.y],[src.loc.z]) <B>:</B> [format_frequency(frequency)]/[code]")
 
 	var/datum/signal/signal = new
 	signal.source = src
@@ -95,7 +177,7 @@ Code:
 	//..()
 	if (usr.stat)
 		return
-	if ((usr.contents.Find(src) || (usr.contents.Find(src.master) || (in_range(src, usr) && istype(src.loc, /turf)))))
+	if ((usr.contents.Find(src) || (usr.contents.Find(src.holder) || (in_range(src, usr) && istype(src.loc, /turf)))))
 		usr.machine = src
 		if (href_list["freq"])
 			..()

code/game/objects/spawners/bomb.dm

@@ -1,80 +0,0 @@
-/obj/spawner/bomb/New()
-	..()
-
-	switch (src.btype)
-		// radio
-		if (0)
-			var/obj/item/assembly/r_i_ptank/R = new /obj/item/assembly/r_i_ptank(src.loc)
-			var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R)
-			var/obj/item/device/radio/signaler/p1 = new /obj/item/device/radio/signaler(R)
-			var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R)
-			R.part1 = p1
-			R.part2 = p2
-			R.part3 = p3
-			p1.master = R
-			p2.master = R
-			p3.master = R
-			R.status = explosive
-			p1.b_stat = 0
-			p2.status = 1
-			p3.air_contents.temperature = btemp + T0C
-
-		// proximity
-		if (1)
-			var/obj/item/assembly/m_i_ptank/R = new /obj/item/assembly/m_i_ptank(src.loc)
-			var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R)
-			var/obj/item/device/prox_sensor/p1 = new /obj/item/device/prox_sensor(R)
-			var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R)
-			R.part1 = p1
-			R.part2 = p2
-			R.part3 = p3
-			p1.master = R
-			p2.master = R
-			p3.master = R
-			R.status = explosive
-
-			p3.air_contents.temperature = btemp +T0C
-			p2.status = 1
-
-			if(src.active)
-				R.part1.state = 1
-				R.part1.icon_state = text("motion[]", 1)
-				R.c_state(1, src)
-
-		// timer
-		if (2)
-			var/obj/item/assembly/t_i_ptank/R = new /obj/item/assembly/t_i_ptank(src.loc)
-			var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R)
-			var/obj/item/device/timer/p1 = new /obj/item/device/timer(R)
-			var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R)
-			R.part1 = p1
-			R.part2 = p2
-			R.part3 = p3
-			p1.master = R
-			p2.master = R
-			p3.master = R
-			R.status = explosive
-
-			p3.air_contents.temperature = btemp +T0C
-			p2.status = 1
-		//bombvest
-		if(3)
-			var/obj/item/clothing/suit/armor/a_i_a_ptank/R = new /obj/item/clothing/suit/armor/a_i_a_ptank(src.loc)
-			var/obj/item/weapon/tank/plasma/p4 = new /obj/item/weapon/tank/plasma(R)
-			var/obj/item/device/healthanalyzer/p1 = new /obj/item/device/healthanalyzer(R)
-			var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R)
-			var/obj/item/clothing/suit/armor/vest/p3 = new /obj/item/clothing/suit/armor/vest(R)
-			R.part1 = p1
-			R.part2 = p2
-			R.part3 = p3
-			R.part4 = p4
-			p1.master = R
-			p2.master = R
-			p3.master = R
-			p4.master = R
-			R.status = explosive
-
-			p4.air_contents.temperature = btemp +T0C
-			p2.status = 1
-
-	del(src)

code/game/objects/tank.dm

@@ -388,105 +388,6 @@
 /obj/item/weapon/tank/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob)
 
 	..()
-	if (istype(W, /obj/item/assembly/rad_ignite))
-		var/obj/item/assembly/rad_ignite/S = W
-		if (!( S.status ))
-			return
-		var/obj/item/assembly/r_i_ptank/R = new
-
-		R.part1 = S.part1
-		S.part1.loc = R
-		S.part1.master = R
-
-		R.part2 = S.part2
-		S.part2.loc = R
-		S.part2.master = R
-
-		src.master = R
-		R.part3 = src
-
-		user.put_in_hand(R)
-		user.before_take_item(src)
-		src.loc = R
-
-		S.part1 = null
-		S.part2 = null
-		del(S)
-	if (istype(W, /obj/item/assembly/prox_ignite))
-		var/obj/item/assembly/prox_ignite/S = W
-		if (!( S.status ))
-			return
-		var/obj/item/assembly/m_i_ptank/R = new
-		R.part1 = S.part1
-		S.part1.loc = R
-		S.part1.master = R
-
-		R.part2 = S.part2
-		S.part2.loc = R
-		S.part2.master = R
-
-		src.master = R
-		R.part3 = src
-
-		user.put_in_hand(R)
-		user.before_take_item(src)
-		src.loc = R
-
-		S.part1 = null
-		S.part2 = null
-		del(S)
-
-	if (istype(W, /obj/item/assembly/time_ignite))
-		var/obj/item/assembly/time_ignite/S = W
-		if (!( S.status ))
-			return
-		var/obj/item/assembly/t_i_ptank/R = new
-		R.part1 = S.part1
-		S.part1.loc = R
-		S.part1.master = R
-
-		R.part2 = S.part2
-		S.part2.loc = R
-		S.part2.master = R
-
-		src.master = R
-		R.part3 = src
-
-		user.put_in_hand(R)
-		user.before_take_item(src)
-		src.loc = R
-
-		S.part1 = null
-		S.part2 = null
-		del(S)
-	if (istype(W, /obj/item/assembly/a_i_a))
-		var/obj/item/assembly/a_i_a/S = W
-		if (!( S.status ))
-			return
-		var/obj/item/clothing/suit/armor/a_i_a_ptank/R = new
-		R.part1 = S.part1
-		S.part1.loc = R
-		S.part1.master = R
-
-		R.part2 = S.part2
-		S.part2.loc = R
-		S.part2.master = R
-
-		R.part3 = S.part3
-		S.part3.loc = R
-		S.part3.master = R
-
-		src.master = R
-		R.part4 = src
-
-		user.put_in_hand(R)
-		user.before_take_item(src)
-		src.loc = R
-
-		S.part1 = null
-		S.part2 = null
-		S.part3 = null
-		del(S)
 // PantsNote: More flamethrower assembly code. WOO!
 	if (istype(W, /obj/item/assembly/w_r_ignite))
 		var/obj/item/assembly/w_r_ignite/S = W

code/game/objects/transfer_valve.dm

@@ -10,6 +10,11 @@
 	var/valve_open = 0
 	var/toggle = 1
 
+	proc
+		Process_Activation(var/obj/item/device/D)
+
+	IsAssemblyHolder()
+		return 1
 
 	attackby(obj/item/item, mob/user)
 		if(istype(item, /obj/item/weapon/tank))
@@ -29,25 +34,31 @@
 				user << "\blue You attach the tank to the transfer valve!"
 
 			update_icon()
-
-		else if(istype(item, /obj/item/device/radio/signaler) || istype(item, /obj/item/device/timer) || istype(item, /obj/item/device/infra) || istype(item, /obj/item/device/prox_sensor))
+//TODO: Have this take an assemblyholder
+		else if(item.IsAssembly())
+			if(item:secured)
+				user << "\red The device is secured!"
+				return
 			if(attached_device)
 				user << "\red There is already an device attached to the valve, remove it first!"
 				return
-
+			user.remove_from_mob(item)
 			attached_device = item
-			user.drop_item()
 			item.loc = src
-			user << "\blue You attach the [item] to the valve controls!"
-			item.master = src
+			user << "\blue You attach the [item] to the valve controls and secure it!"
+			item:holder = src
+			item:Secure()
 
 			bombers += "[key_name(user)] attached a [item] to a transfer valve."
 			message_admins("[key_name_admin(user)] attached a [item] to a transfer valve.")
 			log_game("[key_name_admin(user)] attached a [item] to a transfer valve.")
 			attacher = key_name(user)
+		return
 
 
-
+	HasProximity(atom/movable/AM as mob|obj)
+		if(!attached_device)	return
+		attached_device.HasProximity(AM)
 		return
 
 
@@ -86,7 +97,7 @@
 			if(href_list["rem_device"])
 				if(attached_device)
 					attached_device.loc = get_turf(src)
-					attached_device.master = null
+					attached_device:holder = null
 					attached_device = null
 				update_icon()
 			if(href_list["device"])
@@ -97,7 +108,7 @@
 			src.add_fingerprint(usr)
 			return
 
-	receive_signal(signal)
+	Process_Activation(var/obj/item/device/D)
 		if(toggle)
 			toggle = 0
 			toggle_valve()
@@ -144,7 +155,7 @@
 			var/datum/gas_mixture/temp
 			temp = tank_one.air_contents.remove_ratio(1)
 			tank_two.air_contents.merge(temp)
-			
+
 		split_gases()
 			if (!valve_open || !tank_one || !tank_two)
 				return
@@ -174,7 +185,7 @@
 						src.update_icon()
 						sleep(10)
 					src.update_icon()
-			
+
 			else if(valve_open==1 && (tank_one && tank_two))
 				split_gases()
 				valve_open = 0

code/game/objects/weapons.dm

@@ -89,465 +89,6 @@
 /obj/mine/New()
 	icon_state = "uglyminearmed"
 
-/obj/item/assembly/proc/c_state(n, O as obj)
-	return
-
-//*****RM
-
-/obj/item/assembly/time_ignite/premade/New()
-	..()
-	part1 = new(src)
-	part2 = new(src)
-	part1.master = src
-	part2.master = src
-	//part2.status = 0
-
-/obj/item/assembly/time_ignite/Del()
-	del(part1)
-	del(part2)
-	..()
-
-/obj/item/assembly/time_ignite/attack_self(mob/user as mob)
-	if (src.part1)
-		src.part1.attack_self(user, src.status)
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/time_ignite/receive_signal()
-	if (!status)
-		return
-	for(var/mob/O in hearers(1, src.loc))
-		O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
-	src.part2.ignite()
-	return
-
-/obj/decal/ash/attack_hand(mob/user as mob)
-	usr << "\blue The ashes slip through your fingers."
-	del(src)
-	return
-
-/obj/item/assembly/time_ignite/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/turf/T = src.loc
-		if (ismob(T))
-			T = T.loc
-		src.part1.loc = T
-		src.part1.master = null
-		src.part1 = null
-		src.part2.loc = T
-		src.part2.master = null
-		src.part2 = null
-
-		del(src)
-		return
-	if (!( istype(W, /obj/item/weapon/screwdriver) ))
-		return
-	src.status = !( src.status )
-	if (src.status)
-		user.show_message("\blue The timer is now secured!", 1)
-	else
-		user.show_message("\blue The timer is now unsecured!", 1)
-	src.part2.status = src.status
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/time_ignite/c_state(n)
-	src.icon_state = text("timer-igniter[]", n)
-	return
-
-//***********
-
-/obj/item/assembly/anal_ignite/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/turf/T = src.loc
-		if (ismob(T))
-			T = T.loc
-		src.part1.loc = T
-		src.part1.master = null
-		src.part1 = null
-		src.part2.loc = T
-		src.part2.master = null
-		src.part2 = null
-
-		del(src)
-		return
-	if (( istype(W, /obj/item/weapon/screwdriver) ))
-		src.status = !( src.status )
-		if (src.status)
-			user.show_message("\blue The analyzer is now secured!", 1)
-		else
-			user.show_message("\blue The analyzer is now unsecured!", 1)
-		src.part2.status = src.status
-		src.add_fingerprint(user)
-	if(( istype(W, /obj/item/clothing/suit/armor/vest) ) && src.status)
-		var/obj/item/assembly/a_i_a/R = new
-		R.part1 = part1
-		R.part1.master = R
-		part1 = null
-
-		R.part2 = part2
-		R.part2.master = R
-		part2 = null
-
-		user.put_in_hand(R)
-		user.before_take_item(W)
-		R.part3 = W
-		R.part3.master = R
-		del(src)
-
-/* WTF THIS SHIT? It is working? Shouldn't. --rastaf0
-		W.loc = R
-		R.part1 = W
-		R.part2 = W
-		W.layer = initial(W.layer)
-		if (user.client)
-			user.client.screen -= W
-		if (user.r_hand == W)
-			user.u_equip(W)
-			user.r_hand = R
-		else
-			user.u_equip(W)
-			user.l_hand = R
-		W.master = R
-		src.master = R
-		src.layer = initial(src.layer)
-		user.u_equip(src)
-		if (user.client)
-			user.client.screen -= src
-		src.loc = R
-		R.part3 = src
-		R.layer = 20
-		R.loc = user
-		src.add_fingerprint(user)
-*/
-	return
-/*	else if ((istype(W, /obj/item/device/timer) && !( src.status )))
-
-		var/obj/item/assembly/time_ignite/R = new /obj/item/assembly/time_ignite( user )
-		W.loc = R
-		R.part1 = W
-		W.layer = initial(W.layer)
-		if (user.client)
-			user.client.screen -= W
-		if (user.r_hand == W)
-			user.u_equip(W)
-			user.r_hand = R
-		else
-			user.u_equip(W)
-			user.l_hand = R
-		W.master = R
-		src.master = R
-		src.layer = initial(src.layer)
-		user.u_equip(src)
-		if (user.client)
-			user.client.screen -= src
-		src.loc = R
-		R.part2 = src
-		R.layer = 20
-		R.loc = user
-		src.add_fingerprint(user)
-*/
-/obj/item/assembly/a_i_a/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/turf/T = src.loc
-		if (ismob(T))
-			T = T.loc
-		src.part1.loc = T
-		src.part1.master = null
-		src.part1 = null
-		src.part2.loc = T
-		src.part2.master = null
-		src.part2 = null
-		src.part3.loc = T
-		src.part3.master = null
-		src.part3 = null
-
-		del(src)
-		return
-	if (( istype(W, /obj/item/weapon/screwdriver) ))
-		if (!src.status && (!part1||!part2||!part3))
-			user << "\red You cannot finish the assembly, not all components are in place!"
-			return
-		src.status = !( src.status )
-		if (src.status)
-			user.show_message("\blue The armor is now secured!", 1)
-		else
-			user.show_message("\blue The armor is now unsecured!", 1)
-		src.add_fingerprint(user)
-
-/obj/item/assembly/a_i_a/Del()
-	//src.part1 = null
-	del(src.part1)
-	//src.part2 = null
-	del(src.part2)
-	del(src.part3)
-	..()
-	return
-//*****
-
-/obj/item/assembly/rad_time/Del()
-	//src.part1 = null
-	del(src.part1)
-	//src.part2 = null
-	del(src.part2)
-	..()
-	return
-
-/obj/item/assembly/rad_time/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/turf/T = src.loc
-		if (ismob(T))
-			T = T.loc
-		src.part1.loc = T
-		src.part2.loc = T
-		src.part1.master = null
-		src.part2.master = null
-		src.part1 = null
-		src.part2 = null
-		//SN src = null
-		del(src)
-		return
-	if (!( istype(W, /obj/item/weapon/screwdriver) ))
-		return
-	src.status = !( src.status )
-	if (src.status)
-		user.show_message("\blue The signaler is now secured!", 1)
-	else
-		user.show_message("\blue The signaler is now unsecured!", 1)
-	src.part1.b_stat = !( src.status )
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/rad_time/attack_self(mob/user as mob)
-	src.part1.attack_self(user, src.status)
-	src.part2.attack_self(user, src.status)
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/rad_time/receive_signal(datum/signal/signal)
-	if (signal.source == src.part2)
-		src.part1.send_signal("ACTIVATE")
-	return
-//*******************
-/obj/item/assembly/rad_prox/c_state(n)
-	src.icon_state = "prox-radio[n]"
-	return
-
-/obj/item/assembly/rad_prox/Del()
-	//src.part1 = null
-	del(src.part1)
-	//src.part2 = null
-	del(src.part2)
-	..()
-	return
-
-/obj/item/assembly/rad_prox/HasProximity(atom/movable/AM as mob|obj)
-	if (istype(AM, /obj/beam))
-		return
-	if (AM.move_speed < 12)
-		src.part2.sense()
-	return
-
-/obj/item/assembly/rad_prox/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/turf/T = src.loc
-		if (ismob(T))
-			T = T.loc
-		src.part1.loc = T
-		src.part2.loc = T
-		src.part1.master = null
-		src.part2.master = null
-		src.part1 = null
-		src.part2 = null
-		//SN src = null
-		del(src)
-		return
-	if (!( istype(W, /obj/item/weapon/screwdriver) ))
-		return
-	src.status = !( src.status )
-	if (src.status)
-		user.show_message("\blue The proximity sensor is now secured!", 1)
-	else
-		user.show_message("\blue The proximity sensor is now unsecured!", 1)
-	src.part1.b_stat = !( src.status )
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/rad_prox/attack_self(mob/user as mob)
-	src.part1.attack_self(user, src.status)
-	src.part2.attack_self(user, src.status)
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/rad_prox/receive_signal(datum/signal/signal)
-	if (signal.source == src.part2)
-		src.part1.send_signal("ACTIVATE")
-	return
-
-/obj/item/assembly/rad_prox/Move()
-	..()
-	src.part2.sense()
-	return
-
-/obj/item/assembly/rad_prox/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
-/obj/item/assembly/rad_prox/dropped()
-	spawn( 0 )
-		src.part2.sense()
-		return
-	return
-//************************
-/obj/item/assembly/rad_infra/c_state(n)
-	src.icon_state = text("infrared-radio[]", n)
-	return
-
-/obj/item/assembly/rad_infra/Del()
-	del(src.part1)
-	del(src.part2)
-	..()
-	return
-
-/obj/item/assembly/rad_infra/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/turf/T = src.loc
-		if (ismob(T))
-			T = T.loc
-		src.part1.loc = T
-		src.part2.loc = T
-		src.part1.master = null
-		src.part2.master = null
-		src.part1 = null
-		src.part2 = null
-		//SN src = null
-		del(src)
-		return
-	if (!( istype(W, /obj/item/weapon/screwdriver) ))
-		return
-	src.status = !( src.status )
-	if (src.status)
-		user.show_message("\blue The infrared laser is now secured!", 1)
-	else
-		user.show_message("\blue The infrared laser is now unsecured!", 1)
-	src.part1.b_stat = !( src.status )
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/rad_infra/attack_self(mob/user as mob)
-	src.part1.attack_self(user, src.status)
-	src.part2.attack_self(user, src.status)
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/rad_infra/receive_signal(datum/signal/signal)
-
-	if (signal.source == src.part2)
-		src.part1.send_signal("ACTIVATE")
-	return
-
-/obj/item/assembly/rad_infra/verb/rotate()
-	set name = "Rotate Assembly"
-	set category = "Object"
-	set src in usr
-
-	src.dir = turn(src.dir, 90)
-	src.part2.dir = src.dir
-	src.add_fingerprint(usr)
-	return
-
-/obj/item/assembly/rad_infra/Move()
-
-	var/t = src.dir
-	..()
-	src.dir = t
-	//src.part2.first = null
-	del(src.part2.first)
-	return
-
-/obj/item/assembly/rad_infra/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
-/obj/item/assembly/rad_infra/attack_hand(M)
-	del(src.part2.first)
-	..()
-	return
-
-/obj/item/assembly/prox_ignite/HasProximity(atom/movable/AM as mob|obj)
-
-	if (istype(AM, /obj/beam))
-		return
-	if (AM.move_speed < 12 && src.part1)
-		src.part1.sense()
-	return
-
-/obj/item/assembly/prox_ignite/dropped()
-	spawn( 0 )
-		src.part1.sense()
-		return
-	return
-
-/obj/item/assembly/prox_ignite/Del()
-	del(src.part1)
-	del(src.part2)
-	..()
-	return
-
-/obj/item/assembly/prox_ignite/c_state(n)
-	src.icon_state = text("prox-igniter[]", n)
-	return
-
-/obj/item/assembly/prox_ignite/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/turf/T = src.loc
-		if (ismob(T))
-			T = T.loc
-		src.part1.loc = T
-		src.part2.loc = T
-		src.part1.master = null
-		src.part2.master = null
-		src.part1 = null
-		src.part2 = null
-		//SN src = null
-		del(src)
-		return
-	if (!( istype(W, /obj/item/weapon/screwdriver) ))
-		return
-	src.status = !( src.status )
-	if (src.status)
-		user.show_message("\blue The proximity sensor is now secured! The igniter now works!", 1)
-	else
-		user.show_message("\blue The proximity sensor is now unsecured! The igniter will not work.", 1)
-	src.part2.status = src.status
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/prox_ignite/attack_self(mob/user as mob)
-
-	if (src.part1)
-		src.part1.attack_self(user, src.status)
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/prox_ignite/receive_signal()
-	for(var/mob/O in hearers(1, src.loc))
-		O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
-	src.part2.ignite()
-	return
-
-/obj/item/assembly/rad_ignite/Del()
-	del(src.part1)
-	del(src.part2)
-	..()
-	return
-
 /obj/item/weapon/directions/attack_hand(mob/user as mob)
 	if (istype(usr, /mob/living/carbon/human))
 		if (prob(50))
@@ -565,478 +106,6 @@
 				return
 		return
 
-/obj/item/assembly/rad_ignite/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/turf/T = src.loc
-		if (ismob(T))
-			T = T.loc
-		src.part1.loc = T
-		src.part2.loc = T
-		src.part1.master = null
-		src.part2.master = null
-		src.part1 = null
-		src.part2 = null
-		//SN src = null
-		del(src)
-		return
-	if (!( istype(W, /obj/item/weapon/screwdriver) ))
-		return
-	src.status = !( src.status )
-	if (src.status)
-		user.show_message("\blue The radio is now secured! The igniter now works!", 1)
-	else
-		user.show_message("\blue The radio is now unsecured! The igniter will not work.", 1)
-	src.part2.status = src.status
-	src.part1.b_stat = !( src.status )
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/rad_ignite/attack_self(mob/user as mob)
-
-	if (src.part1)
-		src.part1.attack_self(user, src.status)
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/rad_ignite/receive_signal()
-	for(var/mob/O in hearers(1, src.loc))
-		O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
-	src.part2.ignite()
-	return
-
-/obj/item/assembly/m_i_ptank/c_state(n)
-
-	src.icon_state = text("prox-igniter-tank[]", n)
-	return
-
-/obj/item/assembly/m_i_ptank/HasProximity(atom/movable/AM as mob|obj)
-	if (istype(AM, /obj/beam))
-		return
-	if (AM.move_speed < 12 && src.part1)
-		src.part1.sense()
-	return
-
-
-//*****RM
-/obj/item/assembly/m_i_ptank/Bump(atom/O)
-	spawn(0)
-		//world << "miptank bumped into [O]"
-		if(src.part1.state)
-			//world << "sending signal"
-			receive_signal()
-		else
-			//world << "not active"
-	..()
-
-/obj/item/assembly/m_i_ptank/proc/prox_check()
-	if(!part1 || !part1.state)
-		return
-	for(var/atom/A in view(1, src.loc))
-		if(A!=src && !istype(A, /turf/space) && !isarea(A))
-			//world << "[A]:[A.type] was sensed"
-			src.part1.sense()
-			break
-
-	spawn(10)
-		prox_check()
-
-
-//*****
-
-
-/obj/item/assembly/m_i_ptank/dropped()
-
-	spawn( 0 )
-		part1.sense()
-		return
-	return
-
-/obj/item/assembly/m_i_ptank/examine()
-	..()
-	part3.examine()
-
-/obj/item/assembly/m_i_ptank/Del()
-
-	//src.part1 = null
-	del(src.part1)
-	//src.part2 = null
-	del(src.part2)
-	//src.part3 = null
-	del(src.part3)
-	..()
-	return
-
-/obj/item/assembly/m_i_ptank/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if (istype(W, /obj/item/device/analyzer))
-		src.part3.attackby(W, user)
-		return
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/obj/item/assembly/prox_ignite/R = new(get_turf(src.loc))
-		R.part1 = src.part1
-		R.part1.master = R
-		R.part1.loc = R
-		R.part2 = src.part2
-		R.part2.master = R
-		R.part2.loc = R
-		if (user.get_inactive_hand()==src)
-			user.put_in_inactive_hand(part3)
-		else
-			part3.loc = src.loc
-		src.part1 = null
-		src.part2 = null
-		src.part3 = null
-		del(src)
-		return
-	if (!( istype(W, /obj/item/weapon/weldingtool)&&W:welding ))
-		return
-	if (!( src.status ))
-		src.status = 1
-		bombers += "[key_name(user)] welded a prox bomb. Temp: [src.part3.air_contents.temperature-T0C]"
-		message_admins("[key_name_admin(user)] welded a prox bomb. Temp: [src.part3.air_contents.temperature-T0C]")
-		user.show_message("\blue A pressure hole has been bored to the plasma tank valve. The plasma tank can now be ignited.", 1)
-	else
-		src.status = 0
-		bombers += "[key_name(user)] unwelded a prox bomb. Temp: [src.part3.air_contents.temperature-T0C]"
-		user << "\blue The hole has been closed."
-	src.part2.status = src.status
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/m_i_ptank/attack_self(mob/user as mob)
-
-	playsound(src.loc, 'armbomb.ogg', 100, 1)
-	src.part1.attack_self(user, 1)
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/m_i_ptank/receive_signal()
-	//world << "miptank [src] got signal"
-	for(var/mob/O in hearers(1, null))
-		O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
-		//Foreach goto(19)
-
-	if ((src.status && prob(90)))
-		//world << "sent ignite() to [src.part3]"
-		src.part3.ignite()
-	else
-		if(!src.status)
-			src.part3.release()
-			src.part1.state = 0.0
-
-	return
-
-/obj/item/assembly/m_i_ptank/emp_act(severity)
-
-	if(istype(part3,/obj/item/weapon/tank/plasma) && prob(100/severity))
-		part3.ignite()
-	..()
-
-//*****RM
-
-/obj/item/assembly/t_i_ptank/c_state(n)
-
-	src.icon_state = text("timer-igniter-tank[]", n)
-	return
-
-/obj/item/assembly/t_i_ptank/examine()
-	..()
-	src.part3.examine()
-
-/obj/item/assembly/t_i_ptank/Del()
-
-	//src.part1 = null
-	del(src.part1)
-	//src.part2 = null
-	del(src.part2)
-	//src.part3 = null
-	del(src.part3)
-	..()
-	return
-
-/obj/item/assembly/t_i_ptank/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-
-	if (istype(W, /obj/item/device/analyzer))
-		src.part3.attackby(W, user)
-		return
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/obj/item/assembly/time_ignite/R = new(get_turf(src.loc))
-		R.part1 = src.part1
-		R.part1.master = R
-		R.part1.loc = R
-		R.part2 = src.part2
-		R.part2.master = R
-		R.part2.loc = R
-		if (user.get_inactive_hand()==src)
-			user.put_in_inactive_hand(part3)
-		else
-			part3.loc = src.loc
-		src.part1 = null
-		src.part2 = null
-		src.part3 = null
-		del(src)
-		return
-	if (!( istype(W, /obj/item/weapon/weldingtool) && W:welding))
-		return
-	if (!( src.status ))
-		src.status = 1
-		bombers += "[key_name(user)] welded a time bomb. Temp: [src.part3.air_contents.temperature-T0C]"
-		message_admins("[key_name_admin(user)] welded a time bomb. Temp: [src.part3.air_contents.temperature-T0C]")
-		user.show_message("\blue A pressure hole has been bored to the plasma tank valve. The plasma tank can now be ignited.", 1)
-	else
-		if(src)
-			src.status = 0
-			bombers += "[key_name(user)] unwelded a time bomb. Temp: [src.part3.air_contents.temperature-T0C]"
-			user << "\blue The hole has been closed."
-	src.part2.status = src.status
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/t_i_ptank/attack_self(mob/user as mob)
-
-	src.part1.attack_self(user, 1)
-	playsound(src.loc, 'armbomb.ogg', 100, 1)
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/t_i_ptank/receive_signal()
-	//world << "tiptank [src] got signal"
-	for(var/mob/O in hearers(1, null))
-		O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
-		//Foreach goto(19)
-	if ((src.status && prob(90)))
-		//world << "sent ignite() to [src.part3]"
-		src.part3.ignite()
-	else
-		if(!src.status)
-			src.part3.release()
-	return
-
-/obj/item/assembly/t_i_ptank/emp_act(severity)
-	if(istype(part3,/obj/item/weapon/tank/plasma) && prob(100/severity))
-		part3.ignite()
-	..()
-
-/obj/item/assembly/r_i_ptank/examine()
-	..()
-	src.part3.examine()
-
-/obj/item/assembly/r_i_ptank/Del()
-
-	//src.part1 = null
-	del(src.part1)
-	//src.part2 = null
-	del(src.part2)
-	//src.part3 = null
-	del(src.part3)
-	..()
-	return
-
-/obj/item/assembly/r_i_ptank/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-
-	if (istype(W, /obj/item/device/analyzer))
-		src.part3.attackby(W, user)
-		return
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/obj/item/assembly/rad_ignite/R = new(get_turf(src.loc))
-		R.part1 = src.part1
-		R.part1.master = R
-		R.part1.loc = R
-		R.part2 = src.part2
-		R.part2.master = R
-		R.part2.loc = R
-		if (user.get_inactive_hand()==src)
-			user.put_in_inactive_hand(part3)
-		else
-			part3.loc = src.loc
-		src.part1 = null
-		src.part2 = null
-		src.part3 = null
-		del(src)
-		return
-	if (!( istype(W, /obj/item/weapon/weldingtool) && W:welding ))
-		return
-	if (!( src.status ))
-		src.status = 1
-		bombers += "[key_name(user)] welded a radio bomb. Temp: [src.part3.air_contents.temperature-T0C]"
-		message_admins("[key_name_admin(user)] welded a radio bomb. Temp: [src.part3.air_contents.temperature-T0C]")
-		user.show_message("\blue A pressure hole has been bored to the plasma tank valve. The plasma tank can now be ignited.", 1)
-	else
-		src.status = 0
-		bombers += "[key_name(user)] unwelded a radio bomb. Temp: [src.part3.air_contents.temperature-T0C]"
-		user << "\blue The hole has been closed."
-	src.part2.status = src.status
-	src.part1.b_stat = !( src.status )
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/r_i_ptank/emp_act(severity)
-	if(istype(part3,/obj/item/weapon/tank/plasma) && prob(100/severity))
-		part3.ignite()
-	..()
-
-//*****RM
-
-/obj/item/clothing/suit/armor/a_i_a_ptank/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if (istype(W, /obj/item/device/analyzer))
-		src.part4.attackby(W, user)
-		return
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/obj/item/assembly/a_i_a/R = new(get_turf(src.loc))
-		R.part1 = src.part1
-		R.part1.master = R
-		R.part1.loc = R
-		R.part2 = src.part2
-		R.part2.master = R
-		R.part2.loc = R
-		R.part3 = src.part3
-		R.part3.master = R
-		R.part3.loc = R
-		if (user.get_inactive_hand()==src)
-			user.put_in_inactive_hand(part4)
-		else
-			part4.loc = src.loc
-		src.part1 = null
-		src.part2 = null
-		src.part3 = null
-		src.part4 = null
-		del(src)
-		return
-	if (( istype(W, /obj/item/weapon/weldingtool) && W:welding))
-		return
-	if (!( src.status ))
-		src.status = 1
-		bombers += "[key_name(user)] welded a suicide bomb. Temp: [src.part4.air_contents.temperature-T0C]"
-		message_admins("[key_name_admin(user)] welded a suicide bomb. Temp: [src.part4.air_contents.temperature-T0C]")
-		user.show_message("\blue A pressure hole has been bored to the plasma tank valve. The plasma tank can now be ignited.", 1)
-	else
-		src.status = 0
-		bombers += "[key_name(user)] unwelded a suicide bomb. Temp: [src.part4.air_contents.temperature-T0C]"
-		user << "\blue The hole has been closed."
-//	src.part3.status = src.status
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/r_i_ptank/attack_self(mob/user as mob)
-	playsound(src.loc, 'armbomb.ogg', 100, 1)
-	src.part1.attack_self(user, 1)
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/r_i_ptank/receive_signal()
-	//world << "riptank [src] got signal"
-	for(var/mob/O in hearers(1, null))
-		O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
-		//Foreach goto(19)
-	if ((src.status && prob(90)))
-		//world << "sent ignite() to [src.part3]"
-		src.part3.ignite()
-	else
-		if(!src.status)
-			src.part3.release()
-	return
-
-/obj/beam/i_beam/proc/hit()
-	//world << "beam \ref[src]: hit"
-	if (src.master)
-		//world << "beam hit \ref[src]: calling master \ref[master].hit"
-		src.master.hit()
-	//SN src = null
-	del(src)
-	return
-
-/obj/beam/i_beam/proc/vis_spread(v)
-	//world << "i_beam \ref[src] : vis_spread"
-	src.visible = v
-	spawn( 0 )
-		if (src.next)
-			//world << "i_beam \ref[src] : is next [next.type] \ref[next], calling spread"
-			src.next.vis_spread(v)
-		return
-	return
-
-/obj/beam/i_beam/proc/process()
-	//world << "i_beam \ref[src] : process"
-
-	if ((src.loc.density || !( src.master )))
-		//SN src = null
-	//	world << "beam hit loc [loc] or no master [master], deleting"
-		del(src)
-		return
-	//world << "proccess: [src.left] left"
-
-	if (src.left > 0)
-		src.left--
-	if (src.left < 1)
-		if (!( src.visible ))
-			src.invisibility = 101
-		else
-			src.invisibility = 0
-	else
-		src.invisibility = 0
-
-
-	//world << "now [src.left] left"
-	var/obj/beam/i_beam/I = new /obj/beam/i_beam( src.loc )
-	I.master = src.master
-	I.density = 1
-	I.dir = src.dir
-	//world << "created new beam \ref[I] at [I.x] [I.y] [I.z]"
-	step(I, I.dir)
-
-	if (I)
-		//world << "step worked, now at [I.x] [I.y] [I.z]"
-		if (!( src.next ))
-			//world << "no src.next"
-			I.density = 0
-			//world << "spreading"
-			I.vis_spread(src.visible)
-			src.next = I
-			spawn( 0 )
-				//world << "limit = [src.limit] "
-				if ((I && src.limit > 0))
-					I.limit = src.limit - 1
-					//world << "calling next process"
-					I.process()
-				return
-		else
-			//world << "is a next: \ref[next], deleting beam \ref[I]"
-			//I = null
-			del(I)
-	else
-		//src.next = null
-		//world << "step failed, deleting \ref[src.next]"
-		del(src.next)
-	spawn( 10 )
-		src.process()
-		return
-	return
-
-/obj/beam/i_beam/Bump()
-	del(src)
-	return
-
-/obj/beam/i_beam/Bumped()
-	src.hit()
-	return
-
-/obj/beam/i_beam/HasEntered(atom/movable/AM as mob|obj)
-	if (istype(AM, /obj/beam))
-		return
-	spawn( 0 )
-		src.hit()
-		return
-	return
-
-/obj/beam/i_beam/Del()
-	del(src.next)
-	..()
-	return
-
 /atom/proc/ex_act()
 	return