Jack Rost updates:

-more dismantable consoles:
--Teleporter
--Supply ordering console
--Supply shuttle console
--Power Monitor
-new circuit boards (both constructable and destructable)
--Supply ordering console (programming 2)
--Supply shuttle console (programming 3)
--Outpost Status Display(programming 2)
--Operating Computer (programming 2, biotech 2)
-R&D Console circuit now requires programming 4 (was 6).


Balagi updates:
-Trash bag: works as mining satchels but for trash.
-Started redesign computers code
-fixed candles sprites
-trashbag now has "in hands" sprite
-fixed emagging supply shuttle console

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

code/game/objects/items/candle.dm

@@ -27,6 +27,8 @@
 		light()
 	else if(istype(W, /obj/item/weapon/match) && W:lit)
 		light()
+	else if(istype(W, /obj/item/candle) && W:lit)
+		light()
 
 
 
@@ -63,6 +65,7 @@
 		lit = 0
 		update_icon()
 		sd_SetLuminosity(0)
+		user.sd_SetLuminosity(user.luminosity - CANDLE_LUM)
 
 /obj/item/candle/pickup(mob/user)
 	if(lit)

code/game/objects/items/trash.dm

@@ -45,4 +45,62 @@
 	candle
 		name = "candle"
 		icon = 'candle.dmi'
-		icon_state = "candle4"
+		icon_state = "candle4"
+
+
+/obj/item/trash/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	if (istype(W, /obj/item/weapon/trashbag))
+		var/obj/item/weapon/trashbag/S = W
+		if (S.mode == 1)
+			for (var/obj/item/trash/O in locate(src.x,src.y,src.z))
+				if (S.contents.len < S.capacity)
+					S.contents += O;
+				else
+					user << "\blue The bag is full."
+					break
+			user << "\blue You pick up all trash."
+		else
+			if (S.contents.len < S.capacity)
+				S.contents += src;
+			else
+				user << "\blue The bag is full."
+		S.update_icon()
+	return
+
+/obj/item/weapon/trashbag
+	icon = 'trash.dmi'
+	icon_state = "trashbag0"
+	item_state = "trashbag"
+	name = "Trash bag"
+	var/mode = 0;  //0 = pick one at a time, 1 = pick all on tile
+	var/capacity = 25; //the number of trash it can carry.
+	flags = FPRINT | TABLEPASS | ONBELT
+	w_class = 1
+
+/obj/item/weapon/trashbag/update_icon()
+	if(contents.len == 0)
+		icon_state = "trashbag0"
+	else if(contents.len < 12)
+		icon_state = "trashbag1"
+	else if(contents.len < 25)
+		icon_state = "trashbag2"
+	else icon_state = "trashbag3"
+
+/obj/item/weapon/trashbag/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	if (istype(W, /obj/item/trash))
+		var/obj/item/trash/O = W
+		src.contents += O;
+	return
+
+/obj/item/weapon/trashbag/verb/toggle_mode()
+	set name = "Switch Bag Method"
+	set category = "Object"
+
+	mode = !mode
+	switch (mode)
+		if(1)
+			usr << "The bag now picks up all trash in a tile at once."
+		if(0)
+			usr << "The bag now picks up one trash at a time."