Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13

code/modules/cargo/bounties/mining.dm

@@ -63,3 +63,10 @@
 	reward = 1000
 	required_count = 1
 	wanted_types = list(/obj/item/seeds/lavaland/cactus)
+
+datum/bounty/item/mining/plaswood
+	name = "Plaswood Planks"
+	description = "Central Command's carpentry department needs more exotic wood, send us some plaswood planks!"
+	reward = 5500
+	required_count = 50
+	wanted_types = list(/obj/item/stack/sheet/mineral/plaswood)

code/modules/cargo/packs/materials.dm

@@ -30,6 +30,13 @@
 	contains = list(/obj/item/stack/sheet/metal/fifty)
 	crate_name = "metal sheets crate"
 
+/datum/supply_pack/materials/gmushroom50
+	name = "50 Mushroom Planks"
+	desc = "Looks like wood AND is fire proof? Of course you need fifty mushroom planks!"
+	cost = 1700
+	contains = list(/obj/item/stack/sheet/mineral/gmushroom/fifty)
+	crate_name = "mushroom planks crate"
+
 /datum/supply_pack/materials/plasteel20
 	name = "20 Plasteel Sheets"
 	desc = "Reinforce the station's integrity with twenty plasteel sheets!"
@@ -51,6 +58,13 @@
 	contains = list(/obj/item/stack/sheet/plastic/fifty)
 	crate_name = "plastic sheets crate"
 
+/datum/supply_pack/materials/plaswood50
+	name = "50 Plaswood Planks"
+	desc = "Who need metal when you can have fifty plaswood planks?"
+	cost = 9000
+	contains = list(/obj/item/stack/sheet/mineral/plaswood/fifty)
+	crate_name = "Plaswood crate"
+
 /datum/supply_pack/materials/sandstone30
 	name = "30 Sandstone Blocks"
 	desc = "Neither sandy nor stoney, these thirty blocks will still get the job done."
@@ -58,6 +72,13 @@
 	contains = list(/obj/item/stack/sheet/mineral/sandstone/thirty)
 	crate_name = "sandstone blocks crate"
 
+/datum/supply_pack/materials/shadoww50
+	name = "50 Shadow Wood Planks"
+	desc = "Time to bring the dark side with fifty shadow wooden planks!"
+	cost = 1450
+	contains = list(/obj/item/stack/sheet/mineral/shadoww/fifty)
+	crate_name = "Shadown wood planks crate"
+
 /datum/supply_pack/materials/wood50
 	name = "50 Wood Planks"
 	desc = "Turn cargo's boring metal groundwork into beautiful panelled flooring and much more with fifty wooden planks!"
@@ -79,7 +100,7 @@
 	name = "Bulk Raw Cotton Crate"
 	desc = "Plushies are more down in the market than ever before; bulk cotton now for use! Contains 100 raw cotton sheets."
 	cost = 1700 //Same math as before, but since it's bulk, you get a 100 credit discount to encourage bulk buys. Welcome to space Costco.
-	contains = list(/obj/item/stack/sheet/cotton/thirty, 
+	contains = list(/obj/item/stack/sheet/cotton/thirty,
 					/obj/item/stack/sheet/cotton/thirty,
 					/obj/item/stack/sheet/cotton/thirty,
 					/obj/item/stack/sheet/cotton/ten

code/modules/hydroponics/grown/towercap.dm

@@ -98,6 +98,45 @@
 /obj/item/grown/log/steel/CheckAccepted(obj/item/I)
 	return FALSE
 
+/obj/item/grown/log/ashtree
+	seed = null
+	name = "ashtree log"
+	desc = "A piece of log."
+	icon_state = "ashtree_log"
+
+/obj/item/grown/log/gmushroom
+	seed = null
+	name = "mushroom log"
+	desc = "Looks like candy! Do not eat it."
+	icon_state = "mushroom_log"
+	plank_type = /obj/item/stack/sheet/mineral/gmushroom
+	plank_name = "mushroom planks"
+
+/obj/item/grown/log/gmushroom/CheckAccepted(obj/item/I)
+	return FALSE
+
+/obj/item/grown/log/shadowtree
+	seed = null
+	name = "shadow log"
+	desc = "A piece of dark log."
+	icon_state = "shadow_log"
+	plank_type = /obj/item/stack/sheet/mineral/shadoww
+	plank_name = "shadow planks"
+
+/obj/item/grown/log/gmushroom/CheckAccepted(obj/item/I)
+	return FALSE
+
+/obj/item/grown/log/plasmatree
+	seed = null
+	name = "plasma tree log"
+	desc = "A heavy piece log."
+	icon_state = "plasmatree_log"
+	plank_type = /obj/item/stack/sheet/mineral/plaswood
+	plank_name = "plaswood planks"
+
+/obj/item/grown/log/plasmatree/CheckAccepted(obj/item/I)
+	return FALSE
+
 /obj/item/seeds/bamboo
 	name = "pack of bamboo seeds"
 	desc = "A plant known for its flexible and resistant logs."
@@ -163,7 +202,7 @@
 /obj/structure/bonfire/prelit/Initialize()
 	. = ..()
 	StartBurning()
-	
+
 /obj/structure/bonfire/CanPass(atom/movable/mover, turf/target)
 	if(istype(mover) && (mover.pass_flags & PASSTABLE))
 		return TRUE