From a43db14e519324f7528c37a2c7a33d52380da230 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Tue, 5 Sep 2023 17:52:02 +0100 Subject: [PATCH 1/2] wall/table icon_base split --- code/modules/materials/materials/_materials.dm | 3 ++- code/modules/materials/materials/alien_alloy.dm | 3 +++ code/modules/materials/materials/cult.dm | 1 + code/modules/materials/materials/gems.dm | 15 +++++++++++++++ code/modules/materials/materials/metals/hull.dm | 5 +++++ .../modules/materials/materials/metals/hull_vr.dm | 2 ++ code/modules/materials/materials/metals/metals.dm | 12 ++++++++++++ .../materials/materials/metals/plasteel.dm | 1 + code/modules/materials/materials/metals/steel.dm | 5 +++-- code/modules/materials/materials/organic/resin.dm | 1 + code/modules/materials/materials/organic/wood.dm | 1 + code/modules/materials/materials/snow.dm | 1 + code/modules/materials/materials/stone.dm | 1 + code/modules/materials/sheets/metals/hull.dm | 1 + code/modules/tables/tables.dm | 4 ++-- 15 files changed, 51 insertions(+), 5 deletions(-) diff --git a/code/modules/materials/materials/_materials.dm b/code/modules/materials/materials/_materials.dm index 6ce2fab16cb..fba60dda059 100644 --- a/code/modules/materials/materials/_materials.dm +++ b/code/modules/materials/materials/_materials.dm @@ -188,8 +188,9 @@ var/list/name_to_material // Icons var/icon_colour // Colour applied to products of this material. - var/icon_base = "metal" // Wall and table base icon tag. See header. + var/icon_base = "metal" // Wall base icon tag. See header. var/door_icon_base = "metal" // Door base icon tag. See header. + var/table_icon_base = "metal" // Table base icon tag. See header. var/icon_reinf = "reinf_metal" // Overlay used var/list/stack_origin_tech = list(TECH_MATERIAL = 1) // Research level for stacks. var/pass_stack_colors = FALSE // Will stacks made from this material pass their colors onto objects? diff --git a/code/modules/materials/materials/alien_alloy.dm b/code/modules/materials/materials/alien_alloy.dm index 741f0275b75..55ee5880796 100644 --- a/code/modules/materials/materials/alien_alloy.dm +++ b/code/modules/materials/materials/alien_alloy.dm @@ -21,16 +21,19 @@ name = "dungeonium" display_name = "ultra-durable" icon_base = "dungeon" + table_icon_base = "stone" icon_colour = "#FFFFFF" /datum/material/alienalloy/bedrock name = "bedrock" display_name = "impassable rock" icon_base = "rock" + table_icon_base = "stone" icon_colour = "#FFFFFF" /datum/material/alienalloy/alium name = "alium" display_name = "alien" icon_base = "alien" + table_icon_base = "stone" icon_colour = "#FFFFFF" \ No newline at end of file diff --git a/code/modules/materials/materials/cult.dm b/code/modules/materials/materials/cult.dm index 7d8d4be9f2f..d1b497a708b 100644 --- a/code/modules/materials/materials/cult.dm +++ b/code/modules/materials/materials/cult.dm @@ -2,6 +2,7 @@ name = "cult" display_name = "disturbing stone" icon_base = "cult" + table_icon_base = "stone" icon_colour = "#402821" icon_reinf = "reinf_cult" shard_type = SHARD_STONE_PIECE diff --git a/code/modules/materials/materials/gems.dm b/code/modules/materials/materials/gems.dm index e807f682aeb..18db67f4934 100644 --- a/code/modules/materials/materials/gems.dm +++ b/code/modules/materials/materials/gems.dm @@ -3,6 +3,7 @@ stack_type = /obj/item/stack/material/phoron ignition_point = PHORON_MINIMUM_BURN_TEMPERATURE icon_base = "stone" + table_icon_base = "stone" icon_colour = "#FC2BC5" shard_type = SHARD_SHARD hardness = 30 @@ -44,6 +45,8 @@ hardness = 100 stack_origin_tech = list(TECH_MATERIAL = 6) supply_conversion_value = 8 + icon_base = "stone" + table_icon_base = "stone" /datum/material/quartz name = MAT_QUARTZ @@ -55,6 +58,8 @@ sheet_singular_name = "crystal" sheet_plural_name = "crystals" supply_conversion_value = 4 + icon_base = "stone" + table_icon_base = "stone" /datum/material/painite name = MAT_PAINITE @@ -68,6 +73,8 @@ sheet_singular_name = "gem" sheet_plural_name = "gems" supply_conversion_value = 4 + icon_base = "stone" + table_icon_base = "stone" /datum/material/void_opal name = MAT_VOPAL @@ -86,6 +93,8 @@ sheet_singular_name = "gem" sheet_plural_name = "gems" supply_conversion_value = 30 // These are hilariously rare. + icon_base = "stone" + table_icon_base = "stone" // Particle Smasher and other exotic materials. /datum/material/valhollide @@ -108,6 +117,8 @@ stack_origin_tech = list(TECH_MATERIAL = 7, TECH_PHORON = 5, TECH_BLUESPACE = 5) sheet_singular_name = "gem" sheet_plural_name = "gems" + icon_base = "stone" + table_icon_base = "stone" /datum/material/verdantium name = MAT_VERDANTIUM @@ -129,6 +140,8 @@ sheet_singular_name = "sheet" sheet_plural_name = "sheets" supply_conversion_value = 8 + icon_base = "stone" + table_icon_base = "stone" /datum/material/morphium name = MAT_MORPHIUM @@ -150,5 +163,7 @@ radiation_resistance = 10 stack_origin_tech = list(TECH_MATERIAL = 8, TECH_PHORON = 4, TECH_BLUESPACE = 4) supply_conversion_value = 13 + icon_base = "stone" + table_icon_base = "stone" diff --git a/code/modules/materials/materials/metals/hull.dm b/code/modules/materials/materials/metals/hull.dm index 24a03fa07d4..00e38657a30 100644 --- a/code/modules/materials/materials/metals/hull.dm +++ b/code/modules/materials/materials/metals/hull.dm @@ -4,6 +4,7 @@ integrity = 250 explosion_resistance = 10 icon_base = "hull" + table_icon_base = "stone" icon_reinf = "reinf_mesh" icon_colour = "#666677" flags = MATERIAL_UNMELTABLE @@ -17,6 +18,7 @@ stack_type = /obj/item/stack/material/plasteel/hull integrity = 600 icon_base = "hull" + table_icon_base = "stone" icon_reinf = "reinf_mesh" icon_colour = "#777788" explosion_resistance = 40 @@ -30,6 +32,7 @@ name = MAT_DURASTEELHULL stack_type = /obj/item/stack/material/durasteel/hull icon_base = "hull" + table_icon_base = "stone" icon_reinf = "reinf_mesh" icon_colour = "#45829a" explosion_resistance = 90 @@ -44,6 +47,7 @@ name = MAT_TITANIUMHULL stack_type = /obj/item/stack/material/titanium/hull icon_base = "hull" + table_icon_base = "stone" icon_reinf = "reinf_mesh" flags = MATERIAL_UNMELTABLE composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT) @@ -55,6 +59,7 @@ name = MAT_MORPHIUMHULL stack_type = /obj/item/stack/material/morphium/hull icon_base = "hull" + table_icon_base = "stone" icon_reinf = "reinf_mesh" flags = MATERIAL_UNMELTABLE composite_material = list(MAT_MORPHIUM = SHEET_MATERIAL_AMOUNT) diff --git a/code/modules/materials/materials/metals/hull_vr.dm b/code/modules/materials/materials/metals/hull_vr.dm index 8a7ebb22f35..e0dada40cce 100644 --- a/code/modules/materials/materials/metals/hull_vr.dm +++ b/code/modules/materials/materials/metals/hull_vr.dm @@ -2,6 +2,7 @@ name = MAT_PLASTITANIUMHULL stack_type = /obj/item/stack/material/plastitanium/hull icon_base = "hull" + table_icon_base = "stone" icon_reinf = "reinf_mesh" icon_colour = "#585658" explosion_resistance = 50 @@ -14,6 +15,7 @@ name = MAT_GOLDHULL stack_type = /obj/item/stack/material/gold/hull icon_base = "hull" + table_icon_base = "stone" icon_reinf = "reinf_mesh" explosion_resistance = 50 composite_material = list(MAT_GOLD = SHEET_MATERIAL_AMOUNT) diff --git a/code/modules/materials/materials/metals/metals.dm b/code/modules/materials/materials/metals/metals.dm index 4dd8a6a9847..fae037a6201 100644 --- a/code/modules/materials/materials/metals/metals.dm +++ b/code/modules/materials/materials/metals/metals.dm @@ -19,6 +19,12 @@ stack_origin_tech = list(TECH_MATERIAL = 8) supply_conversion_value = 9 +/datum/material/durasteel/generate_recipes() + ..() + recipes += list( + new /datum/stack_recipe("durasteel hull sheet", /obj/item/stack/material/durasteel/hull, 2, 1, 5, time = 20, one_per_turf = 0, on_floor = 1, recycle_material = "[name]") + ) + /datum/material/titanium name = MAT_TITANIUM stack_type = /obj/item/stack/material/titanium @@ -28,6 +34,12 @@ icon_colour = "#D1E6E3" icon_reinf = "reinf_metal" +/datum/material/titanium/generate_recipes() + ..() + recipes += list( + new /datum/stack_recipe("titanium hull sheet", /obj/item/stack/material/titanium/hull, 2, 1, 5, time = 20, one_per_turf = 0, on_floor = 1, recycle_material = "[name]") + ) + /datum/material/iron name = "iron" stack_type = /obj/item/stack/material/iron diff --git a/code/modules/materials/materials/metals/plasteel.dm b/code/modules/materials/materials/metals/plasteel.dm index 315b897e59d..fa9e271521e 100644 --- a/code/modules/materials/materials/metals/plasteel.dm +++ b/code/modules/materials/materials/metals/plasteel.dm @@ -24,6 +24,7 @@ new /datum/stack_recipe("roller bed", /obj/item/roller, 5, time = 30, on_floor = 1, recycle_material = "[name]"), new /datum/stack_recipe("whetstone", /obj/item/weapon/whetstone, 2, time = 10, recycle_material = "[name]"), new /datum/stack_recipe("plasteel rebar", /obj/item/stack/material/plasteel/rebar, 1, time = 5, recycle_material = "[name]"), + new /datum/stack_recipe("plasteel hull sheet", /obj/item/stack/material/plasteel/hull, 2, 1, 5, time = 20, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"), new /datum/stack_recipe_list("reinforced low walls",list( new /datum/stack_recipe("reinforced low wall (bay style)", /obj/structure/low_wall/bay/reinforced, 3, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", recycle_material = "[name]"), new /datum/stack_recipe("reinforced low wall (eris style)", /obj/structure/low_wall/eris/reinforced, 3, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", recycle_material = "[name]") diff --git a/code/modules/materials/materials/metals/steel.dm b/code/modules/materials/materials/metals/steel.dm index ff21681b72b..e2977178417 100644 --- a/code/modules/materials/materials/metals/steel.dm +++ b/code/modules/materials/materials/metals/steel.dm @@ -103,7 +103,7 @@ new /datum/stack_recipe("cyan corner tile", /obj/item/stack/tile/floor/eris/steel/cyancorner, 1, 4, 20, recycle_material = "[name]"), new /datum/stack_recipe("violet corner tile", /obj/item/stack/tile/floor/eris/steel/violetcorener, 1, 4, 20, recycle_material = "[name]"), )), - + )), //Eris Floor tiles- Dark new /datum/stack_recipe_list("eris floors-dark", list( @@ -145,5 +145,6 @@ new /datum/stack_recipe("big floor lamp fixture frame", /obj/machinery/light_construct/bigfloorlamp, 3, recycle_material = "[name]"), new /datum/stack_recipe("apc frame", /obj/item/frame/apc, 2, recycle_material = "[name]"), new /datum/stack_recipe("desk bell", /obj/item/weapon/deskbell, 1, on_floor = 1, supplied_material = "[name]"), - new /datum/stack_recipe("tanning rack", /obj/structure/tanning_rack, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]") + new /datum/stack_recipe("tanning rack", /obj/structure/tanning_rack, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]"), + new /datum/stack_recipe("steel hull sheet", /obj/item/stack/material/steel/hull, 2, 1, 5, time = 20, one_per_turf = 0, on_floor = 1, recycle_material = "[name]") ) diff --git a/code/modules/materials/materials/organic/resin.dm b/code/modules/materials/materials/organic/resin.dm index a1d66e4eb0a..5d46999c29c 100644 --- a/code/modules/materials/materials/organic/resin.dm +++ b/code/modules/materials/materials/organic/resin.dm @@ -2,6 +2,7 @@ name = "resin" icon_colour = "#35343a" icon_base = "resin" + table_icon_base = "stone" dooropen_noise = 'sound/effects/attackblob.ogg' door_icon_base = "resin" icon_reinf = "reinf_mesh" diff --git a/code/modules/materials/materials/organic/wood.dm b/code/modules/materials/materials/organic/wood.dm index 954d206281e..4564d654630 100644 --- a/code/modules/materials/materials/organic/wood.dm +++ b/code/modules/materials/materials/organic/wood.dm @@ -71,6 +71,7 @@ stack_type = /obj/item/stack/material/wood/hard icon_colour = "#42291a" icon_base = "stone" + table_icon_base = "stone" icon_reinf = "reinf_stone" integrity = 65 //a bit stronger than regular wood hardness = 20 diff --git a/code/modules/materials/materials/snow.dm b/code/modules/materials/materials/snow.dm index bd535798118..f93941335e2 100644 --- a/code/modules/materials/materials/snow.dm +++ b/code/modules/materials/materials/snow.dm @@ -30,6 +30,7 @@ flags = MATERIAL_BRITTLE stack_type = /obj/item/stack/material/snowbrick icon_base = "stone" + table_icon_base = "stone" icon_reinf = "reinf_stone" icon_colour = "#D8FDFF" integrity = 50 diff --git a/code/modules/materials/materials/stone.dm b/code/modules/materials/materials/stone.dm index 486d812c877..0a6a2511677 100644 --- a/code/modules/materials/materials/stone.dm +++ b/code/modules/materials/materials/stone.dm @@ -2,6 +2,7 @@ name = "sandstone" stack_type = /obj/item/stack/material/sandstone icon_base = "stone" + table_icon_base = "stone" icon_reinf = "reinf_stone" icon_colour = "#D9C179" shard_type = SHARD_STONE_PIECE diff --git a/code/modules/materials/sheets/metals/hull.dm b/code/modules/materials/sheets/metals/hull.dm index 5a6d429f448..1565e5f76e4 100644 --- a/code/modules/materials/sheets/metals/hull.dm +++ b/code/modules/materials/sheets/metals/hull.dm @@ -8,6 +8,7 @@ /obj/item/stack/material/durasteel/hull name = MAT_DURASTEELHULL + default_type = MAT_DURASTEELHULL /obj/item/stack/material/titanium/hull name = MAT_TITANIUMHULL diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index 3e682a518d3..62d089c0377 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -366,7 +366,7 @@ var/list/table_icon_cache = list() if(material) for(var/i = 1 to 4) var/connect = connections?[i] || 0 - var/image/I = get_table_image(icon, "[material.icon_base]_[connect]", 1<<(i-1), material.icon_colour, 255 * material.opacity) + var/image/I = get_table_image(icon, "[material.table_icon_base]_[connect]", 1<<(i-1), material.icon_colour, 255 * material.opacity) add_overlay(I) // Reinforcements @@ -400,7 +400,7 @@ var/list/table_icon_cache = list() icon_state = "flip[type]" if(material) - var/image/I = image(icon, "[material.icon_base]_flip[type]") + var/image/I = image(icon, "[material.table_icon_base]_flip[type]") I.color = material.icon_colour I.alpha = 255 * material.opacity add_overlay(I) From 1eea78cce7c3f570edb21d8e02e08456f247ee6f Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Tue, 5 Sep 2023 20:58:38 +0100 Subject: [PATCH 2/2] wall/table icon_base split couple of missing/incorrect things --- code/modules/materials/materials/alien_alloy.dm | 3 ++- code/modules/materials/materials/other_vr.dm | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/materials/materials/alien_alloy.dm b/code/modules/materials/materials/alien_alloy.dm index 55ee5880796..d7f76b7e60e 100644 --- a/code/modules/materials/materials/alien_alloy.dm +++ b/code/modules/materials/materials/alien_alloy.dm @@ -15,6 +15,7 @@ /datum/material/alienalloy/elevatorium name = "elevatorium" display_name = "elevator panelling" + table_icon_base = "stone" icon_colour = "#666666" /datum/material/alienalloy/dungeonium @@ -35,5 +36,5 @@ name = "alium" display_name = "alien" icon_base = "alien" - table_icon_base = "stone" + table_icon_base = "alien" icon_colour = "#FFFFFF" \ No newline at end of file diff --git a/code/modules/materials/materials/other_vr.dm b/code/modules/materials/materials/other_vr.dm index d54dd4f726e..14f1dd7a101 100644 --- a/code/modules/materials/materials/other_vr.dm +++ b/code/modules/materials/materials/other_vr.dm @@ -23,10 +23,12 @@ name = "darkglass" display_name = "darkglass" icon_base = "darkglass" + table_icon_base = "darkglass" icon_colour = "#FFFFFF" /datum/material/fancyblack name = "fancyblack" display_name = "fancyblack" icon_base = "fancyblack" + table_icon_base = "fancyblack" icon_colour = "#FFFFFF"