Merge remote-tracking branch 'upstream/master' into dev

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

@@ -40,7 +40,7 @@
 		user.visible_message("<span class='warning'>[user] begins to clean \the [get_turf(A)].</span>")
 
 		if(do_after(user, 40))
-			var/turf/T = A
+			var/turf/T = get_turf(A)
 			if(T)
 				T.clean(src)
 			user << "<span class='notice'>You have finished mopping!</span>"
@@ -49,4 +49,4 @@
 /obj/effect/attackby(obj/item/I, mob/user)
 	if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap))
 		return
-	..()
+	..()