balagi updates:

-biogenerator added to the hydroponics
-roller beds added to surgery
-trashbag added to janitor's closet
-candles added to chaplain's closet
-continued cleanup of machines code


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

code/WorkInProgress/Chemistry-Machinery.dm

@@ -57,16 +57,12 @@
 			switch(text2num(href_list["state"]))
 				if(LIQUID)
 					G.icon_state = "liquid"
-					G.pixel_x = rand(-7, 7)  //random position
-					G.pixel_y = rand(-7, 7)
 				if(GAS)
 					G.icon_state = "vapour"
-					G.pixel_x = rand(-7, 7)  //random position
-					G.pixel_y = rand(-7, 7)
 				if(SOLID)
 					G.icon_state = "solid"
-					G.pixel_x = rand(-7, 7)  //random position
-					G.pixel_y = rand(-7, 7)
+			G.pixel_x = rand(-7, 7)
+			G.pixel_y = rand(-7, 7)
 			G.name += " ([lowertext(href_list["name"])])"
 			G.reagents.add_reagent(id,30)
 			energy--

code/WorkInProgress/cloning.dm

@@ -23,6 +23,7 @@
 	name = "Cloning console"
 	icon = 'computer.dmi'
 	icon_state = "dna"
+	circuit = "/obj/item/weapon/circuitboard/cloning"
 	req_access = list(access_heads) //Only used for record deletion right now.
 	var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
 	var/obj/machinery/clonepod/pod1 = null //Linked cloning pod.
@@ -87,23 +88,8 @@
 			user << "You insert [W]."
 			src.updateUsrDialog()
 			return
-	else if((istype(W, /obj/item/weapon/screwdriver)) && (src.stat & BROKEN))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			user << "\blue The broken glass falls out."
-			var/obj/computerframe/A = new /obj/computerframe( src.loc )
-			new /obj/item/weapon/shard( src.loc )
-			var/obj/item/weapon/circuitboard/cloning/M = new /obj/item/weapon/circuitboard/cloning( A )
-			for (var/obj/C in src)
-				C.loc = src.loc
-			M.records = src.records
-			A.circuit = M
-			A.state = 3
-			A.icon_state = "3"
-			A.anchored = 1
-			del(src)
 	else
-		src.attack_hand(user)
+		..()
 	return
 
 /obj/machinery/computer/cloning/attack_paw(mob/user as mob)

code/defines/obj/computer.dm

@@ -56,6 +56,7 @@
 	name = "Cyborg Upload"
 	desc = "Used for uploading responsible laws to Cyborg. Right..."
 	icon_state = "command"
+	circuit = "/obj/item/weapon/circuitboard/borgupload"
 	var/mob/living/silicon/robot/current = null
 
 /obj/machinery/computer/atmosphere
@@ -314,6 +315,7 @@
 	name = "Teleporter"
 	desc = "Use this to set your destination...hopefully..."
 	icon_state = "teleport"
+	circuit = "/obj/item/weapon/circuitboard/teleporter"
 	var/obj/item/locked = null
 	var/id = null
 

code/game/machinery/teleporter.dm

@@ -3,9 +3,8 @@
 	..()
 	return
 
-
-/obj/machinery/computer/teleporter/attackby(obj/item/weapon/W)
-	if (istype(W, /obj/item/weapon/card/data/))
+/obj/machinery/computer/teleporter/attackby(I as obj, user as mob)
+	if (istype(I, /obj/item/weapon/card/data/))
 		if(stat & (NOPOWER|BROKEN))
 			src.attack_hand()
 
@@ -21,39 +20,10 @@
 			S = locate("landmark*["Clown Land"]") // use old stype
 		if (istype(S, /obj/landmark/) && istype(S.loc, /turf))
 			usr.loc = S.loc
-			del(W)
+			del(I)
+		return
 	else
-		src.attack_hand()
-
-/obj/machinery/computer/teleporter/attackby(I as obj, user as mob)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				new /obj/item/weapon/shard( src.loc )
-				var/obj/item/weapon/circuitboard/teleporter/M = new /obj/item/weapon/circuitboard/teleporter( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/teleporter/M = new /obj/item/weapon/circuitboard/teleporter( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-	else
-		src.attack_hand(user)
+		..()
 	return
 
 /obj/machinery/computer/teleporter/attack_paw()

code/game/objects/closets/janitor.dm

@@ -15,3 +15,4 @@
 	new /obj/item/weapon/caution(src)
 	new /obj/item/weapon/caution(src)
 	new /obj/item/weapon/caution(src)
+	new /obj/item/weapon/trashbag(src)

code/game/objects/closets/wardrobe.dm

@@ -85,6 +85,8 @@
 	new /obj/item/clothing/suit/chaplain_hoodie( src )
 	new /obj/item/clothing/head/chaplain_hood( src )
 	new /obj/item/clothing/suit/holidaypriest( src )
+	new /obj/item/weapon/candlepack( src )
+	new /obj/item/weapon/candlepack( src )
 	return
 
 /obj/closet/wardrobe/green/New()

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

@@ -36,37 +36,11 @@ AI MODULES
 
 
 /obj/machinery/computer/aiupload/attackby(obj/item/weapon/O as obj, mob/user as mob)
-	if(istype(O, /obj/item/weapon/screwdriver) && opened)
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				new /obj/item/weapon/shard( src.loc )
-				var/obj/item/weapon/circuitboard/aiupload/M = new /obj/item/weapon/circuitboard/aiupload( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/aiupload/M = new /obj/item/weapon/circuitboard/aiupload( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-	else if(istype(O, /obj/item/weapon/aiModule))
+	if(istype(O, /obj/item/weapon/aiModule))
 		var/obj/item/weapon/aiModule/M = O
 		M.install(src)
 	else
-		return ..()
+		..()
 
 /obj/machinery/computer/aiupload/attack_hand(var/mob/user as mob)
 	if(src.stat & NOPOWER)