Merge polaris sync 01 17 2018

Planes, layers, human/update_icon()

code/modules/materials/material_recipes.dm

@@ -25,7 +25,7 @@
 
 	if(hardness>50)
 		recipes += new/datum/stack_recipe("[display_name] fork", /obj/item/weapon/material/kitchen/utensil/fork/plastic, 1, on_floor = 1, supplied_material = "[name]")
-		recipes += new/datum/stack_recipe("[display_name] knife", /obj/item/weapon/material/kitchen/utensil/knife/plastic, 1, on_floor = 1, supplied_material = "[name]")
+		recipes += new/datum/stack_recipe("[display_name] knife", /obj/item/weapon/material/knife/plastic, 1, on_floor = 1, supplied_material = "[name]")
 		recipes += new/datum/stack_recipe("[display_name] blade", /obj/item/weapon/material/butterflyblade, 6, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]")
 
 /material/steel/generate_recipes()
@@ -125,6 +125,9 @@
 
 /material/wood/generate_recipes()
 	..()
+	recipes += new/datum/stack_recipe("oar", /obj/item/weapon/oar, 2, time = 30, supplied_material = "[name]")
+	recipes += new/datum/stack_recipe("boat", /obj/vehicle/boat, 20, time = 10 SECONDS, supplied_material = "[name]")
+	recipes += new/datum/stack_recipe("dragon boat", /obj/vehicle/boat/dragon, 50, time = 30 SECONDS, supplied_material = "[name]")
 	recipes += new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1)
 	recipes += new/datum/stack_recipe("wood circlet", /obj/item/clothing/head/woodcirclet, 1)
 	recipes += new/datum/stack_recipe("clipboard", /obj/item/weapon/clipboard, 1)

code/modules/materials/material_sheets.dm

@@ -201,33 +201,48 @@
 /obj/item/stack/material/wood
 	name = "wooden plank"
 	icon_state = "sheet-wood"
-	default_type = "wood"
+	default_type = MAT_WOOD
+
+/obj/item/stack/material/wood/sif
+	name = "alien wooden plank"
+	color = "#0099cc"
+	default_type = MAT_SIFWOOD
 
 /obj/item/stack/material/log
 	name = "log"
 	icon_state = "sheet-log"
-	default_type = "log"
+	default_type = MAT_LOG
 	no_variants = FALSE
 	color = "#824B28"
 	max_amount = 25
 	w_class = ITEMSIZE_HUGE
+	description_info = "Use inhand to craft things, or use a sharp and edged object on this to convert it into two wooden planks."
+	var/plank_type = /obj/item/stack/material/wood
 
 /obj/item/stack/material/log/sif
 	name = "alien log"
-	default_type = "alien log"
+	default_type = MAT_SIFLOG
 	color = "#0099cc"
+	plank_type = /obj/item/stack/material/wood/sif
 
 /obj/item/stack/material/log/attackby(var/obj/item/W, var/mob/user)
-	if(!istype(W))
+	if(!istype(W) || W.force <= 0)
 		return ..()
-	if(W.sharp && W.edge && use(1))
-		to_chat(user, "<span class='notice'>You cut up a log into planks.</span>")
-		playsound(get_turf(src), 'sound/effects/woodcutting.ogg', 50, 1)
-		var/obj/item/stack/material/wood/existing_wood = locate() in user.loc
-		var/obj/item/stack/material/wood/new_wood = new(user.loc)
-		new_wood.amount = 2
-		if(existing_wood)
-			if(new_wood.transfer_to(existing_wood))
+	if(W.sharp && W.edge)
+		var/time = (3 SECONDS / max(W.force / 10, 1)) * W.toolspeed
+		user.setClickCooldown(time)
+		if(do_after(user, time, src) && use(1))
+			to_chat(user, "<span class='notice'>You cut up a log into planks.</span>")
+			playsound(get_turf(src), 'sound/effects/woodcutting.ogg', 50, 1)
+			var/obj/item/stack/material/wood/existing_wood = null
+			for(var/obj/item/stack/material/wood/M in user.loc)
+				if(M.material.name == src.material.name)
+					existing_wood = M
+					break
+
+			var/obj/item/stack/material/wood/new_wood = new plank_type(user.loc)
+			new_wood.amount = 2
+			if(existing_wood && new_wood.transfer_to(existing_wood))
 				to_chat(user, "<span class='notice'>You add the newly-formed wood to the stack. It now contains [existing_wood.amount] planks.</span>")
 	else
 		return ..()

code/modules/materials/materials.dm

@@ -672,9 +672,9 @@ var/list/name_to_material
 
 
 /material/wood
-	name = "wood"
+	name = MAT_WOOD
 	stack_type = /obj/item/stack/material/wood
-	icon_colour = "#824B28"
+	icon_colour = "#9c5930"
 	integrity = 50
 	icon_base = "wood"
 	explosion_resistance = 2
@@ -694,14 +694,14 @@ var/list/name_to_material
 	sheet_plural_name = "planks"
 
 /material/wood/log
-	name = "log"
+	name = MAT_LOG
 	icon_base = "log"
 	stack_type = /obj/item/stack/material/log
 	sheet_singular_name = null
 	sheet_plural_name = "pile"
 
 /material/wood/log/sif
-	name = "alien log"
+	name = MAT_SIFLOG
 	icon_colour = "#0099cc" // Cyan-ish
 	stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2)
 	stack_type = /obj/item/stack/material/log/sif
@@ -713,7 +713,7 @@ var/list/name_to_material
 	shard_type = SHARD_NONE
 
 /material/wood/sif
-	name = "alien wood"
+	name = MAT_SIFWOOD
 //	stack_type = /obj/item/stack/material/wood/sif
 	icon_colour = "#0099cc" // Cyan-ish
 	stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) // Alien wood would presumably be more interesting to the analyzer.