Merge polaris sync 01 17 2018

Planes, layers, human/update_icon()

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm

@@ -181,7 +181,7 @@
 	glass_desc = "Unless you are an industrial tool, this is probably not safe for consumption."
 
 /datum/reagent/fuel/touch_turf(var/turf/T, var/amount)
-	new /obj/effect/decal/cleanable/liquid_fuel(T, amount)
+	new /obj/effect/decal/cleanable/liquid_fuel(T, amount, FALSE)
 	remove_self(amount)
 	return
 

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -3424,7 +3424,7 @@
 
 // potato + knife = raw sticks
 /obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W,/obj/item/weapon/material/kitchen/utensil/knife))
+	if(istype(W,/obj/item/weapon/material/knife))
 		new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(src)
 		user << "You cut the potato."
 		qdel(src)

code/modules/reagents/reagent_containers/glass.dm

@@ -298,7 +298,7 @@ obj/item/weapon/reagent_containers/glass/bucket/wood
 	if(isprox(D))
 		user << "This wooden bucket doesn't play well with electronics."
 		return
-	else if(istype(D, /obj/item/weapon/material/hatchet))
+	else if(istype(D, /obj/item/weapon/material/knife/machete/hatchet))
 		to_chat(user, "<span class='notice'>You cut a big hole in \the [src] with \the [D].  It's kinda useless as a bucket now.</span>")
 		user.put_in_hands(new /obj/item/clothing/head/helmet/bucket/wood)
 		user.drop_from_inventory(src)