Finally fixed those clean_blood() calls so they update mob-overlays properly. Resolves issue 681. Fixes space-cleaner grenades/splashing/spraying, Soap (work-around), Showers (again) and Janitor-borgs.

Fixed putting ammo in RCDs, resolves issue 696. Removed a little spam-text from RCDs too.
Removed some dyslexia from spesscash.
added an undef for LEGCUFF_LAYER


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

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

@@ -39,12 +39,13 @@ RCD
 		..()
 		if(istype(W, /obj/item/weapon/rcd_ammo))
 			if((matter + 10) > 30)
-				user << "The RCD cant hold any more matter."
+				user << "<span class='notice'>The RCD cant hold any more matter-units.</span>"
 				return
+			user.drop_item()
 			del(W)
 			matter += 10
 			playsound(src.loc, 'click.ogg', 50, 1)
-			user << "The RCD now holds [matter]/30 matter-units."
+			user << "<span class='notice'>The RCD now holds [matter]/30 matter-units.</span>"
 			desc = "A RCD. It currently holds [matter]/30 matter-units."
 			return
 
@@ -52,21 +53,22 @@ RCD
 	attack_self(mob/user as mob)
 		//Change the mode
 		playsound(src.loc, 'pop.ogg', 50, 0)
-		if(mode == 1)
-			mode = 2
-			user << "Changed mode to 'Airlock'"
-			src.spark_system.start()
-			return
-		if(mode == 2)
-			mode = 3
-			user << "Changed mode to 'Deconstruct'"
-			src.spark_system.start()
-			return
-		if(mode == 3)
-			mode = 1
-			user << "Changed mode to 'Floor & Walls'"
-			src.spark_system.start()
-			return
+		switch(mode)
+			if(1)
+				mode = 2
+				user << "<span class='notice'>Changed mode to 'Airlock'</span>"
+				src.spark_system.start()
+				return
+			if(2)
+				mode = 3
+				user << "<span class='notice'>Changed mode to 'Deconstruct'</span>"
+				src.spark_system.start()
+				return
+			if(3)
+				mode = 1
+				user << "<span class='notice'>Changed mode to 'Floor & Walls'</span>"
+				src.spark_system.start()
+				return
 
 
 	afterattack(atom/A, mob/user as mob)
@@ -79,18 +81,15 @@ RCD
 
 		if(istype(A, /turf) && mode == 1)
 			if(istype(A, /turf/space) && matter >= 1)
-				user << "Building Floor (1)..."
 				if(!disabled && matter >= 1)
 					playsound(src.loc, 'Deconstruct.ogg', 50, 1)
 					spark_system.set_up(5, 0, src)
 					src.spark_system.start()
 					A:ReplaceWithPlating()
 					matter--
-					user << "The RCD now holds [matter]/30 matter-units."
 					desc = "A RCD. It currently holds [matter]/30 matter-units."
 				return
 			if(istype(A, /turf/simulated/floor) && matter >= 3)
-				user << "Building Wall (3)..."
 				playsound(src.loc, 'click.ogg', 50, 1)
 				if(do_after(user, 20))
 					if(!disabled && matter >= 3)
@@ -99,7 +98,6 @@ RCD
 						A:ReplaceWithWall()
 						playsound(src.loc, 'Deconstruct.ogg', 50, 1)
 						matter -= 3
-						user << "The RCD now holds [matter]/30 matter-units."
 						desc = "A RCD. It currently holds [matter]/30 matter-units."
 				return
 		else if(istype(A, /turf/simulated/floor) && mode == 2 && matter >= 10)
@@ -118,7 +116,6 @@ RCD
 					playsound(src.loc, 'Deconstruct.ogg', 50, 1)
 					playsound(src.loc, 'sparks2.ogg', 50, 1)
 					matter -= 10
-					user << "The RCD now holds [matter]/30 matter-units."
 					desc = "A RCD. It currently holds [matter]/30 matter-units."
 			return
 		else if(mode == 3 && (istype(A, /turf) || istype(A, /obj/machinery/door/airlock) ) )
@@ -132,7 +129,6 @@ RCD
 						A:ReplaceWithPlating()
 						playsound(src.loc, 'Deconstruct.ogg', 50, 1)
 						matter -= 4
-						user << "The RCD now holds [matter]/30 matter-units."
 						desc = "A RCD. It currently holds [matter]/30 matter-units."
 				return
 			if(istype(A, /turf/simulated/wall/r_wall))
@@ -147,7 +143,6 @@ RCD
 						A:ReplaceWithSpace()
 						playsound(src.loc, 'Deconstruct.ogg', 50, 1)
 						matter -= 5
-						user << "The RCD now holds [matter]/30 matter-units."
 						desc = "A RCD. It currently holds [matter]/30 matter-units."
 				return
 			if(istype(A, /obj/machinery/door/airlock) && matter >= 10)
@@ -160,6 +155,5 @@ RCD
 						del(A)
 						playsound(src.loc, 'Deconstruct.ogg', 50, 1)
 						matter -= 10
-						user << "The RCD now holds [matter]/30 matter-units."
 						desc = "A RCD. It currently holds [matter]/30 matter-units."
 				return

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

@@ -44,11 +44,15 @@ BIKE HORN
 		M.Weaken(2)
 
 /obj/item/weapon/soap/afterattack(atom/target, mob/user as mob)
-	if(istype(target,/obj/effect/decal/cleanable))
-		user << "\blue You scrub \the [target.name] out."
+	//I couldn't feasibly  fix the overlay bugs caused by cleaning items we are wearing.
+	//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
+	if(user.client && (target in user.client.screen))
+		user << "<span class='notice'>You need to take that [target.name] off before cleaning it.</span>"
+	else if(istype(target,/obj/effect/decal/cleanable))
+		user << "<span class='notice'>You scrub \the [target.name] out.</span>"
 		del(target)
 	else
-		user << "\blue You clean \the [target.name]."
+		user << "<span class='notice'>You clean \the [target.name].</span>"
 		target.clean_blood()
 	return
 

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

@@ -361,12 +361,9 @@
 obj/item/weapon/mop/proc/clean(turf/simulated/A as turf)
 	src.reagents.reaction(A,1,10)
 	A.clean_blood()
-	for(var/obj/effect/rune/R in A)
-		del(R)
-	for(var/obj/effect/decal/cleanable/R in A)
-		del(R)
-	for(var/obj/effect/overlay/R in A)
-		del(R)
+	for(var/obj/effect/O in A)
+		if( istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay) )
+			del(O)
 
 
 /obj/effect/attackby(obj/item/weapon/W as obj, mob/user as mob)