Merge branch 'bleeding-edge-freeze' into viro

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

@@ -153,6 +153,7 @@
 	icon_state = "knife"
 	desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
 	flags = FPRINT | TABLEPASS | CONDUCT
+	sharp = 1
 	force = 10.0
 	w_class = 3.0
 	throwforce = 6.0

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

@@ -146,5 +146,5 @@
 	item_state = "harpoon"
 	force = 20
 	throwforce = 15
-	w_class = 2
+	w_class = 3
 	attack_verb = list("jabbed","stabbed","ripped")