From cec16a796fa8c7919d81ce9363a1ef9c71b9cdc3 Mon Sep 17 00:00:00 2001
From: "petethegoat@gmail.com"
 <petethegoat@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sun, 23 Sep 2012 14:14:22 +0000
Subject: [PATCH] Fixes issue 950. (tele-mopping of floors) Cleans up mop code
 a fair bit, and adds a notice to the changelog about computer issues.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4738 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/objects/items/weapons/mop.dm | 43 +++++++++-----------------
 html/changelog.html                    |  9 ++++++
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index f746ec45916..75f0a897f03 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -3,8 +3,6 @@
 	name = "mop"
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "mop"
-	var/mopping = 0
-	var/mopcount = 0
 	force = 3.0
 	throwforce = 10.0
 	throw_speed = 5
@@ -12,6 +10,8 @@
 	w_class = 3.0
 	flags = FPRINT | TABLEPASS
 	attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
+	var/mopping = 0
+	var/mopcount = 0
 
 
 /obj/item/weapon/mop/New()
@@ -21,7 +21,7 @@
 
 
 obj/item/weapon/mop/proc/clean(turf/simulated/A as turf)
-	src.reagents.reaction(A,1,10)
+	reagents.reaction(A,1,10)
 	A.clean_blood()
 	for(var/obj/effect/O in A)
 		if( istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay) )
@@ -35,35 +35,20 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A as turf)
 
 
 /obj/item/weapon/mop/afterattack(atom/A, mob/user as mob)
-	if (src.reagents.total_volume < 1 || mopcount >= 5)
-		user << "\blue Your mop is dry!"
+	if(reagents.total_volume < 1 || mopcount >= 5)
+		user << "<span class='notice'>Your mop is dry!</span>"
 		return
 
-	if (istype(A, /turf/simulated))
-		for(var/mob/O in viewers(user, null))
-			O.show_message("\red <B>[user] begins to clean \the [A]</B>", 1)
-		sleep(40)
-		if(A)
-			clean(A)
-		user << "\blue You have finished mopping!"
-		mopcount++
-	else if (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune))
-		for(var/mob/O in viewers(user, null))
-			O.show_message("\red <B>[user] begins to clean \the [get_turf(A)]</B>", 1)
-		sleep(40)
-		if(A)
-			clean(get_turf(A))
-		user << "\blue You have finished mopping!"
-		mopcount++
+	if(istype(A, /turf/simulated) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune))
+		user.visible_message("<span class='warning'>[user] begins to clean \the [get_turf(A)].</span>")
+		if(do_after(user, 40))
+			if(A)
+				clean(get_turf(A))
+			user << "<span class='notice'>You have finished mopping!</span>"
+			mopcount++
 
 	if(mopcount >= 5) //Okay this stuff is an ugly hack and i feel bad about it.
 		spawn(5)
-			src.reagents.clear_reagents()
+			reagents.clear_reagents()
 			mopcount = 0
-	return
-
-
-
-
-
-
+	return
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index f1cc5d4900e..2281dd32cd6 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -48,6 +48,15 @@ Stuff which is in development and not yet visible to players or just code relate
 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">23 September 2012</h2>
+	<h3 class="author">Petethegoat updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Fixed an exploit which would allow the janitor to magically mop floors.</li>
+		<li class="experiment">If you encounter any issues with computers, notify an admin, or ask for assistance on #coderbus, on irc.rizon.net.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">17 September 2012</h2>
 	<h3 class="author">Cheridan updated:</h3>