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/modules/mining/lavaland/necropolis_chests.dm

@@ -38,7 +38,7 @@
 		if(11)
 			new /obj/vehicle/lavaboat/dragon(src)
 		if(12)
-			new /obj/item/upgradescroll(src)
+			new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker(src)
 		if(13)
 			new /obj/item/weapon/sord(src)
 		if(14)
@@ -68,6 +68,7 @@
 			new /obj/item/weapon/spellbook/oneuse/smoke(src)
 
 
+
 //Spooky special loot
 
 /obj/item/device/wisp_lantern
@@ -373,7 +374,7 @@
 /datum/table_recipe/boat
 	name = "goliath hide boat"
 	result = /obj/vehicle/lavaboat
-	reqs = list(/obj/item/asteroid/goliath_hide = 3)
+	reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide = 3)
 	time = 50
 	category = CAT_MISC