From da9e3383a89945fa7ba0051eb1011c5c67c3197d Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Sat, 30 Oct 2021 21:25:32 +0000 Subject: [PATCH 1/2] Hardwood Material Port --- code/__defines/materials.dm | 2 ++ code/datums/supplypacks/materials.dm | 7 ++++ code/game/objects/structures/simple_doors.dm | 7 ++-- code/game/turfs/simulated/wall_types.dm | 3 ++ code/modules/materials/fifty_spawner_mats.dm | 8 +++++ .../materials/materials/organic/wood.dm | 34 +++++++++++++++++++ code/modules/materials/sheets/organic/wood.dm | 12 +++++++ code/modules/tables/presets.dm | 8 +++++ 8 files changed, 79 insertions(+), 2 deletions(-) diff --git a/code/__defines/materials.dm b/code/__defines/materials.dm index 64476cc5db..9536547c1d 100644 --- a/code/__defines/materials.dm +++ b/code/__defines/materials.dm @@ -18,6 +18,8 @@ #define MAT_LOG "log" #define MAT_SIFWOOD "alien wood" #define MAT_SIFLOG "alien log" +#define MAT_HARDWOOD "hardwood" +#define MAT_HARDLOG "hardwood log" #define MAT_STEELHULL "steel hull" #define MAT_PLASTEEL "plasteel" #define MAT_PLASTEELHULL "plasteel hull" diff --git a/code/datums/supplypacks/materials.dm b/code/datums/supplypacks/materials.dm index 3cc385eac1..5e181d8af8 100644 --- a/code/datums/supplypacks/materials.dm +++ b/code/datums/supplypacks/materials.dm @@ -28,6 +28,13 @@ containertype = /obj/structure/closet/crate/grayson containername = "Wooden planks crate" +/datum/supply_pack/materials/hardwood50 + name = "50 hardwood planks" + contains = list(/obj/fiftyspawner/hardwood) + cost = 50 + containertype = /obj/structure/closet/crate/gilthari + containername = "Hardwood planks crate" + /datum/supply_pack/materials/plastic50 name = "50 plastic sheets" contains = list(/obj/fiftyspawner/plastic) diff --git a/code/game/objects/structures/simple_doors.dm b/code/game/objects/structures/simple_doors.dm index 99dc08ec12..5c7a16151c 100644 --- a/code/game/objects/structures/simple_doors.dm +++ b/code/game/objects/structures/simple_doors.dm @@ -158,7 +158,7 @@ visible_message("[user] hits [src] with [W]!") if(material == get_material_by_name("resin")) playsound(src, 'sound/effects/attackblob.ogg', 100, 1) - else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD))) + else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD) || get_material_by_name(MAT_HARDWOOD))) playsound(src, 'sound/effects/woodcutting.ogg', 100, 1) else playsound(src, 'sound/weapons/smash.ogg', 50, 1) @@ -183,7 +183,7 @@ visible_message("[user] [attack_verb] the [src]!") if(material == get_material_by_name("resin")) playsound(src, 'sound/effects/attackblob.ogg', 100, 1) - else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD))) + else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD) || get_material_by_name(MAT_HARDWOOD))) playsound(src, 'sound/effects/woodcutting.ogg', 100, 1) else playsound(src, 'sound/weapons/smash.ogg', 50, 1) @@ -245,6 +245,9 @@ ..(mapload, material_name || MAT_WOOD) knock_sound = 'sound/machines/door/knock_wood.wav' +/obj/structure/simple_door/hardwood/Initialize(mapload,var/material_name) + ..(mapload, material_name || MAT_HARDWOOD) + /obj/structure/simple_door/sifwood/Initialize(mapload,var/material_name) ..(mapload, material_name || MAT_SIFWOOD) diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index f428e043c9..aa96b141a1 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -95,6 +95,9 @@ /turf/simulated/wall/wood/Initialize(mapload) . = ..(mapload, MAT_WOOD) +/turf/simulated/wall/hardwood/Initialize(mapload) + . = ..(mapload, MAT_HARDWOOD) + /turf/simulated/wall/sifwood/Initialize(mapload) . = ..(mapload, MAT_SIFWOOD) diff --git a/code/modules/materials/fifty_spawner_mats.dm b/code/modules/materials/fifty_spawner_mats.dm index 24f3985c4a..6ba191522f 100644 --- a/code/modules/materials/fifty_spawner_mats.dm +++ b/code/modules/materials/fifty_spawner_mats.dm @@ -92,6 +92,10 @@ name = "stack of alien wood" type_to_spawn = /obj/item/stack/material/wood/sif +/obj/fiftyspawner/hardwood + name = "stack of hardwood" + type_to_spawn = /obj/item/stack/material/wood/hard + /obj/fiftyspawner/log name = "stack of logs" type_to_spawn = /obj/item/stack/material/log @@ -100,6 +104,10 @@ name = "stack of alien logs" type_to_spawn = /obj/item/stack/material/log/sif +/obj/fiftyspawner/log/hard + name = "stack of hardwood logs" + type_to_spawn = /obj/item/stack/material/log/hard + /obj/fiftyspawner/cloth name = "stack of cloth" type_to_spawn = /obj/item/stack/material/cloth diff --git a/code/modules/materials/materials/organic/wood.dm b/code/modules/materials/materials/organic/wood.dm index ae368f0087..63314d0fcc 100644 --- a/code/modules/materials/materials/organic/wood.dm +++ b/code/modules/materials/materials/organic/wood.dm @@ -65,6 +65,29 @@ recipes -= r_recipe continue +/datum/material/wood/hardwood + name = MAT_HARDWOOD + stack_type = /obj/item/stack/material/wood/hard + icon_colour = "#42291a" + icon_base = "stone" + icon_reinf = "reinf_stone" + integrity = 65 //a bit stronger than regular wood + hardness = 20 + weight = 20 //likewise, heavier + +/datum/material/wood/hardwood/generate_recipes() + ..() + for(var/datum/stack_recipe/r_recipe in recipes) + if(r_recipe.title == "wood floor tile") + recipes -= r_recipe + continue + if(r_recipe.title == "wooden chair") + recipes -= r_recipe + continue + if(r_recipe.title == "wooden standup figure") + recipes -= r_recipe + continue + /datum/material/wood/log name = MAT_LOG display_name = "wood" // will lead to "wood log" @@ -87,7 +110,18 @@ icon_colour = "#0099cc" // Cyan-ish stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) stack_type = /obj/item/stack/material/log/sif +<<<<<<< HEAD +||||||| parent of b4ce0442cd... Merge pull request #11722 from KillianKirilenko/kk-misc + +======= + +/datum/material/wood/log/hard + name = MAT_HARDLOG + icon_colour = "#6f432a" + stack_type = /obj/item/stack/material/log/hard + +>>>>>>> b4ce0442cd... Merge pull request #11722 from KillianKirilenko/kk-misc //VOREStation Addition Start /datum/material/wood/stick name = "wooden stick" diff --git a/code/modules/materials/sheets/organic/wood.dm b/code/modules/materials/sheets/organic/wood.dm index c1e3c5104d..e2f3ab11f9 100644 --- a/code/modules/materials/sheets/organic/wood.dm +++ b/code/modules/materials/sheets/organic/wood.dm @@ -13,6 +13,12 @@ color = "#0099cc" default_type = MAT_SIFWOOD +/obj/item/stack/material/wood/hard + name = "hardwood plank" + color = "#42291a" + default_type = MAT_HARDWOOD + description_info = "Rich, lustrous hardwood, imported from offworld at moderate expense. Mostly used for luxurious furniture, and not very good for weapons or other structures." + /obj/item/stack/material/log name = "log" icon_state = "sheet-log" @@ -32,6 +38,12 @@ color = "#0099cc" plank_type = /obj/item/stack/material/wood/sif +/obj/item/stack/material/log/hard + name = "hardwood log" + default_type = MAT_HARDLOG + color = "#6f432a" + plank_type = /obj/item/stack/material/wood/hard + /obj/item/stack/material/log/attackby(var/obj/item/W, var/mob/user) if(!istype(W) || W.force <= 0) return ..() diff --git a/code/modules/tables/presets.dm b/code/modules/tables/presets.dm index e5ebae70fd..9e45df2117 100644 --- a/code/modules/tables/presets.dm +++ b/code/modules/tables/presets.dm @@ -75,6 +75,14 @@ reinforced = get_material_by_name(MAT_STEEL) ..() +/obj/structure/table/hardwoodtable + icon_state = "stone_preview" + color = "#42291a" + +/obj/structure/table/hardwoodtable/Initialize(mapload) + material = get_material_by_name("hardwood") + return ..() + /obj/structure/table/gamblingtable icon_state = "gamble_preview" From 4a94043fe9bac6f805529a8952e36b498258b2b5 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 30 Oct 2021 23:02:45 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- code/modules/materials/materials/organic/wood.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/materials/materials/organic/wood.dm b/code/modules/materials/materials/organic/wood.dm index 63314d0fcc..8336c31aa0 100644 --- a/code/modules/materials/materials/organic/wood.dm +++ b/code/modules/materials/materials/organic/wood.dm @@ -110,18 +110,12 @@ icon_colour = "#0099cc" // Cyan-ish stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) stack_type = /obj/item/stack/material/log/sif -<<<<<<< HEAD - -||||||| parent of b4ce0442cd... Merge pull request #11722 from KillianKirilenko/kk-misc - -======= /datum/material/wood/log/hard name = MAT_HARDLOG icon_colour = "#6f432a" stack_type = /obj/item/stack/material/log/hard ->>>>>>> b4ce0442cd... Merge pull request #11722 from KillianKirilenko/kk-misc //VOREStation Addition Start /datum/material/wood/stick name = "wooden stick"