Merge with dev.

code/defines/obj/weapon.dm

@@ -56,7 +56,7 @@
 	icon_state = "bike_horn"
 	item_state = "bike_horn"
 	throwforce = 3
-	w_class = 1.0
+	w_class = 2
 	throw_speed = 3
 	throw_range = 15
 	attack_verb = list("HONKED")

code/defines/procs/announce.dm

@@ -36,7 +36,7 @@
 	var/tmp/message_title = new_title ? new_title : title
 	var/tmp/message_sound = new_sound ? sound(new_sound) : sound
 
-	message = html_encode(message)
+	message = trim_strip_html_properly(message)
 	message_title = html_encode(message_title)
 
 	Message(message, message_title)