•SSus added. Not spoiling anything, fuuuuck you.

•Fixed some of erro's typos :3
•3 syndie suits repurposed into stationsuits. Command suit&helmet, Chief Engie suit&helmet, CMO suit&helmet
•EVA and CMO office edited. I'm inviting a mapper to do a better job of the shit I did.
•Trashbag can now pick up soda cans, spent bullet cases and cigarette packs/cigs/butts.
•Thread to bitch here: http://tgstation13.servehttp.com/phpBB3/viewtopic.php?f=3&t=5569&p=45549&sid=a4a96f5b0e896cd3e3f7c1db73f09f1b#p45549

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

code/game/objects/closets/janitor.dm

@@ -4,8 +4,6 @@
 	new /obj/item/clothing/suit/bio_suit/janitor(src)
 	new /obj/item/clothing/head/bio_hood/janitor(src)
 	new /obj/item/clothing/under/rank/janitor(src)
-	new /obj/item/clothing/under/rank/janitor(src)
-	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/device/flashlight(src)
 	new /obj/item/clothing/shoes/galoshes(src)

code/game/objects/door_assembly.dm

@@ -28,7 +28,7 @@ obj/door_assembly
 		name = "Command Airlock Assembly"
 		icon_state = "door_as_com1"
 		glass_base_icon_state = "door_as_gcom"
-		glass_type = /obj/machinery/door/airlock/glass_command
+		glass_type = /obj/machinery/door/airlock/glass/glass_command
 		airlock_type = /obj/machinery/door/airlock/command
 		anchored = 1
 		density = 1

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

@@ -104,6 +104,23 @@ obj/item/weapon/matchbox.attackby(obj/item/weapon/match/W as obj, mob/user as mo
 				O.show_message(text("\red [] lights their [] with their []. How poor can you get?", user, src.name, W), 1)
 			spawn() //start fires while it's lit
 				src.process()*/
+	else  if (istype(W, /obj/item/weapon/trashbag))
+		var/obj/item/weapon/trashbag/S = W
+		if (S.mode == 1)
+			for (var/obj/item/clothing/mask/cigarette/C in locate(src.x,src.y,src.z))
+				if (S.contents.len < S.capacity)
+					S.contents += C;
+				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/clothing/mask/cigarette/proc/light(var/flavor_text = "[usr] lights the [name].")
 	if(!src.lit)
@@ -218,6 +235,26 @@ obj/item/weapon/matchbox.attackby(obj/item/weapon/match/W as obj, mob/user as mo
 	src.update_icon()
 	return
 
+/obj/item/weapon/cigpacket/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/weapon/cigpacket/CP in locate(src.x,src.y,src.z))
+				if (S.contents.len < S.capacity)
+					S.contents += CP;
+				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
+
 /////////
 //ZIPPO//
 /////////

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

@@ -439,6 +439,27 @@
 				src.pixel_x = rand(-10.0, 10)
 				src.pixel_y = rand(-10.0, 10)
 
+
+/obj/item/ammo_casing/attackby(obj/item/weapon/W as obj, mob/user as mob) //Adding this to the trash list. Nyoro~n --Agouri
+	..()
+	if (istype(W, /obj/item/weapon/trashbag))
+		var/obj/item/weapon/trashbag/S = W
+		if (S.mode == 1)
+			for (var/obj/item/ammo_casing/AC in locate(src.x,src.y,src.z))
+				if (S.contents.len < S.capacity)
+					S.contents += AC;
+				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/ammo_magazine
 	name = "ammo box (.357)"
 	desc = "A box of .357 ammo"