Merge pull request #3655 from VampyrBytes/washrefactor

refactors washing items

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

@@ -65,6 +65,12 @@
 	J.mymop=src
 	J.update_icon()
 
+/obj/item/weapon/mop/wash(mob/user, atom/source)
+	reagents.add_reagent("water", 5)
+	user << "<span class='notice'>You wet [src] in [source].</span>"
+	playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+	return 1
+
 /obj/item/weapon/mop/advanced
 	desc = "The most advanced tool in a custodian's arsenal. Just think of all the viscera you will clean up with this!"
 	name = "advanced mop"

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

@@ -163,6 +163,21 @@
 			bcell.reliability -= 10 / severity
 	..()
 
+/obj/item/weapon/melee/baton/wash(mob/user, atom/source)
+	if(bcell)
+		if(bcell.charge > 0 && status == 1)
+			flick("baton_active", source)
+			user.Stun(stunforce)
+			user.Weaken(stunforce)
+			user.stuttering = stunforce
+			deductcharge(hitcost)
+			user.visible_message("<span class='warning'>[user] shocks themself while attempting to wash the active [src]!</span>", \
+								"<span class='userdanger'>You unwisely attempt to wash [src] while it's still on.</span>")
+			playsound(src, "sparks", 50, 1)
+			return 1
+	..()
+
+
 //secborg stun baton module
 /obj/item/weapon/melee/baton/loaded/robot
 	hitcost = 1000