Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge

Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme

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

@@ -34,6 +34,9 @@
 		else
 			return ..()
 
+	if(!M.can_eat(src))
+		return
+
 	if (reagents.total_volume > 0)
 		reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
 		if(M == user)
@@ -82,13 +85,6 @@
 		return
 	return ..()
 
-/obj/item/weapon/material/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
-	if ((CLUMSY in user.mutations) && prob(50))
-		user << "<span class='warning'>You somehow managed to cut yourself with the [src].</span>"
-		user.take_organ_damage(20)
-		return
-	return ..()
-
 /obj/item/weapon/material/kitchen/utensil/knife/plastic
 	default_material = "plastic"
 
@@ -108,6 +104,7 @@
 /obj/item/weapon/material/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob)
 	if ((CLUMSY in user.mutations) && prob(50))
 		user << "<span class='warning'>The [src] slips out of your hand and hits your head.</span>"
+		user.drop_from_inventory(src)
 		user.take_organ_damage(10)
 		user.Paralyse(2)
 		return

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

@@ -64,9 +64,8 @@
 	processing_objects -= src
 	..()
 
-/obj/item/weapon/material/attack()
-	if(!..())
-		return
+/obj/item/weapon/material/apply_hit_effect()
+	..()
 	if(!unbreakable)
 		if(material.is_brittle())
 			health = 0

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

@@ -55,7 +55,6 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "hoe"
 	item_state = "hoe"
-	flags = CONDUCT | NOBLUDGEON
 	force_divisor = 0.25 // 5 with weight 20 (steel)
 	thrown_force_divisor = 0.25 // as above
 	w_class = 2