Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction

Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm

code/game/objects/items/stacks/sheets/leather.dm

@@ -133,7 +133,21 @@ var/global/list/datum/stack_recipe/xeno_recipes = list ( \
 	desc = "Long stringy filaments which presumably came from a watcher's wings."
 	singular_name = "watcher sinew"
 	icon_state = "sinew"
-	origin_tech = "bio=4"
+	origin_tech = "biotech=4"
+
+		/*
+ * Plates
+ 		*/
+
+/obj/item/stack/sheet/animalhide/goliath_hide
+	name = "goliath hide plates"
+	desc = "Pieces of a goliath's rocky hide, these might be able to make your suit a bit more durable to attack from the local fauna."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "goliath_hide"
+	singular_name = "hide plate"
+	flags = NOBLUDGEON
+	w_class = 3
+	layer = 4
 
 
 //Step one - dehairing.

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -265,4 +265,6 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
 	w_class = 3
 	throw_speed = 1
 	throw_range = 3
-	origin_tech = "materials=2;bio=2"
+	origin_tech = "materials=2;bio=2"
+
+