Janitor borgs have been massively upgraded.

They now clean as they roll, and have a trashbag.

Updated the changelog.

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

code/modules/mob/living/silicon/robot/robot.dm

@@ -967,6 +967,27 @@ Frequency:
 		. = ..()
 	if ((s_active && !( s_active in contents ) ))
 		s_active.close(src)
+
+	if(module.type == /obj/item/weapon/robot_module/janitor)	//you'd think checking the module would work
+		var/turf/tile = get_turf(loc)
+
+		tile.clean_blood()
+		for(var/obj/effect/rune/R in tile)
+			del(R)
+		for(var/obj/effect/decal/cleanable/R in tile)
+			del(R)
+		for(var/obj/effect/overlay/R in tile)
+			del(R)
+
+		for(var/obj/item/cleaned_item in tile)
+			cleaned_item.clean_blood()
+
+		for(var/mob/living/carbon/human/cleaned_human in tile)	//HUE HUE I CLEAN U
+			if(cleaned_human.lying)
+				cleaned_human.clean_blood()
+				cleaned_human << "\red [src] cleans your face!"
+				for(var/obj/item/carried_item in cleaned_human.contents)
+					carried_item.clean_blood()
 	return
 
 /mob/living/silicon/robot/proc/self_destruct()

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -162,9 +162,8 @@
 
 	New()
 		..()
-		src.modules += new /obj/item/weapon/cleaner(src)
-		src.modules += new /obj/item/weapon/mop(src)
-		src.modules += new /obj/item/weapon/reagent_containers/glass/bucket(src)
+		src.modules += new /obj/item/weapon/soap/nanotrasen(src)
+		src.modules += new /obj/item/weapon/trashbag
 		src.emag = new /obj/item/weapon/cleaner(src)
 
 		var/datum/reagents/R = new/datum/reagents(1000)

code/modules/recycling/disposal.dm

@@ -44,7 +44,7 @@
 		if(stat & BROKEN || !I || !user)
 			return
 
-		if(isrobot(user))
+		if(isrobot(user) && !istype(I, /obj/item/weapon/trashbag))
 			return
 
 		if(istype(I, /obj/item/weapon/melee/energy/blade))