Merge pull request #918 from Kabramen/new-wood-types

New wood types + lavaland red grass
This commit is contained in:
QuoteFox
2021-01-22 08:45:11 +00:00
committed by GitHub
17 changed files with 445 additions and 2 deletions
@@ -11,6 +11,9 @@
* Brass (clockwork cult)
* Bronze (bake brass)
* Cotton/Duracotton
* Shwadon
*
*
*/
/*
@@ -769,3 +772,95 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
merge_type = /obj/item/stack/sheet/cotton/durathread
pull_effort = 70
loom_result = /obj/item/stack/sheet/durathread
/*
* Shadow Wood
*/
GLOBAL_LIST_INIT(shadoww_recipes, list ( \
new/datum/stack_recipe("Shadow wood floor tile", /obj/item/stack/tile/shadoww, 1, 4, 20), \
new/datum/stack_recipe("Shadow wood table frame", /obj/structure/table_frame/shadoww, 2, time = 10), \
null, \
))
/obj/item/stack/sheet/mineral/shadoww
name = "shadow wood"
desc = "An purplish wood, it has nothing of special besides its color."
singular_name = "shadow wood plank"
icon_state = "sheet-shadoww"
item_state = "sheet-shadoww"
icon = 'icons/obj/stack_objects.dmi'
sheettype = "shadoww"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
resistance_flags = FLAMMABLE
merge_type = /obj/item/stack/sheet/mineral/shadoww
novariants = TRUE
grind_results = list(/datum/reagent/carbon = 20)
/obj/item/stack/sheet/mineral/shadoww/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.shadoww_recipes
return ..()
/obj/item/stack/sheet/mineral/shadoww/fifty
amount = 50
/*
* Giant mushroom
*/
GLOBAL_LIST_INIT(gmushroom_recipes, list ( \
new/datum/stack_recipe("Mushroom floor tile", /obj/item/stack/tile/gmushroom, 1, 4, 20), \
new/datum/stack_recipe("Mushroom table frame", /obj/structure/table_frame/gmushroom, 2, time = 10), \
null, \
))
/obj/item/stack/sheet/mineral/gmushroom
name = "mushroom 'wood'"
desc = "A material similar to wood, except for being fireproof."
singular_name = "mushroom plank"
icon_state = "sheet-gmushroom"
item_state = "sheet-gmushroom"
icon = 'icons/obj/stack_objects.dmi'
sheettype = "gmushroom"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 0)
resistance_flags = FIRE_PROOF
merge_type = /obj/item/stack/sheet/mineral/gmushroom
novariants = TRUE
grind_results = list(/datum/reagent/carbon = 20)
/obj/item/stack/sheet/mineral/gmushroom/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.gmushroom_recipes
return ..()
/obj/item/stack/sheet/mineral/gmushroom/fifty
amount = 50
/*
* Plaswood
*/
GLOBAL_LIST_INIT(plaswood_recipes, list ( \
new/datum/stack_recipe("Plaswood floor tile", /obj/item/stack/tile/plaswood, 1, 4, 20), \
new/datum/stack_recipe("Plaswood table frame", /obj/structure/table_frame/plaswood, 2, time = 10), \
null, \
))
/obj/item/stack/sheet/mineral/plaswood
name = "plaswood"
desc = "A type of resistant wood acquired from Plasma Trees. It amost looks like metal!"
singular_name = "plaswood plank"
icon_state = "sheet-plaswood"
item_state = "sheet-plaswood"
icon = 'icons/obj/stack_objects.dmi'
sheettype = "plaswood"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 80)
resistance_flags = FLAMMABLE | ACID_PROOF
throwforce = 10
merge_type = /obj/item/stack/sheet/mineral/plaswood
novariants = TRUE
grind_results = list(/datum/reagent/carbon = 20, /datum/reagent/toxin/plasma = 20)
point_value = 23
/obj/item/stack/sheet/mineral/plaswood/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.plaswood_recipes
return ..()
/obj/item/stack/sheet/mineral/plaswood/fifty
amount = 50
@@ -270,3 +270,30 @@
materials = list() // All other Borg versions of items have no Metal or Glass - RR
is_cyborg = 1
cost = 125
//Mushroom
/obj/item/stack/tile/gmushroom
name = "mushroom floor tile"
singular_name = "mushroom floor tile"
desc = "An easy to fit mushroom floor tile."
icon_state = "tile-gmushroom"
turf_type = /turf/open/floor/gmushroom
resistance_flags = FIRE_PROOF
//Shadown Wood
/obj/item/stack/tile/shadoww
name = "shadow wood floor tile"
singular_name = "shadow wood floor tile"
desc = "An easy to fit wood floor tile."
icon_state = "tile-shadoww"
turf_type = /turf/open/floor/shadoww
resistance_flags = FLAMMABLE
//Plaswood
/obj/item/stack/tile/plaswood
name = "plaswood floor tile"
singular_name = "plaswood floor tile"
desc = "An easy to fit wood floor tile."
icon_state = "tile-plaswood"
turf_type = /turf/open/floor/plaswood
resistance_flags = FLAMMABLE | ACID_PROOF