Fixed some improperly merged files.

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

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

@@ -52,6 +52,54 @@ MOP
 	..()
 	return
 
+/obj/item/weapon/chemsprayer/New()
+	var/datum/reagents/R = new/datum/reagents(1000)
+	reagents = R
+	R.my_atom = src
+	R.add_reagent("cleaner", 10)
+
+/obj/item/weapon/chemsprayer/attack(mob/living/carbon/human/M as mob, mob/user as mob)
+	return
+
+/obj/item/weapon/chemsprayer/afterattack(atom/A as mob|obj, mob/user as mob)
+	if (istype(A, /obj/item/weapon/storage/backpack ))
+		return
+	else if (src.reagents.total_volume < 1)
+		user << "\blue Add more cleaner!"
+		return
+
+	var/obj/decal/D = new/obj/decal(get_turf(src))
+	D.name = "chemicals"
+	D.icon = 'chemical.dmi'
+	D.icon_state = "chempuff"
+	D.create_reagents(10)
+	src.reagents.trans_to(D, 10)
+	playsound(src.loc, 'spray2.ogg', 50, 1, -6)
+
+	spawn(0)
+		for(var/i=0, i<6, i++)
+			step_towards(D,A)
+			D.reagents.reaction(get_turf(D))
+			for(var/atom/T in get_turf(D))
+				D.reagents.reaction(T)
+			sleep(6)
+		del(D)
+
+	if(isrobot(user)) //Cyborgs can clean forever if they keep charged
+		var/mob/living/silicon/robot/janitor = user
+		janitor.cell.charge -= 20
+		var/refill = src.reagents.get_master_reagent_id()
+		spawn(600)
+			src.reagents.add_reagent(refill, 10)
+
+	return
+
+/obj/item/weapon/chemsprayer/examine()
+	set src in usr
+	usr << text("\icon[] [] units of cleaner left!", src, src.reagents.total_volume)
+	..()
+	return
+
 // MOP
 
 /obj/item/weapon/mop/New()