From c41c62ded41c491ff6a1bf2a16e499229a5eb852 Mon Sep 17 00:00:00 2001
From: "petethegoat@gmail.com"
 <petethegoat@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Fri, 16 Mar 2012 21:35:18 +0000
Subject: [PATCH] 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
---
 .../modules/mob/living/silicon/robot/robot.dm | 21 +++++++++++++++++++
 .../mob/living/silicon/robot/robot_modules.dm |  5 ++---
 code/modules/recycling/disposal.dm            |  2 +-
 html/changelog.html                           | 12 +++++++++--
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 26974ed81f6..7b7281e48f1 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/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()
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 83a74eee12b..341092f99a8 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/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)
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index a6b443357a9..ff8076f8e7b 100644
--- a/code/modules/recycling/disposal.dm
+++ b/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))
diff --git a/html/changelog.html b/html/changelog.html
index 425998f8bd3..e8c261b8b8b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -93,14 +93,22 @@ should be listed in the changelog upon commit tho. Thanks. -->
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 
 <div class="commit sansserif">
-	<h2 class="date">3/16/2010</h2>
+	<h2 class="date">14 March 2012</h2>
 	<h3 class="author">PolymorphBlue updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="rscadd">Modular changeling added!  Changelings now purchase the powers they want.  Balancing still underway, but should be playable.</li>
 	</ul>
+	<h3 class="author">Petethegoat updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">Janitor cyborgs have been massively upgraded. Suffice to say they're pretty <em>ballin'</em> now...</li>
+	</ul>
+	<h3 class="author">Nodrak updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">You can now choose whether to spawn with a backpack, satchel, or nothing. Excess items will spawn in your hands if necessary.</li>
+		<li class="rscadd">You can now choose what kind of underwear you'd like to wear, per a request.</li>
+	</ul>
 </div>
 
-
 <div class="commit sansserif">
 	<h2 class="date">14 March 2012</h2>
 	<h3 class="author">Carn updated:</h3>