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

Conflicts:
	code/modules/hydroponics/seed_mobs.dm
	code/modules/materials/materials.dm

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

@@ -38,10 +38,10 @@
 /obj/item/weapon/material/butterfly/attack_self(mob/user)
 	active = !active
 	if(active)
-		user << "<span class='notice'>You flip out your [src].</span>"
+		user << "<span class='notice'>You flip out \the [src].</span>"
 		playsound(user, 'sound/weapons/flipblade.ogg', 15, 1)
 	else
-		user << "<span class='notice'>The butterfly knife can now be concealed.</span>"
+		user << "<span class='notice'>\The [src] can now be concealed.</span>"
 	update_force()
 	add_fingerprint(user)