From 8d77f5cea7877278f30056d271ed874f91232386 Mon Sep 17 00:00:00 2001 From: BlueWildrose <57083662+BlueWildrose@users.noreply.github.com> Date: Mon, 25 Sep 2023 05:12:48 -0600 Subject: [PATCH] Makes bananium, silencium actually spawnable - retypes chitin to be a material (#6018) --- citadel.dme | 1 + .../recipe/crafting_recipes/recipes_primal.dm | 2 +- .../objects/items/stacks/sheets/leather.dm | 6 ---- .../materials/definitions/crystals/diamond.dm | 2 +- .../materials/definitions/crystals/glass.dm | 2 +- .../materials/definitions/metals/copper.dm | 2 +- .../materials/definitions/metals/durasteel.dm | 2 +- .../materials/definitions/metals/gold.dm | 2 +- .../materials/definitions/metals/hydrogens.dm | 2 +- .../materials/definitions/metals/iron.dm | 2 +- .../materials/definitions/metals/lead.dm | 2 +- .../materials/definitions/metals/osmium.dm | 2 +- .../materials/definitions/metals/plasteel.dm | 2 +- .../materials/definitions/metals/platinum.dm | 2 +- .../materials/definitions/metals/silver.dm | 2 +- .../materials/definitions/metals/steel.dm | 2 +- .../materials/definitions/metals/titanium.dm | 2 +- .../materials/definitions/metals/uranium.dm | 2 +- .../materials/definitions/organic/chitin.dm | 16 +++++++++ .../definitions/special/clown_planet.dm | 35 +++++++++++++++++-- .../materials/definitions/special/morphium.dm | 2 +- .../materials/definitions/special/phoron.dm | 2 +- .../definitions/special/supermatter.dm | 2 +- .../definitions/special/valhollide.dm | 2 +- .../definitions/special/verdantium.dm | 2 +- code/modules/materials/fifty_spawner_mats.dm | 4 +++ code/modules/materials/material_sheets.dm | 13 +++---- .../simple_mob/subtypes/lavaland/gutshank.dm | 4 +-- 28 files changed, 84 insertions(+), 37 deletions(-) create mode 100644 code/modules/materials/definitions/organic/chitin.dm diff --git a/citadel.dme b/citadel.dme index a08278663641..c8e98a9627d2 100644 --- a/citadel.dme +++ b/citadel.dme @@ -3177,6 +3177,7 @@ #include "code\modules\materials\definitions\misc\snow.dm" #include "code\modules\materials\definitions\misc\wax.dm" #include "code\modules\materials\definitions\organic\bone.dm" +#include "code\modules\materials\definitions\organic\chitin.dm" #include "code\modules\materials\definitions\organic\cotton.dm" #include "code\modules\materials\definitions\organic\diona.dm" #include "code\modules\materials\definitions\organic\flesh.dm" diff --git a/code/datums/recipe/crafting_recipes/recipes_primal.dm b/code/datums/recipe/crafting_recipes/recipes_primal.dm index 38222f3a1c3d..ae5b65e479e8 100644 --- a/code/datums/recipe/crafting_recipes/recipes_primal.dm +++ b/code/datums/recipe/crafting_recipes/recipes_primal.dm @@ -396,7 +396,7 @@ result = /obj/item/saddle/stormdrifter time = 60 reqs = list(/obj/item/stack/material/bone = 10, - /obj/item/stack/chitin = 5, + /obj/item/stack/material/chitin = 5, /obj/item/stack/sinew = 10, /obj/item/stack/animalhide/goliath_hide = 5 ) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index c8140f365e02..4622ff7543b0 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -168,12 +168,6 @@ w_class = WEIGHT_CLASS_NORMAL layer = MOB_LAYER -/obj/item/stack/chitin - name = "chitin plates" - desc = "Sheets of hardened chitin, usually harvested from insectile beasts." - singular_name = "chitin plate" - icon_state = "chitin" - /obj/item/stack/wetleather name = "wet leather" desc = "This leather has been cleaned but still needs to be dried." diff --git a/code/modules/materials/definitions/crystals/diamond.dm b/code/modules/materials/definitions/crystals/diamond.dm index a191ed0afd2d..dfa966381e99 100644 --- a/code/modules/materials/definitions/crystals/diamond.dm +++ b/code/modules/materials/definitions/crystals/diamond.dm @@ -1,5 +1,5 @@ /datum/material/diamond - id = "diamond" + id = MAT_DIAMOND name = "diamond" stack_type = /obj/item/stack/material/diamond flags = MATERIAL_UNMELTABLE diff --git a/code/modules/materials/definitions/crystals/glass.dm b/code/modules/materials/definitions/crystals/glass.dm index 37002f35ede4..b1b85200d5fa 100644 --- a/code/modules/materials/definitions/crystals/glass.dm +++ b/code/modules/materials/definitions/crystals/glass.dm @@ -1,5 +1,5 @@ /datum/material/glass - id = "glass" + id = MAT_GLASS name = "glass" stack_type = /obj/item/stack/material/glass flags = MATERIAL_BRITTLE diff --git a/code/modules/materials/definitions/metals/copper.dm b/code/modules/materials/definitions/metals/copper.dm index 8f738cc6fd5f..88fa8dbc4d41 100644 --- a/code/modules/materials/definitions/metals/copper.dm +++ b/code/modules/materials/definitions/metals/copper.dm @@ -1,5 +1,5 @@ /datum/material/copper - id = "copper" + id = MAT_COPPER name = "copper" icon_colour = "#b45c13" weight = 15 diff --git a/code/modules/materials/definitions/metals/durasteel.dm b/code/modules/materials/definitions/metals/durasteel.dm index bdd38bc11c96..fe4a2949955b 100644 --- a/code/modules/materials/definitions/metals/durasteel.dm +++ b/code/modules/materials/definitions/metals/durasteel.dm @@ -1,5 +1,5 @@ /datum/material/durasteel - id = "durasteel" + id = MAT_DURASTEEL name = "durasteel" stack_type = /obj/item/stack/material/durasteel integrity = 600 diff --git a/code/modules/materials/definitions/metals/gold.dm b/code/modules/materials/definitions/metals/gold.dm index 08e0fc16bc97..549afce2029d 100644 --- a/code/modules/materials/definitions/metals/gold.dm +++ b/code/modules/materials/definitions/metals/gold.dm @@ -1,5 +1,5 @@ /datum/material/gold - id = "gold" + id = MAT_GOLD name = "gold" stack_type = /obj/item/stack/material/gold icon_colour = "#EDD12F" diff --git a/code/modules/materials/definitions/metals/hydrogens.dm b/code/modules/materials/definitions/metals/hydrogens.dm index 2b09a539f1b5..c72d58c2ff4f 100644 --- a/code/modules/materials/definitions/metals/hydrogens.dm +++ b/code/modules/materials/definitions/metals/hydrogens.dm @@ -1,6 +1,6 @@ /datum/material/mhydrogen name = "mhydrogen" - id = "mhydrogen" + id = MAT_METALHYDROGEN stack_type = /obj/item/stack/material/mhydrogen icon_colour = "#E6C5DE" stack_origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 6, TECH_MAGNET = 5) diff --git a/code/modules/materials/definitions/metals/iron.dm b/code/modules/materials/definitions/metals/iron.dm index 5848214c1a72..6d17a8b9db18 100644 --- a/code/modules/materials/definitions/metals/iron.dm +++ b/code/modules/materials/definitions/metals/iron.dm @@ -1,6 +1,6 @@ /datum/material/iron name = "iron" - id = "iron" + id = MAT_IRON stack_type = /obj/item/stack/material/iron icon_colour = "#5C5454" weight = 22 diff --git a/code/modules/materials/definitions/metals/lead.dm b/code/modules/materials/definitions/metals/lead.dm index bf0f6b4b07c2..57004b26cfde 100644 --- a/code/modules/materials/definitions/metals/lead.dm +++ b/code/modules/materials/definitions/metals/lead.dm @@ -1,6 +1,6 @@ /datum/material/lead name = MAT_LEAD - id = "lead" + id = MAT_LEAD stack_type = /obj/item/stack/material/lead icon_colour = "#273956" weight = 23 // Lead is a bit more dense than silver IRL, and silver has 22 ingame. diff --git a/code/modules/materials/definitions/metals/osmium.dm b/code/modules/materials/definitions/metals/osmium.dm index c2c9c6852d4d..492b0d0b8bd8 100644 --- a/code/modules/materials/definitions/metals/osmium.dm +++ b/code/modules/materials/definitions/metals/osmium.dm @@ -1,6 +1,6 @@ /datum/material/osmium name = "osmium" - id = "osmium" + id = MAT_OSMIUM stack_type = /obj/item/stack/material/osmium icon_colour = "#9999FF" stack_origin_tech = list(TECH_MATERIAL = 5) diff --git a/code/modules/materials/definitions/metals/plasteel.dm b/code/modules/materials/definitions/metals/plasteel.dm index 608a29e59459..f6dcf571311e 100644 --- a/code/modules/materials/definitions/metals/plasteel.dm +++ b/code/modules/materials/definitions/metals/plasteel.dm @@ -1,5 +1,5 @@ /datum/material/plasteel - id = "plasteel" + id = MAT_PLASTEEL name = "plasteel" stack_type = /obj/item/stack/material/plasteel integrity = 400 diff --git a/code/modules/materials/definitions/metals/platinum.dm b/code/modules/materials/definitions/metals/platinum.dm index b123e9ca69b3..5c92715ba9fb 100644 --- a/code/modules/materials/definitions/metals/platinum.dm +++ b/code/modules/materials/definitions/metals/platinum.dm @@ -1,6 +1,6 @@ /datum/material/platinum name = "platinum" - id = "platinum" + id = MAT_PLATINUM stack_type = /obj/item/stack/material/platinum icon_colour = "#9999FF" weight = 27 diff --git a/code/modules/materials/definitions/metals/silver.dm b/code/modules/materials/definitions/metals/silver.dm index ba102635ec4b..36cdefae938f 100644 --- a/code/modules/materials/definitions/metals/silver.dm +++ b/code/modules/materials/definitions/metals/silver.dm @@ -1,5 +1,5 @@ /datum/material/silver - id = "silver" + id = MAT_SILVER name = "silver" stack_type = /obj/item/stack/material/silver icon_colour = "#D1E6E3" diff --git a/code/modules/materials/definitions/metals/steel.dm b/code/modules/materials/definitions/metals/steel.dm index e3e49be9e326..ce79c81330b6 100644 --- a/code/modules/materials/definitions/metals/steel.dm +++ b/code/modules/materials/definitions/metals/steel.dm @@ -1,5 +1,5 @@ /datum/material/steel - id = "steel" + id = MAT_STEEL name = MAT_STEEL stack_type = /obj/item/stack/material/steel integrity = 150 diff --git a/code/modules/materials/definitions/metals/titanium.dm b/code/modules/materials/definitions/metals/titanium.dm index 12fbd2c310cc..2db7c5e15723 100644 --- a/code/modules/materials/definitions/metals/titanium.dm +++ b/code/modules/materials/definitions/metals/titanium.dm @@ -1,5 +1,5 @@ /datum/material/plasteel/titanium - id = "titanium" + id = MAT_TITANIUM name = MAT_TITANIUM stack_type = /obj/item/stack/material/titanium conductivity = 2.38 diff --git a/code/modules/materials/definitions/metals/uranium.dm b/code/modules/materials/definitions/metals/uranium.dm index 96f3680f99c0..c5f2d3890f99 100644 --- a/code/modules/materials/definitions/metals/uranium.dm +++ b/code/modules/materials/definitions/metals/uranium.dm @@ -1,5 +1,5 @@ /datum/material/uranium - id = "uranium" + id = MAT_URANIUM name = "uranium" stack_type = /obj/item/stack/material/uranium radioactivity = RAD_INTENSITY_MAT_URANIUM diff --git a/code/modules/materials/definitions/organic/chitin.dm b/code/modules/materials/definitions/organic/chitin.dm new file mode 100644 index 000000000000..526dff991a5f --- /dev/null +++ b/code/modules/materials/definitions/organic/chitin.dm @@ -0,0 +1,16 @@ +/datum/material/chitin + id = MAT_CHITIN + name = "chitin" + stack_type = /obj/item/stack/material/chitin + integrity = 150 + icon_colour = "#6b5337" + explosion_resistance = 10 + hardness = 75 //hee hoo bugblades. + weight = 15 + protectiveness = 20 + conductive = 0 + stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) + radiation_resistance = 10 //roach logic + tgui_icon_key = "greyhide" + sheet_singular_name = "plate" + sheet_plural_name = "plates" diff --git a/code/modules/materials/definitions/special/clown_planet.dm b/code/modules/materials/definitions/special/clown_planet.dm index ac9767f65969..32670c0f0754 100644 --- a/code/modules/materials/definitions/special/clown_planet.dm +++ b/code/modules/materials/definitions/special/clown_planet.dm @@ -1,13 +1,44 @@ /datum/material/bananium + id = MAT_BANANIUM + name = "bananium" + stack_type = /obj/item/stack/material/bananium + integrity = 200 + icon_colour = "#fff127" + explosion_resistance = 25 + hardness = 5 //pretty sure something rubbery isn't that sharp + weight = 30 // potent blunt weapons. + opacity = 0.8 + protectiveness = 50 // boing. + reflectivity = 0.2 // boing. + negation = 5 // boing. + conductive = 0 // described as rubbery and a good insulator + conductivity = 0 + stack_origin_tech = list(TECH_MATERIAL = 5, TECH_ILLEGAL = 3) + radiation_resistance = 20 //not as good as lead but still pretty good + tgui_icon_key = "bananium" /datum/material/bananium/generate_recipes() . = ..() . += create_stack_recipe_datum(category = "statues", name = "bananium statue", product = /obj/structure/statue/bananium, cost = 10, time = 2 SECONDS) . += create_stack_recipe_datum(category = "statues", name = "clown statue", product = /obj/structure/statue/bananium/clown, cost = 10, time = 2 SECONDS) - . += create_stack_recipe_datum(name = "bananium floor tiles", product = /obj/item/stack/tile/bananium, amount = 4) + . += create_stack_recipe_datum(name = "bananium floor tiles", cost = 1, product = /obj/item/stack/tile/bananium, amount = 4) /datum/material/silencium + id = MAT_SILENCIUM + name = "silencium" + stack_type = /obj/item/stack/material/silencium + integrity = 400 + melting_point = 12000 //described as a good heatsink + icon_colour = "#d3d3d3" + explosion_resistance = 10 //described as brittle but probably not like glass + hardness = 100 //sharp as durasteel + weight = 20 + protectiveness = 55 // described as dense and sturdy + conductivity = 30 //heatsink + stack_origin_tech = list(TECH_MATERIAL = 7, TECH_ILLEGAL = 1) + radiation_resistance = 15 + tgui_icon_key = "silencium" /datum/material/silencium/generate_recipes() . = ..() - . += create_stack_recipe_datum(name = "silencium floor tiles", product = /obj/item/stack/tile/silencium, amount = 4) + . += create_stack_recipe_datum(name = "silencium floor tiles", cost = 1, product = /obj/item/stack/tile/silencium, amount = 4) diff --git a/code/modules/materials/definitions/special/morphium.dm b/code/modules/materials/definitions/special/morphium.dm index 272598336ef7..a140969670d5 100644 --- a/code/modules/materials/definitions/special/morphium.dm +++ b/code/modules/materials/definitions/special/morphium.dm @@ -1,6 +1,6 @@ /datum/material/morphium name = MAT_MORPHIUM - id = "morphium" + id = MAT_MORPHIUM stack_type = /obj/item/stack/material/morphium icon_base = 'icons/turf/walls/metal.dmi' icon_reinf = 'icons/turf/walls/reinforced_metal.dmi' diff --git a/code/modules/materials/definitions/special/phoron.dm b/code/modules/materials/definitions/special/phoron.dm index a5139f33a073..4f2ebb26a0ef 100644 --- a/code/modules/materials/definitions/special/phoron.dm +++ b/code/modules/materials/definitions/special/phoron.dm @@ -1,5 +1,5 @@ /datum/material/phoron - id = "phoron" + id = MAT_PHORON name = "phoron" stack_type = /obj/item/stack/material/phoron ignition_point = PHORON_MINIMUM_BURN_TEMPERATURE diff --git a/code/modules/materials/definitions/special/supermatter.dm b/code/modules/materials/definitions/special/supermatter.dm index bd6a26d82466..6956b9ac26b8 100644 --- a/code/modules/materials/definitions/special/supermatter.dm +++ b/code/modules/materials/definitions/special/supermatter.dm @@ -1,5 +1,5 @@ /datum/material/supermatter - id = "supermatter" + id = MAT_SUPERMATTER name = "supermatter" icon_colour = "#FFFF00" stack_type = /obj/item/stack/material/supermatter diff --git a/code/modules/materials/definitions/special/valhollide.dm b/code/modules/materials/definitions/special/valhollide.dm index fa2f952d060f..292a1d1c8fe9 100644 --- a/code/modules/materials/definitions/special/valhollide.dm +++ b/code/modules/materials/definitions/special/valhollide.dm @@ -1,6 +1,6 @@ /datum/material/valhollide name = MAT_VALHOLLIDE - id = "valhollide" + id = MAT_VALHOLLIDE stack_type = /obj/item/stack/material/valhollide icon_base = 'icons/turf/walls/stone_wall.dmi' door_icon_base = "stone" diff --git a/code/modules/materials/definitions/special/verdantium.dm b/code/modules/materials/definitions/special/verdantium.dm index 950f74d91fc3..0308f193a98b 100644 --- a/code/modules/materials/definitions/special/verdantium.dm +++ b/code/modules/materials/definitions/special/verdantium.dm @@ -1,6 +1,6 @@ /datum/material/verdantium name = MAT_VERDANTIUM - id = "verdantium" + id = MAT_VERDANTIUM stack_type = /obj/item/stack/material/verdantium icon_base = 'icons/turf/walls/metal.dmi' icon_reinf = 'icons/turf/walls/reinforced_metal.dmi' diff --git a/code/modules/materials/fifty_spawner_mats.dm b/code/modules/materials/fifty_spawner_mats.dm index 181a5b29811f..7c17d3c3d8d0 100644 --- a/code/modules/materials/fifty_spawner_mats.dm +++ b/code/modules/materials/fifty_spawner_mats.dm @@ -172,6 +172,10 @@ name = "stack of bones" type_to_spawn = /obj/item/stack/material/bone +/obj/fiftyspawner/chitin + name = "stack of chitin" + type_to_spawn = /obj/item/stack/material/chitin + /obj/fiftyspawner/wax name = "pile of wax" type_to_spawn = /obj/item/stack/material/wax diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index e734680c57bb..7ce1eaede2bc 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -455,8 +455,9 @@ pickup_sound = 'sound/items/pickup/leather.ogg' /obj/item/stack/material/chitin - name = "chitin" - desc = "The by-product of mob grinding." + name = "chitin plates" + desc = "Sheets of hardened chitin, usually harvested from insectile beasts." + singular_name = "chitin plate" icon_state = "chitin" default_type = MAT_CHITIN no_variants = FALSE @@ -496,19 +497,19 @@ no_variants = FALSE /obj/item/stack/material/bananium - name = "bananium" + name = MAT_BANANIUM desc = "When smelted, Vaudium takes on a bright yellow hue and remains pliable, growing rigid when met with a forceful impact." icon_state = "sheet-clown" - default_type = "bananium" + default_type = MAT_BANANIUM no_variants = FALSE drop_sound = 'sound/items/drop/boots.ogg' pickup_sound = 'sound/items/pickup/boots.ogg' /obj/item/stack/material/silencium - name = "silencium" + name = MAT_SILENCIUM desc = "When compressed, Vaudium loses its color, gaining distinctive black bands and becoming intensely rigid." icon_state = "sheet-mime" - default_type = "silencium" + default_type = MAT_SILENCIUM no_variants = FALSE drop_sound = 'sound/items/drop/boots.ogg' pickup_sound = 'sound/items/drop/boots.ogg' diff --git a/code/modules/mob/living/simple_mob/subtypes/lavaland/gutshank.dm b/code/modules/mob/living/simple_mob/subtypes/lavaland/gutshank.dm index c5abbdf563cc..3798e02735de 100644 --- a/code/modules/mob/living/simple_mob/subtypes/lavaland/gutshank.dm +++ b/code/modules/mob/living/simple_mob/subtypes/lavaland/gutshank.dm @@ -63,7 +63,7 @@ attacktext = list ("bitten", "pierced", "mauled") attack_sound = 'sound/weapons/bite.ogg' - bone_type = /obj/item/stack/chitin + bone_type = /obj/item/stack/material/chitin bone_amount = 5 faction = "lavaland" @@ -184,7 +184,7 @@ attacktext = list ("bitten", "pierced", "mauled") attack_sound = 'sound/weapons/bite.ogg' - bone_type = /obj/item/stack/chitin + bone_type = /obj/item/stack/material/chitin bone_amount = 5 faction = "lavaland"