diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 646b1567ccc..d995a5b5015 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -1,19 +1,18 @@ -/* Glass stack types - * Contains: - * Glass sheets - * Reinforced glass sheets - * Glass shards - TODO: Move this into code/game/object/item/weapons - * Plasma Glass Sheets - * Reinforced Plasma Glass Sheets (AKA Holy fuck strong windows) +/* CONTENTS: + * 1. GLASS + * 2. REINFORCED GLASS + * 3. PLASMA GLASS + * 4. REINFORCED PLASMA GLASS + * 5. TITANIUM GLASS + * 6. PLASTITANIUM GLASS Todo: Create a unified construct_window(sheet, user, created_window, full_window) */ -/* - * Glass sheets - */ - +////////////////////////////// +// MARK: GLASS +////////////////////////////// GLOBAL_LIST_INIT(glass_recipes, list ( new /datum/stack_recipe("glass shard", /obj/item/shard, time = 0 SECONDS), new /datum/stack_recipe/window("directional window", /obj/structure/window/basic, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), @@ -91,11 +90,9 @@ GLOBAL_LIST_INIT(glass_recipes, list ( else return ..() - -/* - * Reinforced glass sheets - */ - +////////////////////////////// +// MARK: REINFORCED GLASS +////////////////////////////// GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( new /datum/stack_recipe("glass shard", /obj/item/shard, time = 0 SECONDS), new /datum/stack_recipe/window("windoor frame", /obj/structure/windoor_assembly, 5, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), @@ -122,6 +119,10 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( point_value = 4 table_type = /obj/structure/table/glass/reinforced +/obj/item/stack/sheet/rglass/examine(mob/user) + . = ..() + . += "Reinforced glass is much stronger against damage than normal glass, otherwise it functions like normal glass does." + /obj/item/stack/sheet/rglass/fifty amount = 50 @@ -129,10 +130,6 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( recipes = GLOB.reinforced_glass_recipes ..() -/obj/item/stack/sheet/rglass/examine(mob/user) - . = ..() - . += "Reinforced glass is much stronger against damage than normal glass, otherwise it functions like normal glass does." - GLOBAL_LIST_INIT(pglass_recipes, list ( new /datum/stack_recipe("plasma shard", /obj/item/shard/plasma, time = 0 SECONDS), new /datum/stack_recipe/window("directional window", /obj/structure/window/plasmabasic, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), @@ -153,6 +150,9 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( /obj/item/stack/sheet/rglass/cyborg/drone energy_type = /datum/robot_storage/energy/rglass +////////////////////////////// +// MARK: PLASMA GLASS +////////////////////////////// /obj/item/stack/sheet/plasmaglass name = "plasma glass" desc = "A very strong and very resistant sheet of a plasma-glass alloy." @@ -168,6 +168,16 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( point_value = 19 table_type = /obj/structure/table/glass/plasma +/obj/item/stack/sheet/plasmaglass/examine_more(mob/user) + . = ..() + . += "A mixture of silica glass and plasma. The plasma forces the normally amorphous glass to assume a regular crystal structure. The plasma encourges heavy cross-linking, \ + massively improving the strength of the glass whilst also giving it exceptional thermal resistance. The denser molecular structure is also better at blocking radiation." + . += "" + . += "Unlike metal alloys incorporating plasma, plasma glass is not common - the secrets of producing it are a closely guarded trade secret of Nanotrasen, \ + very demanding conditions are required to correctly combine plasma and silica, and without this knowledge the process is fraught with great risk of igniting the plasma and (at best) destroying the production equipment." + . += "" + . += "Despite plastitanium glass being a structurally more robust material, pure plasma glass has some unique properties that Nanotrasen exploits in some of its experimental energy weapons, such as the immolator laser." + /obj/item/stack/sheet/plasmaglass/fifty amount = 50 @@ -191,9 +201,9 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( else return ..() -/* - * Reinforced plasma glass sheets - */ +////////////////////////////// +// MARK: REINFORCED PLASMA GLASS +////////////////////////////// GLOBAL_LIST_INIT(prglass_recipes, list ( new /datum/stack_recipe("plasma shard", /obj/item/shard/plasma, time = 0 SECONDS), @@ -216,6 +226,16 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( point_value = 23 table_type = /obj/structure/table/glass/reinforced/plasma +/obj/item/stack/sheet/plasmarglass/examine_more(mob/user) + . = ..() + . += "A mixture of silica glass and plasma. The plasma forces the normally amorphous glass to assume a regular crystal structure. The plasma encourges heavy cross-linking, \ + massively improving the strength of the glass whilst also giving it exceptional thermal resistance. The denser molecular structure is also better at blocking radiation." + . += "" + . += "Unlike metal alloys incorporating plasma, plasma glass is not common - the secrets of producing it are a closely guarded trade secret of Nanotrasen, \ + very demanding conditions are required to correctly combine plasma and silica, and without this knowledge the process is fraught with great risk of igniting the plasma and (at best) destroying the production equipment." + . += "" + . += "Despite plastitanium glass being a structurally more robust material, pure plasma glass has some unique properties that Nanotrasen exploits in some of its experimental energy weapons, such as the immolator laser." + /obj/item/stack/sheet/plasmarglass/fifty amount = 50 @@ -227,9 +247,12 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list( new /datum/stack_recipe/window("shuttle window", /obj/structure/window/full/shuttle, 2, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE) )) +////////////////////////////// +// MARK: TITANIUM GLASS +////////////////////////////// /obj/item/stack/sheet/titaniumglass name = "titanium glass" - desc = "A glass sheet made out of a titanium-silicate alloy." + desc = "A glass sheet made out of a titanium-silicate mixture." singular_name = "titanium glass sheet" icon_state = "sheet-titaniumglass" item_state = "sheet-titaniumglass" @@ -240,6 +263,12 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list( full_window = /obj/structure/window/full/shuttle table_type = /obj/structure/table/glass/reinforced/titanium +/obj/item/stack/sheet/titaniumglass/examine_more(mob/user) + . = ..() + . += "Titanium-silicate mixes are an old but highly effective technology that produce a relatively lightweight, very strong glass that can withstand a good amount of punishment." + . += "" + . += "It is extensively used in the production of starship viewports and transparent armour, and is notably used extensively in space station construction by the USSP." + /obj/item/stack/sheet/titaniumglass/fifty amount = 50 @@ -251,9 +280,12 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( new /datum/stack_recipe/window("plastitanium window", /obj/structure/window/full/plastitanium, 2, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE) )) +////////////////////////////// +// MARK: PLASTITANIUM GLASS +////////////////////////////// /obj/item/stack/sheet/plastitaniumglass name = "plastitanium glass" - desc = "A glass sheet made out of a plasma-titanium-silicate alloy." + desc = "A glass sheet made out of a plasma-titanium-silica mixture." singular_name = "plastitanium glass sheet" icon_state = "sheet-plastitaniumglass" item_state = "sheet-plastitaniumglass" @@ -264,6 +296,13 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( full_window = /obj/structure/window/full/plastitanium table_type = /obj/structure/table/glass/reinforced/plastitanium +/obj/item/stack/sheet/plasmaglass/examine_more(mob/user) + . = ..() + . += "A mixture of silica glass, and plastitanium. It boasts similar material properties to plastitanium whilst also being optically transparent." + . += "" + . += "Unlike regular plasma glass, the production process of plastitanium glass is relatively safer and better known, as the titanium helps to control the plasma's reactivity whilst it is being mixed with the silica. \ + It is extensively employed for military-grade transparent armour and optics." + /obj/item/stack/sheet/plastitaniumglass/fifty amount = 50 diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index a86d7010775..54833711070 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -177,6 +177,7 @@ GLOBAL_LIST_INIT(snow_recipes, list( /obj/item/stack/sheet/mineral/sandbags name = "sandbags" + desc = "Cloth bags full of sand. They can be used to construct robust defensive emplacements that block movement and provide protection from gunfire." icon = 'icons/obj/stacks/miscellaneous.dmi' icon_state = "sandbags" singular_name = "sandbag" @@ -193,7 +194,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( /obj/item/emptysandbag name = "empty sandbag" - desc = "A bag to be filled with sand." + desc = "A cloth bag to be filled with sand." icon = 'icons/obj/stacks/miscellaneous.dmi' icon_state = "empty-sandbags" w_class = WEIGHT_CLASS_TINY @@ -212,6 +213,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( /obj/item/stack/sheet/mineral/diamond name = "diamond" + desc = "Sparkles like a twinkling star." icon_state = "sheet-diamond" item_state = "sheet-diamond" singular_name = "diamond" @@ -221,6 +223,13 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( materials = list(MAT_DIAMOND = MINERAL_MATERIAL_AMOUNT) point_value = 25 +/obj/item/stack/sheet/mineral/diamond/examine_more(mob/user) + . = ..() + . += "Diamond is the hardest known material, made of elemental carbon arranged in a tightly packed cubic crystal structure. \ + It has excellent thermal conductivity, a high refractive index, and is widely seen as very pretty to look at." + . += "" + . += "Diamond is highly sought after for both aesthetic uses and as a component of many advanced technologies." + /obj/item/stack/sheet/mineral/diamond/New() ..() recipes = GLOB.diamond_recipes @@ -230,6 +239,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( /obj/item/stack/sheet/mineral/uranium name = "uranium" + desc = "Don't keep this stuff in your pocket for too long. Hell, don't keep it anywhere near your person for too long." icon_state = "sheet-uranium" item_state = "sheet-uranium" singular_name = "uranium sheet" @@ -239,6 +249,12 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( materials = list(MAT_URANIUM = MINERAL_MATERIAL_AMOUNT) point_value = 20 +/obj/item/stack/sheet/mineral/uranium/examine_more(mob/user) + . = ..() + . += "Uranium is extremely dense, radioactive metal. Without undergoing complex enrichment processes, it consists of roughly 99% uranium-238, and roughly 1% fissile uranium-235." + . += "" + . += "It finds uses in a great number of applications, including medicine, nuclear power generation, radiation shielding, cybernetic and robotic components, as well as weapons." + /obj/item/stack/sheet/mineral/uranium/fifty amount = 50 @@ -248,6 +264,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( /obj/item/stack/sheet/mineral/plasma name = "solid plasma" + desc = "Beautiful pure purple crystals, ready to ignite if a naked flame touches them..." icon_state = "sheet-plasma" item_state = "sheet-plasma" singular_name = "plasma sheet" @@ -259,6 +276,18 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( max_integrity = 100 point_value = 20 +/obj/item/stack/sheet/mineral/plasma/examine_more(mob/user) + . = ..() + . += "Plasma, the new oil. A highly sought-after material, and what propelled Nanotrasen from being a small, relatively unknown company to the interstellar megacorporation it is today." + . += "" + . += "Plasma is a metastable exotic matter, capable of existing in all 3 basic states of matter across a wide range of tempratures and pressures. It is widely used as starship fuel for both conventional engines and \ + Faster-Than-Light drives. It is also used in the creation of several classes of high-performance supermaterials and other advanced technologies. New uses for this wonder material are constantly being researched." + . += "" + . += "Its high flammability makes it very dangerous to handle, and it is also toxic and carcinogenic to most species. Veteran miners often begin to suffer from health problems caused by chronic exposure to plasma dust." + . += "" + . += "Despite its flammability, plasma-enhanced materials such as plasteel or plasma glass generally possess extreme fire resistance, ultra-low thermal conductivity, and a high emissivity. \ + This allows, for example, a relatively thin pane of plasma glass to be cool to the touch even when a massive inferno is bruning on the other side." + /obj/item/stack/sheet/mineral/plasma/New() ..() recipes = GLOB.plasma_recipes @@ -292,6 +321,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( /obj/item/stack/sheet/mineral/gold name = "gold" + desc = "GOLD!" icon_state = "sheet-gold" item_state = "sheet-gold" singular_name = "gold bar" @@ -301,6 +331,13 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( materials = list(MAT_GOLD = MINERAL_MATERIAL_AMOUNT) point_value = 20 +/obj/item/stack/sheet/mineral/gold/examine_more(mob/user) + . = ..() + . += "A dense, soft, yellow precious metal that has been sought after by many species since before they recorded history as a symbol of wealth. \ + It has an exceptionally low reactivity and excellent corrosion resistance, being the most noble of the metallic elements." + . += "" + . += "It is widely used in the production of advanced electronics and chemical catalysts, as well as a few specialised medicines. Also used as a relatively safe store of wealth that is not affected by the economics of cash." + /obj/item/stack/sheet/mineral/gold/fifty amount = 50 @@ -310,6 +347,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( /obj/item/stack/sheet/mineral/silver name = "silver" + desc = "Shiny as a mirror. Allegedly repels werewolves and other mythical creatures." icon_state = "sheet-silver" item_state = "sheet-silver" singular_name = "silver bar" @@ -319,6 +357,13 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( materials = list(MAT_SILVER = MINERAL_MATERIAL_AMOUNT) point_value = 20 +/obj/item/stack/sheet/mineral/silver/examine_more(mob/user) + . = ..() + . += "A shiny grey precious metal that has been sought after by many species since before they recorded history as a symbol of wealth. \ + It has very high thermal and electrical conductivity, and exhibits antimicrobial properties." + . += "" + . += "It is widely used in the production of advanced electronics, chemical catalysts, medicines, and some high performance materials." + /obj/item/stack/sheet/mineral/silver/fifty amount = 50 @@ -328,6 +373,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( /obj/item/stack/sheet/mineral/bananium name = "bananium" + desc = "It looks, smells, and tastes like real bananas. You'll break your teeth if you try to bite down on it, though." icon_state = "sheet-bananium" item_state = "sheet-clown" singular_name = "bananium sheet" @@ -337,6 +383,13 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( materials = list(MAT_BANANIUM = MINERAL_MATERIAL_AMOUNT) point_value = 50 +/obj/item/stack/sheet/mineral/bananium/examine_more(mob/user) + . = ..() + . += "Bananium. An extremely rare crystalline material of unknown origin. Various theories of where it originates have been proposed, usually with no evidence to support them. \ + It makes a squeaking sound when something compresses it." + . += "" + . += "It is sought after by clowns all across the known galaxy and is used in the creation of many clownish contraptions." + /obj/item/stack/sheet/mineral/bananium/ten amount = 10 @@ -349,6 +402,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( /obj/item/stack/sheet/mineral/tranquillite name = "tranquillite" + desc = "..." icon_state = "sheet-tranquillite" item_state = "sheet-mime" singular_name = "beret" @@ -359,6 +413,14 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( wall_allowed = FALSE //no tranquilite walls in code point_value = 50 +/obj/item/stack/sheet/mineral/tranquillite/examine_more(mob/user) + ..() + . += "Tranquilite. An extremely rare crystalline material of unknown origin. Various theories of where it originates have been proposed, usually with no evidence to support them. \ + Uniquely, it makes no sounds when bent, broken, smashed, or otherwise manipulated in any way, remaining deathly silent at all times. \ + It also dampens sounds around it, and can become completely transparent when properly manipulated." + . += "" + . += "It is sought after by mimes all across the known galaxy and is used in the creation of many of their mysterious contraptions. Various other groups also express an interest in its unusual properites." + /obj/item/stack/sheet/mineral/tranquillite/ten amount = 10 @@ -374,6 +436,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( */ /obj/item/stack/sheet/mineral/titanium name = "titanium" + desc = "It feels much lighter than it looks." icon_state = "sheet-titanium" item_state = "sheet-titanium" singular_name = "titanium sheet" @@ -387,6 +450,13 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT) point_value = 20 +/obj/item/stack/sheet/mineral/titanium/examine_more(mob/user) + . = ..() + . += "A strong, lightweight metal. Titanium has a strength similar to most steel alloys despite being about 45% less dense, whilst also exhibiting superior corrosion resistance. \ + It is also very good at reflecting energy weapon attacks. Careful where you fire that laser gun!" + . += "" + . += "It is widely used in robotics, aerospace applications, and in starship construction thanks to its excellent strength-to-weight ratio. Notably, it is also extensively used in space station construction by the USSP." + GLOBAL_LIST_INIT(titanium_recipes, list( new /datum/stack_recipe("titanium airlock assembly", /obj/structure/door_assembly/door_assembly_titanium, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE), null, @@ -407,6 +477,7 @@ GLOBAL_LIST_INIT(titanium_recipes, list( */ /obj/item/stack/sheet/mineral/plastitanium name = "plastitanium" + desc = "Just as light as normal titanium, but you can feel an aura of extra robustness about it." icon_state = "sheet-plastitanium" item_state = "sheet-plastitanium" singular_name = "plastitanium sheet" @@ -420,6 +491,12 @@ GLOBAL_LIST_INIT(titanium_recipes, list( materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT) point_value = 45 +/obj/item/stack/sheet/mineral/plastitanium/examine_more(mob/user) + . = ..() + . += "A high-performance superalloy of plasma and titanium, plastitanium is exceptionally light and strong, and has excellent thermal and corrosion resistance." + . += "" + . += "It is used in the construction of military-grade starship hulls, top-of-the-line personal armour, and melee weaponry." + /obj/item/stack/sheet/mineral/plastitanium/fifty amount = 50 @@ -438,6 +515,7 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list( //Alien Alloy /obj/item/stack/sheet/mineral/abductor name = "alien alloy" + desc = "The dizzying colours change constantly depending on how the light hits it." icon = 'icons/obj/abductor.dmi' icon_state = "sheet-abductor" item_state = "sheet-abductor" @@ -452,6 +530,10 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list( merge_type = /obj/item/stack/sheet/mineral/abductor table_type = /obj/structure/table/abductor +/obj/item/stack/sheet/mineral/abductor/examine_more(mob/user) + . = ..() + . += "An out-of-this-world material used in the construction of exceptionally advanced technologies. Known to be associated strongly with abductors." + /obj/item/stack/sheet/mineral/abductor/fifty amount = 50 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 315515a4f48..d3876da9b1a 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -3,6 +3,7 @@ * Metal * Plasteel * Wood + * Bamboo * Cloth * Durathread * Cardboard @@ -14,9 +15,9 @@ * Saltpetre Crystal */ -/* - * Metal - */ +////////////////////////////// +// MARK: METAL +////////////////////////////// GLOBAL_LIST_INIT(metal_recipes, list( new /datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("barstool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), @@ -121,7 +122,7 @@ GLOBAL_LIST_INIT(metal_recipes, list( /obj/item/stack/sheet/metal name = "metal" - desc = "Sheets made out of metal." + desc = "Sheets made out of steel." singular_name = "metal sheet" icon_state = "sheet-metal" materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT) @@ -137,6 +138,13 @@ GLOBAL_LIST_INIT(metal_recipes, list( . = ..() . += "Metal is used in various different construction sequences." +/obj/item/stack/sheet/metal/examine_more(mob/user) + . = ..() + . += "At its core, steel is an alloy of iron and carbon. The addition of a wide range of other elements and the use of various metallurgical processes allows control over nearly every property of the resulting alloy, \ + from hardness and ductility to corrosion resistance." + . += "" + . += "Its use is ubiquitous across all post-industrial civilisations and is extensively used within all areas of construction, as well as the manufacture of almost any device that one can care to imagine." + /obj/item/stack/sheet/metal/cyborg energy_type = /datum/robot_storage/material/metal is_cyborg = TRUE @@ -146,7 +154,7 @@ GLOBAL_LIST_INIT(metal_recipes, list( . = ..() var/mob/living/silicon/robot/robot = user if(!istype(robot.module, /obj/item/robot_module/drone)) - . += "You can refill your metal by using your magnetic gripper on the Ore Redemption machine, or by picking it up from the ground." + . += "You can refill your metal by using your magnetic gripper on the Ore Redemption Machine, or by picking it up from the ground." /obj/item/stack/sheet/metal/cyborg/drone energy_type = /datum/robot_storage/energy/metal @@ -162,9 +170,9 @@ GLOBAL_LIST_INIT(metal_recipes, list( recipes = GLOB.metal_recipes return ..() -/* - * Plasteel - */ +////////////////////////////// +// MARK: PLASTEEL +////////////////////////////// GLOBAL_LIST_INIT(plasteel_recipes, list( new /datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 5 SECONDS, one_per_turf = TRUE), new /datum/stack_recipe("bomb assembly", /obj/machinery/syndicatebomb/empty, 3, time = 5 SECONDS), @@ -195,6 +203,14 @@ GLOBAL_LIST_INIT(plasteel_recipes, list( point_value = 23 table_type = /obj/structure/table/reinforced +/obj/item/stack/sheet/plasteel/examine_more(mob/user) + . = ..() + . += "A high-performance steel superalloy that incorporates a significant quantity of plasma. The plasma forms cross-links with the other constituants of the metal, \ + pulling them in and bonding with them extremely strongly. It is exceptionally tough, heat-resistant, corrosion-resistant, and about 2.5 times as dense as regular steel." + . += "" + . += "It is used in the constuction of top-grade building and vehicle armour and some specialised tools and weapons. It is too heavy to make starships out of, \ + although it is sometimes incorporated into the armour of critical areas. Its high density also makes it an excellent material for radiation shielding." + /obj/item/stack/sheet/plasteel/five amount = 5 @@ -212,9 +228,9 @@ GLOBAL_LIST_INIT(plasteel_recipes, list( energy_type = /datum/robot_storage/energy/wood is_cyborg = TRUE -/* - * Wood - */ +////////////////////////////// +// MARK: WOOD +////////////////////////////// GLOBAL_LIST_INIT(wood_recipes, list( new /datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), new /datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 1.5 SECONDS), @@ -273,9 +289,9 @@ GLOBAL_LIST_INIT(wood_recipes, list( recipes = GLOB.wood_recipes return ..() -/* - * Bamboo - */ +////////////////////////////// +// MARK: BAMBOO +////////////////////////////// GLOBAL_LIST_INIT(bamboo_recipes, list( new /datum/stack_recipe("punji sticks trap", /obj/structure/punji_sticks, req_amount = 5, time = 3 SECONDS, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("bamboo spear", /obj/item/spear/bamboo, req_amount = 25, time = 9 SECONDS), @@ -315,9 +331,9 @@ GLOBAL_LIST_INIT(bamboo_recipes, list( /obj/item/stack/sheet/bamboo/fifty amount = 50 -/* - * Cloth - */ +////////////////////////////// +// MARK: CLOTH +////////////////////////////// GLOBAL_LIST_INIT(cloth_recipes, list ( new /datum/stack_recipe_list("cloth clothings", list( new /datum/stack_recipe("white jumpsuit", /obj/item/clothing/under/color/white, 3), @@ -379,9 +395,9 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( /obj/item/stack/sheet/cloth/ten amount = 10 -/* - * Durathread - */ +////////////////////////////// +// MARK: DURATHREAD +////////////////////////////// GLOBAL_LIST_INIT(durathread_recipes, list ( new /datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/misc/durathread, 4, time = 4 SECONDS), @@ -431,9 +447,9 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( pull_effort = 70 loom_result = /obj/item/stack/sheet/durathread -/* - * Cardboard - */ +////////////////////////////// +// MARK: CARDBOARD +////////////////////////////// GLOBAL_LIST_INIT(cardboard_recipes, list ( new /datum/stack_recipe("box", /obj/item/storage/box), new /datum/stack_recipe("large box", /obj/item/storage/box/large, 4), @@ -492,9 +508,9 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( recipes = GLOB.cardboard_recipes return ..() -/* - * soil - */ +////////////////////////////// +// MARK: SOIL +////////////////////////////// GLOBAL_LIST_INIT(soil_recipes, list ( new /datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE) )) @@ -514,9 +530,9 @@ GLOBAL_LIST_INIT(soil_recipes, list ( recipes = GLOB.soil_recipes return ..() -/* - * Runed Metal - */ +////////////////////////////// +// MARK: RUNED METAL +////////////////////////////// GLOBAL_LIST_INIT(cult_recipes, list ( new /datum/stack_recipe/cult("runed door (stuns non-cultists)", /obj/machinery/door/airlock/cult, 3, time = 5 SECONDS, one_per_turf = TRUE, on_floor = TRUE, cult_structure = TRUE), @@ -537,6 +553,12 @@ GLOBAL_LIST_INIT(cult_recipes, list ( merge_type = /obj/item/stack/sheet/runed_metal recipe_width = 700 +/obj/item/stack/sheet/runed_metal/examine_more(mob/user) + . = ..() + . += "There are things lurking in the darkness beyond our comprehension, sealed away by terrible writs. They scheme and plot amongst themselves and with the fools and unwilling converts that serve them in our world." + . += "" + . += "Mundane matter turned extraordinary by the dark blessings of those things that lie in wait - such as this - is the canvas used to build the works that shall one day tear asunder the veil that shields our world." + /obj/item/stack/sheet/runed_metal/New() . = ..() icon_state = GET_CULT_DATA(runed_metal_icon_state, initial(icon_state)) @@ -574,9 +596,9 @@ GLOBAL_LIST_INIT(cult_recipes, list ( recipes = GLOB.cult_recipes return ..() -/* - * Brass - */ +////////////////////////////// +// MARK: BRASS +////////////////////////////// GLOBAL_LIST_INIT(brass_recipes, list ( new /datum/stack_recipe("wall gear", /obj/structure/clockwork/wall_gear, 3, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE), null, @@ -604,6 +626,15 @@ GLOBAL_LIST_INIT(brass_recipes, list ( table_type = /obj/structure/table/reinforced/brass dynamic_icon_state = TRUE +/obj/item/stack/tile/brass/examine_more(mob/user) + . = ..() + . += "Brass describes a class of alloys made primarily from copper and zinc, with colours ranging from yellowish-white, gold, brown, and reddish. \ + It is a highly workable material with good electrical and thermal conductivity, and corrosion resistance." + . += "" + . += "It is used for ornamental and fashion applications (sometimes as a cheap substitute for gold), musical instruments, some specialised electronics, and spark-free tooling." + . += "" + . += "Brass is also associated with the Cult of the Clockwork Justiciar - Ratvar. His followers use it extensively in their works and creations, although it has been a long time since anyone has seen them..." + /obj/item/stack/tile/brass/narsie_act() new /obj/item/stack/sheet/runed_metal(loc, amount) qdel(src) @@ -617,9 +648,9 @@ GLOBAL_LIST_INIT(brass_recipes, list ( /obj/item/stack/tile/brass/fifty amount = 50 -/* - * Bones - */ +////////////////////////////// +// MARK: BONES +////////////////////////////// /obj/item/stack/sheet/bone name = "bones" icon = 'icons/obj/stacks/organic.dmi' @@ -634,9 +665,9 @@ GLOBAL_LIST_INIT(brass_recipes, list ( throw_range = 3 origin_tech = "materials=2;biotech=2" -/* - * Plastic - */ +////////////////////////////// +// MARK: PLASTIC +////////////////////////////// GLOBAL_LIST_INIT(plastic_recipes, list( new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 4 SECONDS), @@ -690,6 +721,15 @@ GLOBAL_LIST_INIT(plastic_recipes, list( materials = list(MAT_PLASTIC = MINERAL_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/plastic +/obj/item/stack/sheet/plastic/examine_more(mob/user) + . = ..() + . += "Plastics are a large and diverse range of materials consisting of long-chain polymers, typically based on hydrocarbons, \ + but other chemical groups can be attached to the molecular backbone to achieve specific properties. \ + They are generally characterised as very lightweight, easily mouldable, and versatile. Most plastics either cannot be recycled, or are cost-prohibitive to recycle." + . += "" + . += "Despite the extensive uses of plastics, they are not as ubiquitous as other materials (especially steel). This is due to a combination of environmental regulations, \ + established market patterns, and the operational requirements for many space-based installations to employ easily recycled materials to conserve limited supplies." + /obj/item/stack/sheet/plastic/New() recipes = GLOB.plastic_recipes . = ..() diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index f2a6374bc3d..3f3260f874c 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -3,8 +3,9 @@ #define GIBTONITE_QUALITY_HIGH 3 #define PROBABILITY_REFINE_BY_FIRE 50 #define ORESTACK_OVERLAYS_MAX 10 -/**********************Mineral ores**************************/ - +////////////////////////////// +// MARK: ORES +////////////////////////////// /obj/item/stack/ore name = "rock" icon = 'icons/obj/stacks/ores.dmi' @@ -71,28 +72,9 @@ new refined_type(get_turf(loc), amountrefined) qdel(src) -/obj/item/stack/ore/uranium - name = "uranium ore" - icon_state = "uranium_ore" - item_state = "uranium_ore" - origin_tech = "materials=5" - singular_name = "uranium ore chunk" - points = 30 - refined_type = /obj/item/stack/sheet/mineral/uranium - materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT) - -/obj/item/stack/ore/iron - name = "iron ore" - icon_state = "iron_ore" - item_state = "iron_ore" - origin_tech = "materials=1" - singular_name = "iron ore chunk" - points = 1 - refined_type = /obj/item/stack/sheet/metal - materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT) - /obj/item/stack/ore/glass name = "sand pile" + desc = "A coarse, dust mainly composed of quartz and silica-rich rock. Among its many uses, it can be refined into glass when fired at high tempratures." icon_state = "sand" item_state = "sand" origin_tech = "materials=1" @@ -102,6 +84,10 @@ merge_type = /obj/item/stack/ore/glass materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT) +/obj/item/stack/ore/glass/examine(mob/user) + . = ..() + . += "You can throw this into people's eyes!" + GLOBAL_LIST_INIT(sand_recipes, list(\ new /datum/stack_recipe("sandstone", /obj/item/stack/sheet/mineral/sandstone, 1, 1, 50)\ )) @@ -136,19 +122,36 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/stack/ore/glass/basalt name = "volcanic ash" + desc = "A coarse, abrasive basaltic dust rich in silica and various elemental oxides. Commonly refined into glass or used as fertiliser." icon_state = "volcanic_sand" item_state = "volcanic_sand" singular_name = "volcanic ash pile" - desc = "Looks like you could shove some on a girder to make a false rock wall" + +/obj/item/stack/ore/glass/basalt/examine(mob/user) + . = ..() + . += "You could add some to a girder to make a false rock wall." /obj/item/stack/ore/glass/basalt/ancient name = "ancient sand" + desc = "Basultic sand mined from an exceptionally old and compacted formation." icon_state = "volcanic_sand" item_state = "volcanic_sand" singular_name = "ancient sand pile" +/obj/item/stack/ore/iron + name = "iron ore" + desc = "Exceptionally common ore that can be refined into iron and steel." + icon_state = "iron_ore" + item_state = "iron_ore" + origin_tech = "materials=1" + singular_name = "iron ore chunk" + points = 1 + refined_type = /obj/item/stack/sheet/metal + materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT) + /obj/item/stack/ore/plasma name = "plasma ore" + desc = "The reason you're here." icon_state = "plasma_ore" item_state = "plasma_ore" origin_tech = "plasmatech=2;materials=2" @@ -159,6 +162,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/stack/ore/silver name = "silver ore" + desc = "Metal ore rich in precious silver." icon_state = "silver_ore" item_state = "silver_ore" origin_tech = "materials=3" @@ -169,6 +173,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/stack/ore/gold name = "gold ore" + desc = "WE'RE RICH!" icon_state = "gold_ore" item_state = "gold_ore" origin_tech = "materials=4" @@ -177,35 +182,16 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ refined_type = /obj/item/stack/sheet/mineral/gold materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT) -/obj/item/stack/ore/diamond - name = "diamond ore" - icon_state = "diamond_ore" - item_state = "diamond_ore" - origin_tech = "materials=6" - singular_name = "diamond ore chunk" - points = 50 - refined_type = /obj/item/stack/sheet/mineral/diamond - materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT) - -/obj/item/stack/ore/bananium - name = "bananium ore" - icon_state = "bananium_ore" - item_state = "bananium_ore" - origin_tech = "materials=4" - singular_name = "bananium ore chunk" - points = 60 - refined_type = /obj/item/stack/sheet/mineral/bananium - materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT) - -/obj/item/stack/ore/tranquillite - name = "tranquillite ore" - icon_state = "tranquillite_ore" - item_state = "tranquillite_ore" - origin_tech = "materials=4" - singular_name = "transquillite ore chunk" - points = 60 - refined_type = /obj/item/stack/sheet/mineral/tranquillite - materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT) +/obj/item/stack/ore/uranium + name = "uranium ore" + desc = "Radioactive ore containing significant amounts of natural uranium." + icon_state = "uranium_ore" + item_state = "uranium_ore" + origin_tech = "materials=5" + singular_name = "uranium ore chunk" + points = 30 + refined_type = /obj/item/stack/sheet/mineral/uranium + materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT) /obj/item/stack/ore/titanium name = "titanium ore" @@ -216,15 +202,51 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/titanium +/obj/item/stack/ore/diamond + name = "diamond ore" + desc = "Rock formation containing diamond." + icon_state = "diamond_ore" + item_state = "diamond_ore" + origin_tech = "materials=6" + singular_name = "diamond ore chunk" + points = 50 + refined_type = /obj/item/stack/sheet/mineral/diamond + materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT) + +/obj/item/stack/ore/bananium + name = "bananium ore" + desc = "HONK!" + icon_state = "bananium_ore" + item_state = "bananium_ore" + origin_tech = "materials=4" + singular_name = "bananium ore chunk" + points = 60 + refined_type = /obj/item/stack/sheet/mineral/bananium + materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT) + +/obj/item/stack/ore/tranquillite + name = "tranquillite ore" + desc = "..." + icon_state = "tranquillite_ore" + item_state = "tranquillite_ore" + origin_tech = "materials=4" + singular_name = "transquillite ore chunk" + points = 60 + refined_type = /obj/item/stack/sheet/mineral/tranquillite + materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT) + /obj/item/stack/ore/slag name = "slag" - desc = "Completely useless" + desc = "Completely useless." icon_state = "slag" singular_name = "slag chunk" +////////////////////////////// +// MARK: GIBTONITE +////////////////////////////// /obj/item/gibtonite name = "gibtonite ore" - desc = "Extremely explosive if struck with mining equipment, Gibtonite is often used by miners to speed up their work by using it as a mining charge. This material is illegal to possess by unauthorized personnel under space law." + desc = "Extremely explosive if struck with mining equipment, Gibtonite is often used by miners to speed up their work by using it as a mining charge. This material is illegal to possess by unauthorized personnel under Space Law." icon = 'icons/obj/mining.dmi' icon_state = "Gibtonite ore" item_state = "Gibtonite ore" @@ -237,6 +259,11 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ var/attacher = "UNKNOWN" var/datum/wires/explosive/gibtonite/wires +/obj/item/gibtonite/examine(mob/user) + . = ..() + . += "You can use a mining scanner to stop an activated gibtonite crystal from detonating." + . += "In addition to simply hitting it, you can add a remote signaller to the gibtonite and trigger it to make the crystal begin to detonate!" + /obj/item/gibtonite/Initialize(mapload) . = ..() AddComponent(/datum/component/two_handed, require_twohands = TRUE) @@ -331,8 +358,9 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ qdel(src) -/*****************************Coin********************************/ - +////////////////////////////// +// MARK: COINS +////////////////////////////// /obj/item/coin icon = 'icons/obj/economy.dmi' name = "coin" diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm index 2b25364c113..a98e451ea8b 100644 --- a/code/modules/telesci/bscrystal.dm +++ b/code/modules/telesci/bscrystal.dm @@ -15,6 +15,20 @@ usesound = 'sound/items/deconstruct.ogg' dynamic_icon_state = TRUE +/obj/item/stack/ore/bluespace_crystal/examine(mob/user) + . = ..() + . += "You can crush this to randomly teleport a short distance." + . += "If you throw this at someone, they'll be randomly teleported a short distance away." + +/obj/item/stack/ore/bluespace_crystal/examine_more(mob/user) + . = ..() + . += "Bluespace crystals are a form of exotic matter that is very poorly understood. The process of their creation is not known, nor how they end up in the places they do." + . += "" + . += "They are instrumental in the creation of new experimental bluespace-manipulataive technologies, unlocking previously impossible feats or trivialising ones that less advanced technologies struggle with. \ + As plasma-based technologies become more mature and new radical innovations taper off, bluespece research is becoming new technological frontier." + . += "" + . += "Nanotrasen and many of its rivals are scrambling to be the first to develop practical mass-producible bluespace technologies so they they can become the hegemon of a new market monopoly." + /obj/item/stack/ore/bluespace_crystal/New(loc, new_amount, merge = TRUE) ..() pixel_x = rand(-5, 5) @@ -56,3 +70,13 @@ blink_range = 4 // Not as good as the organic stuff! points = 0 // nice try refined_type = null + +/obj/item/stack/ore/bluespace_crystal/artificial/examine_more(mob/user) + ..() + . = list() + . += "The successful development of a process to create synthetic bluespace crystals was nothing short of a miracle. \ + Natural bluespace crystals are excruciatingly rare, an issue exacerbated by their tendency to blink out of existence if mishandled." + . += "" + . += "Whilst the crystals produced by current synthetic processes are not as potent as natural ones, they can be used in most bluespace technologies with no noticable loss in performance." + . += "" + . += "The manufacturing process is one of Nanotrasen's most closely guarded trade secrets, were it ever to get out, it would have severe consequences for the company."