From 94d5cc5575558e8499437b6e568b4994de5f04c3 Mon Sep 17 00:00:00 2001
From: Ren Erthilo <erthilo@gmail.com>
Date: Sun, 29 Apr 2012 17:59:54 +0100
Subject: [PATCH] TG: Janitor borgs have been massively upgraded. They now
 clean as they roll, and have a trashbag. Revision: r3310 Author: 	
 petethegoat

---
 .../modules/mob/living/silicon/robot/robot.dm | 21 ++++++++++++++++++-
 .../mob/living/silicon/robot/robot_modules.dm |  4 +---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 4a1104141b6..be090aaa13f 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1102,7 +1102,26 @@ Frequency:
 		. = ..()
 	if ((s_active && !( s_active in contents ) ))
 		s_active.close(src)
-	return
+
+	if(module)
+		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/R in tile)
+				if(istype(R, /obj/effect/rune) || istype(R, /obj/effect/decal/cleanable) || istype(R, /obj/effect/overlay))
+					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/reset_module()
 	modtype = "robot"
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index ffe76a3b76c..ae36d76944c 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -163,9 +163,7 @@
 
 	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)
 		src.emag = new /obj/item/weapon/cleaner(src)