a bunch of small bugfixes and tweaks (#8091)

code/game/objects/items/stacks/wrap.dm

@@ -5,6 +5,7 @@
 	icon_state = "wrap_paper"
 	singular_name = "square unit"
 	amount = 20.0
+	drop_sound = 'sound/items/drop/wrapper.ogg'
 
 /obj/item/stack/wrapping_paper/attackby(obj/item/W, mob/user)
 	..()

code/game/objects/items/weapons/material/shards.dm

@@ -16,6 +16,7 @@
 	default_material = "glass"
 	unbreakable = 1 //It's already broken.
 	drops_debris = 0
+	drop_sound = 'sound/effects/glass_step.ogg'
 
 /obj/item/material/shard/set_material(var/new_material)
 	..(new_material)
@@ -63,7 +64,7 @@
 		if(M.buckled) //wheelchairs, office chairs, rollerbeds
 			return
 
-		to_chat(M, "<span class='danger'>You step on \the [src]!</span>")
+		to_chat(M, span("danger", "You step on \the [src]!"))
 		playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M

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

@@ -13,6 +13,8 @@
 	var/mopping = 0
 	var/mopcount = 0
 	var/cleantime = 25
+	var/last_clean
+	var/clean_msg = FALSE
 
 /obj/item/mop/Initialize()
 	. = ..()
@@ -27,17 +29,23 @@
 	if(!proximity) return
 	if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune))
 		if(reagents.total_volume < 1)
-			to_chat(user, "<span class='notice'>Your mop is dry!</span>")
+			if(clean_msg)
+				to_chat(user, span("notice", "Your mop is dry!"))
 			return
-
-		user.visible_message("<span class='warning'>[user] begins to mop \the [get_turf(A)].</span>")
+		if (!(last_clean && world.time < last_clean + 120)) //spam is bad
+			user.visible_message(span("warning", "[user] begins to mop \the [get_turf(A)]."))
+			clean_msg = TRUE
+			last_clean = world.time
+		else
+			clean_msg = FALSE
 		playsound(loc, 'sound/effects/mop.ogg', 25, 1)
 
 		if(do_after(user, cleantime))
 			var/turf/T = get_turf(A)
 			if(T)
 				T.clean(src, user)
-			to_chat(user, "<span class='notice'>You have finished mopping!</span>")
+			if(clean_msg)
+				to_chat(user, span("notice", "You have finished mopping!"))
 			update_icon()
 
 
@@ -81,7 +89,7 @@
 		START_PROCESSING(SSprocessing, src)
 	else
 		STOP_PROCESSING(SSprocessing,src)
-	to_chat(user, "<span class='notice'>You set the condenser switch to the '[refill_enabled ? "ON" : "OFF"]' position.</span>")
+	to_chat(user, span("notice", "You set the condenser switch to the <b>'[refill_enabled ? "ON" : "OFF"]'</b> position."))
 	playsound(user, 'sound/machines/click.ogg', 25, 1)
 
 /obj/item/mop/advanced/process()
@@ -90,10 +98,9 @@
 
 /obj/item/mop/advanced/examine(mob/user)
 	..()
-	to_chat(user, "<span class='notice'>The condenser switch is set to <b>[refill_enabled ? "ON" : "OFF"]</b>.</span>")
+	to_chat(user, span("notice", "\The condenser switch is set to <b>[refill_enabled ? "ON" : "OFF"]</b>."))
 
 /obj/item/mop/advanced/Destroy()
 	if(refill_enabled)
 		STOP_PROCESSING(SSprocessing, src)
 	return ..()
-

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

@@ -13,6 +13,8 @@
 	throw_range = 20
 	flags = OPENCONTAINER
 	var/key_data
+	var/clean_msg
+	var/last_clean
 	drop_sound = 'sound/misc/slip.ogg'
 
 /obj/item/soap/New()
@@ -27,7 +29,7 @@
 /obj/item/soap/attackby(var/obj/item/I, var/mob/user)
 	if(istype(I, /obj/item/key))
 		if(!key_data)
-			to_chat(user, "<span class='notice'>You imprint \the [I] into \the [src].</span>")
+			to_chat(user, span("notice", "You imprint \the [I] into \the [src]."))
 			var/obj/item/key/K = I
 			key_data = K.key_data
 			update_icon()
@@ -49,22 +51,28 @@
 	//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))
-		to_chat(user, "<span class='notice'>You need to take that [target.name] off before cleaning it.</span>")
+		to_chat(user, span("notice", "You need to take that [target.name] off before cleaning it."))
 	else if(istype(target,/obj/structure/sink) || istype(target,/obj/structure/sink))
-		to_chat(user, "<span class='notice'>You wet \the [src] in the sink.</span>")
+		to_chat(user, span("notice", "You wet \the [src] in the sink."))
 		wet()
 	else if (istype(target, /obj/structure/mopbucket) || istype(target, /obj/item/reagent_containers/glass) || istype(target, /obj/structure/reagent_dispensers/watertank))
 		if (target.reagents && target.reagents.total_volume)
-			to_chat(user, "<span class='notice'>You wet \the [src] in the [target].</span>")
+			to_chat(user, span("notice", "You wet \the [src] in the [target]."))
 			wet()
 		else
 			to_chat(user, "\The [target] is empty!")
 	else
-		to_chat(user, "You start scrubbing the [target.name]")
+		if (!(last_clean && world.time < last_clean + 120))
+			to_chat(user, "You start scrubbing the [target.name]")
+			clean_msg = TRUE
+			last_clean = world.time
+		else
+			clean_msg = FALSE
 		playsound(loc, 'sound/effects/mop.ogg', 25, 1)
 		if (do_after(user, 25, needhand = 0))
 			target.clean_blood()
-			to_chat(user, "<span class='notice'>You scrub \the [target.name] out.</span>")
+			if(clean_msg)
+				to_chat(user, span("notice", "You scrub \the [target.name] out."))
 			if(istype(target, /turf) || istype(target, /obj/effect/decal/cleanable) || istype(target, /obj/effect/overlay))
 				var/turf/T = get_turf(target)
 				if(T)
@@ -74,7 +82,7 @@
 //attack_as_weapon
 /obj/item/soap/attack(mob/living/target, mob/living/user, var/target_zone)
 	if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_sel &&user.zone_sel.selecting == BP_MOUTH )
-		user.visible_message("<span class='danger'>\The [user] washes \the [target]'s mouth out with soap!</span>")
+		user.visible_message(span("danger", "\The [user] washes \the [target]'s mouth out with soap!"))
 		user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //prevent spam
 		return
 	..()