From 8767ab709aca361c3a0872b526fad9fbc438aff5 Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Fri, 26 May 2023 18:45:09 -0400 Subject: [PATCH] removes all non-defined materials I found (#75659) --- .../items/devices/scanners/autopsy_scanner.dm | 2 +- .../mapfluff/ruins/lavaland_ruin_code.dm | 2 +- .../research/designs/AI_module_designs.dm | 2 +- .../designs/autolathe/engineering_designs.dm | 32 ++--- .../autolathe/multi-department_designs.dm | 50 +++---- .../designs/autolathe/security_designs.dm | 26 ++-- .../designs/autolathe/service_designs.dm | 48 +++---- .../research/designs/bluespace_designs.dm | 6 +- .../research/designs/computer_part_designs.dm | 6 +- .../research/designs/electronics_designs.dm | 2 +- .../designs/mechfabricator_designs.dm | 20 +-- .../research/designs/medical_designs.dm | 126 +++++++++++++----- .../research/designs/mining_designs.dm | 63 +++++++-- code/modules/research/designs/misc_designs.dm | 114 ++++++++++++---- .../research/designs/smelting_designs.dm | 2 +- .../research/designs/stock_parts_designs.dm | 30 ++--- .../research/designs/wiremod_designs.dm | 28 ++-- 17 files changed, 359 insertions(+), 200 deletions(-) diff --git a/code/game/objects/items/devices/scanners/autopsy_scanner.dm b/code/game/objects/items/devices/scanners/autopsy_scanner.dm index 366bf20b467..161a45510b8 100644 --- a/code/game/objects/items/devices/scanners/autopsy_scanner.dm +++ b/code/game/objects/items/devices/scanners/autopsy_scanner.dm @@ -10,7 +10,7 @@ flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_NORMAL - custom_materials = list(/datum/material/iron = 200) + custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*2) custom_price = PAYCHECK_COMMAND /obj/item/autopsy_scanner/proc/scan_cadaver(mob/living/carbon/human/user, mob/living/carbon/scanned) diff --git a/code/modules/mapfluff/ruins/lavaland_ruin_code.dm b/code/modules/mapfluff/ruins/lavaland_ruin_code.dm index 73afd60b3a6..059075c8e5d 100644 --- a/code/modules/mapfluff/ruins/lavaland_ruin_code.dm +++ b/code/modules/mapfluff/ruins/lavaland_ruin_code.dm @@ -25,7 +25,7 @@ desc = "Allows for the construction of a Golem Shell." id = "golem" build_type = AUTOLATHE - materials = list(/datum/material/iron = 40000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*20) build_path = /obj/item/golem_shell category = list(RND_CATEGORY_IMPORTED) diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm index 4b15192f777..4d6211eb897 100644 --- a/code/modules/research/designs/AI_module_designs.dm +++ b/code/modules/research/designs/AI_module_designs.dm @@ -115,7 +115,7 @@ name = "Core Freeform Module" desc = "Allows for the construction of a Core Freeform AI Core Module." id = "freeformcore_module" - materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = 10000, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT)//Ditto + materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SHEET_MATERIAL_AMOUNT*5, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT)//Ditto build_path = /obj/item/ai_module/core/freeformcore category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_LAW_MANIPULATION diff --git a/code/modules/research/designs/autolathe/engineering_designs.dm b/code/modules/research/designs/autolathe/engineering_designs.dm index 24e1489c724..dd5a6d4e7c0 100644 --- a/code/modules/research/designs/autolathe/engineering_designs.dm +++ b/code/modules/research/designs/autolathe/engineering_designs.dm @@ -2,7 +2,7 @@ name = "Solar Panel Frame" id = "solar_panel" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3500, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*1.75, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/solar_assembly category = list( RND_CATEGORY_INITIAL, @@ -63,7 +63,7 @@ name = "Geiger Counter" id = "geigercounter" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 150, /datum/material/glass = 150) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT*1.5) build_path = /obj/item/geiger_counter category = list( RND_CATEGORY_INITIAL, @@ -75,7 +75,7 @@ name = "Turret Control Frame" id = "turret_control" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 12000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6) build_path = /obj/item/wallframe/turret_control category = list( RND_CATEGORY_INITIAL, @@ -87,7 +87,7 @@ name = "Industrial Welding Tool" id = "large_welding_tool" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 70, /datum/material/glass = 60) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.7, /datum/material/glass = SMALL_MATERIAL_AMOUNT*0.6) build_path = /obj/item/weldingtool/largetank/empty category = list( RND_CATEGORY_HACKED, @@ -99,7 +99,7 @@ name = "Camera Assembly" id = "camera_assembly" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 400, /datum/material/glass = 250) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*4, /datum/material/glass = SMALL_MATERIAL_AMOUNT*2.5) build_path = /obj/item/wallframe/camera category = list( RND_CATEGORY_INITIAL, @@ -111,7 +111,7 @@ name = "Newscaster Frame" id = "newscaster_frame" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 14000, /datum/material/glass = 8000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4) build_path = /obj/item/wallframe/newscaster category = list( RND_CATEGORY_INITIAL, @@ -123,7 +123,7 @@ name = "Status Display Frame" id = "status_display_frame" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 14000, /datum/material/glass = 8000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4) build_path = /obj/item/wallframe/status_display category = list( RND_CATEGORY_INITIAL, @@ -136,7 +136,7 @@ name = "Intercom Frame" id = "intercom_frame" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25) build_path = /obj/item/wallframe/intercom category = list( RND_CATEGORY_INITIAL, @@ -280,7 +280,7 @@ name = "Fire Extinguisher" id = "extinguisher" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 90) + materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/extinguisher/empty category = list( RND_CATEGORY_INITIAL, @@ -292,7 +292,7 @@ name = "Pocket Fire Extinguisher" id = "pocketfireextinguisher" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass = 40) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT*0.4) build_path = /obj/item/extinguisher/mini/empty category = list( RND_CATEGORY_INITIAL, @@ -304,7 +304,7 @@ name = "T-Ray Scanner" id = "tscanner" build_type = AUTOLATHE - materials = list(/datum/material/iron = 150) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.5) build_path = /obj/item/t_scanner category = list( RND_CATEGORY_INITIAL, @@ -316,7 +316,7 @@ name = "Requests Console Frame" id = "requests_console" build_type = AUTOLATHE | PROTOLATHE - materials = list(/datum/material/iron = 14000, /datum/material/glass = 8000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4) build_path = /obj/item/wallframe/requests_console category = list( RND_CATEGORY_INITIAL, @@ -328,7 +328,7 @@ name = "Light Switch Frame" id = "light_switch_frame" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25) build_path = /obj/item/wallframe/light_switch category = list( RND_CATEGORY_INITIAL, @@ -341,7 +341,7 @@ id = "telescreen_turbine" build_type = PROTOLATHE materials = list( - /datum/material/iron = 10000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/turbine @@ -356,7 +356,7 @@ id = "telescreen_engine" build_type = PROTOLATHE materials = list( - /datum/material/iron = 10000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/engine @@ -371,7 +371,7 @@ id = "telescreen_auxbase" build_type = PROTOLATHE materials = list( - /datum/material/iron = 10000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/auxbase diff --git a/code/modules/research/designs/autolathe/multi-department_designs.dm b/code/modules/research/designs/autolathe/multi-department_designs.dm index 529ef2846ea..db619a48184 100644 --- a/code/modules/research/designs/autolathe/multi-department_designs.dm +++ b/code/modules/research/designs/autolathe/multi-department_designs.dm @@ -37,7 +37,7 @@ name = "Rapid Wiring Device" id = "rwd" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5) build_path = /obj/item/rwd/loaded category = list( RND_CATEGORY_INITIAL, @@ -49,7 +49,7 @@ name = "Gas Analyzer" id = "analyzer" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 30, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.3, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) build_path = /obj/item/analyzer category = list( RND_CATEGORY_INITIAL, @@ -61,7 +61,7 @@ name = "Welding Tool" id = "welding_tool" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 70, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.7, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) build_path = /obj/item/weldingtool/empty category = list( RND_CATEGORY_INITIAL, @@ -73,7 +73,7 @@ name = "Emergency Welding Tool" id = "mini_welding_tool" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 30, /datum/material/glass = 10) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.3, /datum/material/glass = SMALL_MATERIAL_AMOUNT*0.1) build_path = /obj/item/weldingtool/mini/empty category = list( RND_CATEGORY_INITIAL, @@ -84,7 +84,7 @@ name = "Screwdriver" id = "screwdriver" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75) build_path = /obj/item/screwdriver category = list( RND_CATEGORY_INITIAL, @@ -96,7 +96,7 @@ name = "Wirecutters" id = "wirecutters" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 80) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.8) build_path = /obj/item/wirecutters category = list( RND_CATEGORY_INITIAL, @@ -108,7 +108,7 @@ name = "Wrench" id = "wrench" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 150) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.5) build_path = /obj/item/wrench category = list( RND_CATEGORY_INITIAL, @@ -120,7 +120,7 @@ name = "Plunger" id = "plunger" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 150) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.5) build_path = /obj/item/plunger category = list( RND_CATEGORY_INITIAL, @@ -132,7 +132,7 @@ name = "Welding Helmet" id = "welding_helmet" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 1750, /datum/material/glass = 400) + materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT*1.75, /datum/material/glass = SMALL_MATERIAL_AMOUNT*4) build_path = /obj/item/clothing/head/utility/welding category = list( RND_CATEGORY_INITIAL, @@ -144,7 +144,7 @@ name = "Cable Coil" id = "cable_coil" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10, /datum/material/glass = 5) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.1, /datum/material/glass = SMALL_MATERIAL_AMOUNT*0.1) build_path = /obj/item/stack/cable_coil category = list( RND_CATEGORY_INITIAL, @@ -179,7 +179,7 @@ name = "Extended-Capacity Emergency Oxygen Tank" id = "emergency_oxygen_engi" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 750) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*7.5) build_path = /obj/item/tank/internals/emergency_oxygen/engi/empty category = list( RND_CATEGORY_HACKED, @@ -191,7 +191,7 @@ name = "Plasmaman Belt Tank" id = "plasmaman_tank_belt" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 800) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*8) build_path = /obj/item/tank/internals/plasmaman/belt/empty category = list( RND_CATEGORY_HACKED, @@ -214,7 +214,7 @@ name = "Boxcutter" id = "boxcutter" build_type = AUTOLATHE | PROTOLATHE - materials = list(/datum/material/iron = 4000, /datum/material/plastic =SMALL_MATERIAL_AMOUNT*5) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/plastic =SMALL_MATERIAL_AMOUNT*5) build_path = /obj/item/boxcutter category = list( RND_CATEGORY_INITIAL, @@ -226,7 +226,7 @@ name = "Tinfoil Hat" id = "tinfoil_hat" build_type = AUTOLATHE - materials = list(/datum/material/iron = 5500) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2.5) build_path = /obj/item/clothing/head/costume/foilhat category = list( RND_CATEGORY_HACKED, @@ -249,7 +249,7 @@ name = "Large Beaker" id = "large_beaker" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 2500) + materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT*2.5) category = list( RND_CATEGORY_INITIAL, RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY, @@ -273,7 +273,7 @@ name = "Condenser" id = "condenser" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron=250, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 3) + materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*2.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 3) build_path = /obj/item/assembly/igniter/condenser category = list( RND_CATEGORY_INITIAL, @@ -285,7 +285,7 @@ name = "Remote Signaling Device" id = "signaler" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 400, /datum/material/glass = 120) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*4, /datum/material/glass = SMALL_MATERIAL_AMOUNT*1.2) build_path = /obj/item/assembly/signaler category = list( RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_ASSEMBLIES, @@ -308,7 +308,7 @@ name = "Health Sensor" id = "health_sensor" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 800, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*8, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/assembly/health category = list( RND_CATEGORY_INITIAL, @@ -368,7 +368,7 @@ name = "Proximity Sensor" id = "prox_sensor" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 800, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*8, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/assembly/prox_sensor category = list( RND_CATEGORY_INITIAL, @@ -380,7 +380,7 @@ name = "Butcher's Cleaver" id = "cleaver" build_type = AUTOLATHE - materials = list(/datum/material/iron = 18000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*9) build_path = /obj/item/knife/butcher category = list( RND_CATEGORY_HACKED, @@ -403,7 +403,7 @@ name = "Destination Tagger" id = "desttagger" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 250, /datum/material/glass = 125) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*2.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT*1.5) build_path = /obj/item/dest_tagger category = list( RND_CATEGORY_INITIAL, @@ -428,7 +428,7 @@ name = "Electric Razor" id = "razor" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/iron = 75) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75) build_path = /obj/item/razor category = list( RND_CATEGORY_INITIAL, @@ -518,7 +518,7 @@ name = "Conveyor Belt Switch" id = "conveyor_switch" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 450, /datum/material/glass = 190) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*4.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT*2) build_path = /obj/item/conveyor_switch_construct category = list( RND_CATEGORY_INITIAL, @@ -530,7 +530,7 @@ name = "Laptop Frame" id = "laptop" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/modular_computer/laptop/buildable category = list( RND_CATEGORY_INITIAL, @@ -569,7 +569,7 @@ desc = "An paper biscuit which can seal in itself paperwork, this one is used for confidential Nanotrasen documents. After sealing it the only way to open is through cracking it, cracking is irreversible and makes it permamently open. Not actually a biscuit." id = "confidential_biscuit" build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE - materials = list(/datum/material/plastic = 30) + materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT*0.3) build_path = /obj/item/folder/biscuit/unsealed/confidential category = list( RND_CATEGORY_HACKED, diff --git a/code/modules/research/designs/autolathe/security_designs.dm b/code/modules/research/designs/autolathe/security_designs.dm index fa0ed64f32b..782b8e7ab4c 100644 --- a/code/modules/research/designs/autolathe/security_designs.dm +++ b/code/modules/research/designs/autolathe/security_designs.dm @@ -14,7 +14,7 @@ name = "Rubber Shot (Less Lethal)" id = "rubber_shot" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2) build_path = /obj/item/ammo_casing/shotgun/rubbershot category = list( RND_CATEGORY_INITIAL, @@ -26,7 +26,7 @@ name = "Speed Loader (.38) (Lethal)" id = "c38" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 20000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*10) build_path = /obj/item/ammo_box/c38 category = list( RND_CATEGORY_INITIAL, @@ -38,7 +38,7 @@ name = "Universal Recorder" id = "recorder" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 60, /datum/material/glass = 30) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.6, /datum/material/glass = SMALL_MATERIAL_AMOUNT*0.3) build_path = /obj/item/taperecorder/empty category = list( RND_CATEGORY_INITIAL, @@ -50,7 +50,7 @@ name = "Universal Recorder Tape" id = "tape" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.2, /datum/material/glass = 5) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.2, /datum/material/glass = SMALL_MATERIAL_AMOUNT*0.2) build_path = /obj/item/tape/random category = list( RND_CATEGORY_INITIAL, @@ -86,7 +86,7 @@ name = "Electropack" id = "electropack" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/glass = 2500) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT*2.5) build_path = /obj/item/electropack category = list( RND_CATEGORY_HACKED, @@ -118,7 +118,7 @@ name = "Modular Receiver" id = "receiver" build_type = AUTOLATHE - materials = list(/datum/material/iron = 15000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5) build_path = /obj/item/weaponcrafting/receiver category = list( RND_CATEGORY_HACKED, @@ -130,7 +130,7 @@ name = "Shotgun Dart (Lethal)" id = "shotgun_dart" build_type = AUTOLATHE - materials = list(/datum/material/iron = 4000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2) build_path = /obj/item/ammo_casing/shotgun/dart category = list( RND_CATEGORY_HACKED, @@ -142,7 +142,7 @@ name = "Incendiary Slug (Lethal)" id = "incendiary_slug" build_type = AUTOLATHE - materials = list(/datum/material/iron = 4000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2) build_path = /obj/item/ammo_casing/shotgun/incendiary category = list( RND_CATEGORY_HACKED, @@ -166,7 +166,7 @@ name = "Foam Riot Dart Box (Nonlethal)" id = "riot_darts" build_type = AUTOLATHE - materials = list(/datum/material/iron = 50000) //Comes with 40 darts + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*25) //Comes with 40 darts build_path = /obj/item/ammo_box/foambox/riot category = list( RND_CATEGORY_HACKED, @@ -178,7 +178,7 @@ name = ".357 Casing (VERY Lethal)" id = "a357" build_type = AUTOLATHE - materials = list(/datum/material/iron = 4000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2) build_path = /obj/item/ammo_casing/a357 category = list( RND_CATEGORY_HACKED, @@ -190,7 +190,7 @@ name = "7.62 Surplus Bullet Casing (VERY Lethal)" id = "a762surplus" build_type = AUTOLATHE - materials = list(/datum/material/iron = 4000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2) build_path = /obj/item/ammo_casing/a762/surplus category = list( RND_CATEGORY_HACKED, @@ -239,7 +239,7 @@ id = "telescreen_interrogation" build_type = PROTOLATHE materials = list( - /datum/material/iron = 10000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/interrogation @@ -254,7 +254,7 @@ id = "telescreen_prison" build_type = PROTOLATHE materials = list( - /datum/material/iron = 10000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/prison diff --git a/code/modules/research/designs/autolathe/service_designs.dm b/code/modules/research/designs/autolathe/service_designs.dm index 6fd7ecbd2a6..9ce8f17f50d 100644 --- a/code/modules/research/designs/autolathe/service_designs.dm +++ b/code/modules/research/designs/autolathe/service_designs.dm @@ -62,7 +62,7 @@ name = "Camera Film Cartridge" id = "camera_film" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10, /datum/material/glass = 10) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.1, /datum/material/glass = SMALL_MATERIAL_AMOUNT*0.1) build_path = /obj/item/camera_film category = list( RND_CATEGORY_INITIAL, @@ -74,7 +74,7 @@ name = "Kitchen Knife" id = "kitchen_knife" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 12000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6) build_path = /obj/item/knife/kitchen category = list( RND_CATEGORY_INITIAL, @@ -98,7 +98,7 @@ name = "Fork" id = "fork" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 80) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT) build_path = /obj/item/kitchen/fork category = list( RND_CATEGORY_INITIAL, @@ -110,7 +110,7 @@ name = "Plastic Fork" id = "plastic_fork" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 80) + materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT) build_path = /obj/item/kitchen/fork/plastic category = list( RND_CATEGORY_INITIAL, @@ -122,7 +122,7 @@ name = "Spoon" id = "spoon" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 120) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.2) build_path = /obj/item/kitchen/spoon category = list( RND_CATEGORY_INITIAL, @@ -134,7 +134,7 @@ name = "Plastic Spoon" id = "plastic_spoon" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 120) + materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT*1.2) build_path = /obj/item/kitchen/spoon/plastic category = list( RND_CATEGORY_INITIAL, @@ -158,7 +158,7 @@ name = "Plate" id = "plate" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 3500) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*1.5) build_path = /obj/item/plate category = list( RND_CATEGORY_INITIAL, @@ -242,7 +242,7 @@ name = "Plant Analyzer" id = "plant_analyzer" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 30, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.3, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) build_path = /obj/item/plant_analyzer category = list( RND_CATEGORY_INITIAL, @@ -278,7 +278,7 @@ name = "Hatchet" id = "hatchet" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 15000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5) build_path = /obj/item/hatchet category = list( RND_CATEGORY_INITIAL, @@ -290,7 +290,7 @@ name = "Secateurs" id = "secateurs" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2) build_path = /obj/item/secateurs category = list( RND_CATEGORY_INITIAL, @@ -302,7 +302,7 @@ name = "Radio Headset" id = "radio_headset" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75) build_path = /obj/item/radio/headset category = list( RND_CATEGORY_INITIAL, @@ -314,7 +314,7 @@ name = "Station Bounced Radio" id = "bounced_radio" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25) build_path = /obj/item/radio/off category = list( RND_CATEGORY_INITIAL, @@ -326,7 +326,7 @@ name = "Hand Labeler" id = "handlabel" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 150, /datum/material/glass = 125) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT*1.25) build_path = /obj/item/hand_labeler category = list( RND_CATEGORY_INITIAL, @@ -338,7 +338,7 @@ name = "Pet Carrier" id = "pet_carrier" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 7500, /datum/material/glass =SMALL_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*3.75, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/pet_carrier category = list( RND_CATEGORY_INITIAL, @@ -362,7 +362,7 @@ name = "Box of Cap Gun Shots" id = "capbox" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.2, /datum/material/glass = 5) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.2, /datum/material/glass = SMALL_MATERIAL_AMOUNT*0.1) build_path = /obj/item/toy/ammo/gun category = list( RND_CATEGORY_HACKED, @@ -374,7 +374,7 @@ name = "Plastic Balloon" id = "toy_balloon" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 1200) + materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT*1.2) build_path = /obj/item/toy/balloon category = list( RND_CATEGORY_HACKED, @@ -398,7 +398,7 @@ name = "Plastic Potted Plant" id = "plastic_trees" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 8000) + materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT*4) build_path = /obj/item/kirbyplants/fullysynthetic category = list( RND_CATEGORY_INITIAL, @@ -422,7 +422,7 @@ name = "Plastic Can Rings" id = "ring_holder" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 1200) + materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT*1.2) build_path = /obj/item/storage/cans category = list( RND_CATEGORY_INITIAL, @@ -459,7 +459,7 @@ name = "Chisel" id = "chisel" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75) build_path = /obj/item/chisel category = list( RND_CATEGORY_INITIAL, @@ -483,7 +483,7 @@ name = "Toner Cartridge" id = "toner" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10, /datum/material/glass = 10) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.1, /datum/material/glass = SMALL_MATERIAL_AMOUNT*0.1) build_path = /obj/item/toner category = list( RND_CATEGORY_INITIAL, @@ -495,7 +495,7 @@ name = "Toner Cartridge (Large)" id = "toner_large" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 35, /datum/material/glass = 35) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/toner/large category = list( RND_CATEGORY_INITIAL, @@ -519,7 +519,7 @@ name = "Ticket Machine Frame" id = "ticket_machine" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 14000, /datum/material/glass = 8000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4) build_path = /obj/item/wallframe/ticket_machine category = list( RND_CATEGORY_INITIAL, @@ -532,7 +532,7 @@ id = "telescreen_bar" build_type = PROTOLATHE materials = list( - /datum/material/iron = 10000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/bar @@ -547,7 +547,7 @@ id = "telescreen_entertainment" build_type = PROTOLATHE materials = list( - /datum/material/iron = 10000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, ) build_path = /obj/item/wallframe/telescreen/entertainment diff --git a/code/modules/research/designs/bluespace_designs.dm b/code/modules/research/designs/bluespace_designs.dm index ea48ad208fd..58bccd53d03 100644 --- a/code/modules/research/designs/bluespace_designs.dm +++ b/code/modules/research/designs/bluespace_designs.dm @@ -8,7 +8,7 @@ desc = "A bluespace tracking beacon." id = "beacon" build_type = PROTOLATHE - materials = list(/datum/material/iron = 150, /datum/material/glass =SMALL_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/beacon category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE @@ -20,7 +20,7 @@ desc = "A block of metal ready to be transformed into a bag of holding with a bluespace anomaly core." id = "bag_holding" build_type = PROTOLATHE - materials = list(/datum/material/gold =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium = 250, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT) + materials = list(/datum/material/gold =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium = SMALL_MATERIAL_AMOUNT*2.5, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/bag_of_holding_inert category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -69,7 +69,7 @@ desc = "A mining satchel that can hold an infinite amount of ores." id = "minerbag_holding" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/gold = 250, /datum/material/uranium =SMALL_MATERIAL_AMOUNT*5) //quite cheap, for more convenience + materials = list(/datum/material/gold = SMALL_MATERIAL_AMOUNT*2.5, /datum/material/uranium =SMALL_MATERIAL_AMOUNT*5) //quite cheap, for more convenience build_path = /obj/item/storage/bag/ore/holding category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING diff --git a/code/modules/research/designs/computer_part_designs.dm b/code/modules/research/designs/computer_part_designs.dm index 094f9e10707..8dab08c046d 100644 --- a/code/modules/research/designs/computer_part_designs.dm +++ b/code/modules/research/designs/computer_part_designs.dm @@ -6,7 +6,7 @@ name = "Data Disk" id = "portadrive_basic" build_type = IMPRINTER | AWAY_IMPRINTER - materials = list(/datum/material/glass = 800) + materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT*8) build_path = /obj/item/computer_disk category = list( RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS @@ -17,7 +17,7 @@ name = "Advanced Data Disk" id = "portadrive_advanced" build_type = IMPRINTER | AWAY_IMPRINTER - materials = list(/datum/material/glass = 1600) + materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT*1.5) build_path = /obj/item/computer_disk/advanced category = list( RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS @@ -28,7 +28,7 @@ name = "Super Data Disk" id = "portadrive_super" build_type = IMPRINTER | AWAY_IMPRINTER - materials = list(/datum/material/glass = 3200) + materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT*1.5) build_path = /obj/item/computer_disk/super category = list( RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS diff --git a/code/modules/research/designs/electronics_designs.dm b/code/modules/research/designs/electronics_designs.dm index d55e1a188bd..ce607639e22 100644 --- a/code/modules/research/designs/electronics_designs.dm +++ b/code/modules/research/designs/electronics_designs.dm @@ -32,7 +32,7 @@ desc = "A software package that will allow an artificial intelligence to 'hear' from its cameras via lip reading." id = "ai_cam_upgrade" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/gold = 15000, /datum/material/silver = 15000, /datum/material/diamond = 20000, /datum/material/plasma = 10000) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/gold = SHEET_MATERIAL_AMOUNT * 7.5, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 7.5, /datum/material/diamond = SHEET_MATERIAL_AMOUNT * 10, /datum/material/plasma = SHEET_MATERIAL_AMOUNT * 5) build_path = /obj/item/surveillance_upgrade category = list( RND_CATEGORY_AI + RND_SUBCATEGORY_AI_UPGRADES diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index d4f546fe6fb..6bfaa526e11 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -494,7 +494,7 @@ id = "phazon_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_torso - materials = list(/datum/material/iron=35000,/datum/material/glass =SHEET_MATERIAL_AMOUNT*5,/datum/material/plasma=SHEET_MATERIAL_AMOUNT*10) + materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*17.5,/datum/material/glass =SHEET_MATERIAL_AMOUNT*5,/datum/material/plasma=SHEET_MATERIAL_AMOUNT*10) construction_time = 300 category = list( RND_CATEGORY_MECHFAB_PHAZON + RND_SUBCATEGORY_MECHFAB_CHASSIS @@ -977,7 +977,7 @@ id = "borg_upgrade_restart" build_type = MECHFAB build_path = /obj/item/borg_restart_board - materials = list(/datum/material/iron = 20000 , /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*10, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL @@ -999,7 +999,7 @@ id = "borg_upgrade_disablercooler" build_type = MECHFAB build_path = /obj/item/borg/upgrade/disablercooler - materials = list(/datum/material/iron = 20000 , /datum/material/glass =SHEET_MATERIAL_AMOUNT*3, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*10, /datum/material/glass =SHEET_MATERIAL_AMOUNT*3, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) construction_time = 120 category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SECURITY @@ -1153,18 +1153,18 @@ id = "borg_upgrade_rolling_table" build_type = MECHFAB build_path = /obj/item/borg/upgrade/rolling_table - materials = list(/datum/material/iron = 20000, /datum/material/titanium = 750) //steeper price than a regular rolling table, with some added titanium to make up for the relative rarity of regular rolling tables + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*10, /datum/material/titanium = SMALL_MATERIAL_AMOUNT*7.5) //steeper price than a regular rolling table, with some added titanium to make up for the relative rarity of regular rolling tables construction_time = 4 SECONDS category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SERVICE ) - + /datum/design/borg_upgrade_condiment_synthesizer name = "Condiment Synthesizer" id = "borg_upgrade_condiment_synthesizer" build_type = MECHFAB build_path = /obj/item/borg/upgrade/condiment_synthesizer - materials = list(/datum/material/iron = 15000, /datum/material/glass = 12000, /datum/material/plasma = 6000, /datum/material/uranium = 6000) //a bit cheaper than an expanded hypo for medical borg, + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*6, /datum/material/plasma = SHEET_MATERIAL_AMOUNT*3, /datum/material/uranium = SHEET_MATERIAL_AMOUNT*3) //a bit cheaper than an expanded hypo for medical borg, construction_time = 4 SECONDS category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SERVICE @@ -1175,18 +1175,18 @@ id = "borg_upgrade_silicon_knife" build_type = MECHFAB build_path = /obj/item/borg/upgrade/silicon_knife - materials = list(/datum/material/iron = 15000, /datum/material/gold = 1000, /datum/material/silver = 1000,) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5, /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT) construction_time = 4 SECONDS category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SERVICE ) - + /datum/design/borg_upgrade_service_apparatus name = "Service apparatus" id = "borg_upgrade_service_apparatus" build_type = MECHFAB build_path = /obj/item/borg/upgrade/service_apparatus - materials = list(/datum/material/iron = 5000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2.5) construction_time = 4 SECONDS category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_SERVICE @@ -1208,7 +1208,7 @@ id = "borg_ai_control" build_type = MECHFAB build_path = /obj/item/borg/upgrade/ai - materials = list(/datum/material/iron = 1200, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =SMALL_MATERIAL_AMOUNT * 2) + materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT*1.2, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =SMALL_MATERIAL_AMOUNT * 2) construction_time = 50 category = list( RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CONTROL_INTERFACES diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index acec69bd499..3b9d77f97da 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -17,7 +17,7 @@ name = "Autopsy Scanner" id = "autopsyscanner" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 500, /datum/material/glass = 50) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*5, /datum/material/glass = SMALL_MATERIAL_AMOUNT) build_path = /obj/item/autopsy_scanner category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL @@ -52,7 +52,7 @@ name = "X-large Beaker" id = "xlarge_beaker" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 2500, /datum/material/plastic =SHEET_MATERIAL_AMOUNT * 1.5) + materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT*2.5, /datum/material/plastic =SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY ) @@ -63,7 +63,7 @@ name = "Metamaterial Beaker" id = "meta_beaker" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 2500, /datum/material/plastic =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT) + materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT*2.5, /datum/material/plastic =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY ) @@ -74,7 +74,7 @@ name = "Chemical Analyzer" id = "ph_meter" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 2500, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT) + materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT*2.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/ph_meter category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -134,7 +134,7 @@ desc = "A refill pack for the auto-extinguisher on Plasma-man suits." id = "plasmarefiller" //Why did this have no plasmatech build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/extinguisher_refill category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_GAS_TANKS_EQUIPMENT @@ -159,7 +159,7 @@ id = "defibrillator" build_type = PROTOLATHE | AWAY_LATHE build_path = /obj/item/defibrillator - materials = list(/datum/material/iron = 8000, /datum/material/glass = 4000, /datum/material/silver =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*4, /datum/material/glass = SHEET_MATERIAL_AMOUNT*2, /datum/material/silver =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL ) @@ -195,7 +195,7 @@ id = "defibrillator_compact" build_type = PROTOLATHE | AWAY_LATHE build_path = /obj/item/defibrillator/compact - materials = list(/datum/material/iron = 16000, /datum/material/glass = 8000, /datum/material/silver = 6000, /datum/material/gold =SHEET_MATERIAL_AMOUNT * 1.5) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4, /datum/material/silver = SHEET_MATERIAL_AMOUNT*3, /datum/material/gold =SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL ) @@ -219,7 +219,7 @@ id = "healthanalyzer_advanced" build_path = /obj/item/healthanalyzer/advanced build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass = 2500, /datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5) + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED ) @@ -231,7 +231,7 @@ id = "medigel" build_path = /obj/item/reagent_containers/medigel build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2500, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5) category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL ) @@ -254,7 +254,7 @@ id = "laserscalpel" build_path = /obj/item/scalpel/advanced build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 6000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/diamond =SMALL_MATERIAL_AMOUNT * 2, /datum/material/titanium = 4000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*3, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/diamond =SMALL_MATERIAL_AMOUNT * 2, /datum/material/titanium = SHEET_MATERIAL_AMOUNT*2) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED ) @@ -266,7 +266,7 @@ id = "mechanicalpinches" build_path = /obj/item/retractor/advanced build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 12000, /datum/material/glass = 4000, /datum/material/silver = 4000, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 2.5) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6, /datum/material/glass = SHEET_MATERIAL_AMOUNT*2, /datum/material/silver = SHEET_MATERIAL_AMOUNT*2, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 2.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED ) @@ -278,7 +278,7 @@ id = "searingtool" build_path = /obj/item/cautery/advanced build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/plasma =SHEET_MATERIAL_AMOUNT, /datum/material/uranium =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 1.5) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/plasma =SHEET_MATERIAL_AMOUNT, /datum/material/uranium =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED ) @@ -328,7 +328,7 @@ id = "portable_chem_mixer" build_type = PROTOLATHE | AWAY_LATHE departmental_flags = DEPARTMENT_BITFLAG_MEDICAL - materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/iron = 10000, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 1.5) + materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/storage/portable_chem_mixer category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -345,7 +345,7 @@ id = "ci-welding" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 40 - materials = list(/datum/material/iron = 600, /datum/material/glass = 400) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*6, /datum/material/glass = SMALL_MATERIAL_AMOUNT*4) build_path = /obj/item/organ/internal/eyes/robotic/shield category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_MISC @@ -358,7 +358,7 @@ id = "ci-gloweyes" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 40 - materials = list(/datum/material/iron = 600, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*6, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/organ/internal/eyes/robotic/glow category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_MISC @@ -371,7 +371,7 @@ id = "ci-breather" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 35 - materials = list(/datum/material/iron = 600, /datum/material/glass = 250) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*6, /datum/material/glass = SMALL_MATERIAL_AMOUNT*2.5) build_path = /obj/item/organ/internal/cyberimp/mouth/breathing_tube category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH @@ -383,7 +383,7 @@ desc = "A set of surgical tools hidden behind a concealed panel on the user's arm." id = "ci-surgery" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB - materials = list (/datum/material/iron = 2500, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5) + materials = list (/datum/material/iron = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5) construction_time =SMALL_MATERIAL_AMOUNT * 2 build_path = /obj/item/organ/internal/cyberimp/arm/surgery category = list( @@ -396,7 +396,7 @@ desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm." id = "ci-toolset" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB - materials = list (/datum/material/iron = 2500, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5) + materials = list (/datum/material/iron = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5) construction_time =SMALL_MATERIAL_AMOUNT * 2 build_path = /obj/item/organ/internal/cyberimp/arm/toolset category = list( @@ -410,7 +410,12 @@ id = "ci-medhud" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 50 - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/silver =SMALL_MATERIAL_AMOUNT*5, + /datum/material/gold =SMALL_MATERIAL_AMOUNT*5, + ) build_path = /obj/item/organ/internal/cyberimp/eyes/hud/medical category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY @@ -423,7 +428,12 @@ id = "ci-sechud" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 50 - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 750, /datum/material/gold = 750) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/silver = SMALL_MATERIAL_AMOUNT*7.5, + /datum/material/gold = SMALL_MATERIAL_AMOUNT*7.5, + ) build_path = /obj/item/organ/internal/cyberimp/eyes/hud/security category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY @@ -436,7 +446,12 @@ id = "ci-diaghud" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 50 - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 600, /datum/material/gold = 600) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/silver = SMALL_MATERIAL_AMOUNT*6, + /datum/material/gold = SMALL_MATERIAL_AMOUNT*6, + ) build_path = /obj/item/organ/internal/cyberimp/eyes/hud/diagnostic category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY @@ -449,7 +464,16 @@ id = "ci-xray" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 60 - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/silver = SMALL_MATERIAL_AMOUNT*6, + /datum/material/gold = SMALL_MATERIAL_AMOUNT*6, + /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/organ/internal/eyes/robotic/xray category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_COMBAT @@ -462,7 +486,14 @@ id = "ci-thermals" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 60 - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/silver = SMALL_MATERIAL_AMOUNT*6, + /datum/material/gold = SMALL_MATERIAL_AMOUNT*6, + /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/diamond =SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/organ/internal/eyes/robotic/thermals category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_COMBAT @@ -475,7 +506,12 @@ id = "ci-antidrop" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 60 - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 400, /datum/material/gold = 400) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/silver = SMALL_MATERIAL_AMOUNT*4, + /datum/material/gold = SMALL_MATERIAL_AMOUNT*4, + ) build_path = /obj/item/organ/internal/cyberimp/brain/anti_drop category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT @@ -488,7 +524,12 @@ id = "ci-antistun" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 60 - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/silver =SMALL_MATERIAL_AMOUNT*5, + /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/organ/internal/cyberimp/brain/anti_stun category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT @@ -501,7 +542,11 @@ id = "ci-nutriment" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 40 - materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5) + materials = list( + /datum/material/iron =SMALL_MATERIAL_AMOUNT*5, + /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, + /datum/material/gold =SMALL_MATERIAL_AMOUNT*5, + ) build_path = /obj/item/organ/internal/cyberimp/chest/nutriment category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH @@ -514,7 +559,12 @@ id = "ci-nutrimentplus" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 50 - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5, /datum/material/uranium = 750) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/gold =SMALL_MATERIAL_AMOUNT*5, + /datum/material/uranium = SMALL_MATERIAL_AMOUNT*7.5, + ) build_path = /obj/item/organ/internal/cyberimp/chest/nutriment/plus category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH @@ -527,7 +577,12 @@ id = "ci-reviver" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 60 - materials = list(/datum/material/iron = 800, /datum/material/glass = 800, /datum/material/gold =SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium =SMALL_MATERIAL_AMOUNT*5) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*8, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*8, + /datum/material/gold =SMALL_MATERIAL_AMOUNT * 3, + /datum/material/uranium =SMALL_MATERIAL_AMOUNT*5, + ) build_path = /obj/item/organ/internal/cyberimp/chest/reviver category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH @@ -540,7 +595,12 @@ id = "ci-thrusters" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 80 - materials = list(/datum/material/iron = 4000, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT) + materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT*2, + /datum/material/glass =SHEET_MATERIAL_AMOUNT, + /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/organ/internal/cyberimp/chest/thrusters category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY @@ -556,7 +616,7 @@ desc = "A sterile automatic implant injector." id = "implanter" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*6, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/implanter category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS @@ -592,7 +652,7 @@ desc = "A glass case containing an implant." id = "implant_chem" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 700) + materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT*7) build_path = /obj/item/implantcase/chem category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_MISC @@ -763,7 +823,7 @@ id = "cybernetic_ears" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 30 - materials = list(/datum/material/iron = 250, /datum/material/glass = 400) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*2.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT*4) build_path = /obj/item/organ/internal/ears/cybernetic category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_1 @@ -789,7 +849,7 @@ id = "cybernetic_eyes" build_type = PROTOLATHE | AWAY_LATHE | MECHFAB construction_time = 30 - materials = list(/datum/material/iron = 250, /datum/material/glass = 400) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*2.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT*4) build_path = /obj/item/organ/internal/eyes/robotic/basic category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_1 diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm index 66e8f53d462..6fcf31c7364 100644 --- a/code/modules/research/designs/mining_designs.dm +++ b/code/modules/research/designs/mining_designs.dm @@ -42,7 +42,7 @@ desc = "Yours is the drill that will pierce through the rock walls." id = "drill" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 6000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) //expensive, but no need for miners. + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*3, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) //expensive, but no need for miners. build_path = /obj/item/pickaxe/drill category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -54,7 +54,11 @@ desc = "Yours is the drill that will pierce the heavens!" id = "drill_diamond" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 6000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) //Yes, a whole diamond is needed. + materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT*3, + /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/diamond =SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/pickaxe/drill/diamonddrill category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -66,7 +70,11 @@ desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff." id = "plasmacutter" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/plasma = 400) + materials = list( + /datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, + /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, + /datum/material/plasma = SMALL_MATERIAL_AMOUNT*4, + ) build_path = /obj/item/gun/energy/plasmacutter category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -78,7 +86,12 @@ desc = "It's an advanced plasma cutter, oh my god." id = "plasmacutter_adv" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma =SHEET_MATERIAL_AMOUNT, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5) + materials = list( + /datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5, + /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/plasma =SHEET_MATERIAL_AMOUNT, + /datum/material/gold =SMALL_MATERIAL_AMOUNT*5, + ) build_path = /obj/item/gun/energy/plasmacutter/adv category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -90,7 +103,12 @@ desc = "Essentially a handheld planet-cracker. Rock walls cower in fear when they hear one of these." id = "jackhammer" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 6000, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/diamond = 6000) + materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT*3, + /datum/material/glass =SHEET_MATERIAL_AMOUNT, + /datum/material/silver =SHEET_MATERIAL_AMOUNT, + /datum/material/diamond = SHEET_MATERIAL_AMOUNT*3, + ) build_path = /obj/item/pickaxe/drill/jackhammer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -102,7 +120,12 @@ desc = "An upgraded version of the resonator that allows more fields to be active at once." id = "superresonator" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) + materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT*2, + /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, + /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/resonator/upgraded category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING @@ -114,7 +137,12 @@ desc = "A device which allows kinetic accelerators to be wielded by any organism." id = "triggermod" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) + materials = list( + /datum/material/iron =SHEET_MATERIAL_AMOUNT, + /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, + /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, + /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/borg/upgrade/modkit/trigger_guard category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_PKA_MODS @@ -126,7 +154,12 @@ desc = "A device which allows kinetic accelerators to deal more damage." id = "damagemod" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) + materials = list( + /datum/material/iron =SHEET_MATERIAL_AMOUNT, + /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, + /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, + /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/borg/upgrade/modkit/damage category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_PKA_MODS @@ -186,7 +219,13 @@ desc = "A modification kit for Kinetic Accelerators which causes it to fire AoE blasts that destroy rock." id = "hypermod" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 8000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/gold =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT) + materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT*4, + /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, + /datum/material/silver =SHEET_MATERIAL_AMOUNT, + /datum/material/gold =SHEET_MATERIAL_AMOUNT, + /datum/material/diamond =SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/borg/upgrade/modkit/aoe/turfs category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_PKA_MODS @@ -205,7 +244,11 @@ name = "Mining Scanner" id = "mining_scanner" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT) + materials = list( + /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, + /datum/material/iron =SMALL_MATERIAL_AMOUNT*5, + /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/t_scanner/adv_mining_scanner/lesser category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MINING diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index f05fd11cf8c..ef2844bb132 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -20,7 +20,12 @@ desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness." id = "health_hud_night" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = 350) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/silver = SMALL_MATERIAL_AMOUNT*3.5, + ) build_path = /obj/item/clothing/glasses/hud/health/night category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL @@ -44,7 +49,12 @@ desc = "A heads-up display which provides id data and vision in complete darkness." id = "security_hud_night" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = 350) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/gold = SMALL_MATERIAL_AMOUNT*3.5, + ) build_path = /obj/item/clothing/glasses/hud/security/night category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY @@ -68,7 +78,12 @@ desc = "Upgraded version of the diagnostic HUD designed to function during a power failure." id = "diagnostic_hud_night" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma =SMALL_MATERIAL_AMOUNT * 3) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/plasma =SMALL_MATERIAL_AMOUNT * 3, + ) build_path = /obj/item/clothing/glasses/hud/diagnostic/night category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -108,7 +123,12 @@ desc = "By applying state of the art lighting technology to a fire helmet with industry standard photo-chemical hardening methods, this hardhat will protect you from robust workplace hazards." id = "bright_helmet" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =SMALL_MATERIAL_AMOUNT*5) + materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT*2, + /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/plastic =SHEET_MATERIAL_AMOUNT * 1.5, + /datum/material/silver =SMALL_MATERIAL_AMOUNT*5, + ) build_path = /obj/item/clothing/head/utility/hardhat/red/upgraded category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -132,7 +152,7 @@ desc = "We duct-taped some wheels to the bottom of a table. It's goddamn science alright?" id = "rolling_table" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2) build_path = /obj/structure/table/rolling category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -144,7 +164,7 @@ desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant." id = "portaseeder" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = 400) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT*4) build_path = /obj/item/storage/bag/plants/portaseeder category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_TOOLS_BOTANY @@ -156,7 +176,7 @@ desc = "Damn son, where'd you find this?" id = "air_horn" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/bananium =HALF_SHEET_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/bananium =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/bikehorn/airhorn category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE @@ -227,7 +247,12 @@ desc = "Prototype meson scanners fitted with an extra sensor which amplifies the visible light spectrum and overlays it to the UHD display." id = "nvgmesons" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/plasma = SMALL_MATERIAL_AMOUNT*3.5, + /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/clothing/glasses/meson/night category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -239,7 +264,12 @@ desc = "Goggles that let you see through darkness unhindered." id = "night_visision_goggles" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/plasma = SMALL_MATERIAL_AMOUNT*3.5, + /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/clothing/glasses/night category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC @@ -251,7 +281,11 @@ desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle." id = "magboots" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4500, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold = 2500) + materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT*2, + /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, + /datum/material/gold = SHEET_MATERIAL_AMOUNT*1.25, + ) build_path = /obj/item/clothing/shoes/magboots category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -263,7 +297,10 @@ desc = "A device which can project temporary forcefields to seal off an area." id = "forcefield_projector" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2500, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT) + materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT*1.25, + /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/forcefield_projector category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING @@ -287,7 +324,12 @@ desc = "Goggles that lets the user see in the dark and recognize chemical compounds at a glance." id = "nv_scigoggles" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT) + materials = list( + /datum/material/iron = SMALL_MATERIAL_AMOUNT*6, + /datum/material/glass = SMALL_MATERIAL_AMOUNT*6, + /datum/material/plasma = SMALL_MATERIAL_AMOUNT*3.5, + /datum/material/uranium =HALF_SHEET_MATERIAL_AMOUNT, + ) build_path = /obj/item/clothing/glasses/science/night category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_CHEMISTRY @@ -299,7 +341,11 @@ desc = "A roasting stick for cooking sausages in exotic ovens." id = "roastingstick" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, /datum/material/bluespace = 250) + materials = list( + /datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/glass =SMALL_MATERIAL_AMOUNT*5, + /datum/material/bluespace = SMALL_MATERIAL_AMOUNT*2.5, + ) build_path = /obj/item/melee/roastingstick category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_KITCHEN @@ -359,7 +405,13 @@ desc = "A refill canister for Donksoft Toy Vendors." id = "donksoft_refill" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 25000, /datum/material/glass = 15000, /datum/material/plasma = 20000, /datum/material/gold = 10000, /datum/material/silver = 10000) + materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT*12.5, + /datum/material/glass = SHEET_MATERIAL_AMOUNT*7.5, + /datum/material/plasma = SHEET_MATERIAL_AMOUNT*10, + /datum/material/gold = SHEET_MATERIAL_AMOUNT*5, + /datum/material/silver = SHEET_MATERIAL_AMOUNT*5, + ) build_path = /obj/item/vending_refill/donksoft category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_MISC @@ -442,7 +494,7 @@ desc = "A heavy brace used to seal airlocks. Useful for keeping out people without the dexterity to remove it." id = "pneumatic_seal" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 20000, /datum/material/plasma = 10000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*10, /datum/material/plasma = SHEET_MATERIAL_AMOUNT*5) build_path = /obj/item/door_seal category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING @@ -458,7 +510,7 @@ desc = "An upgraded mop with a large internal capacity for holding water or other cleaning chemicals." id = "advmop" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2500, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) + materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT*2.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) build_path = /obj/item/mop/advanced category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -482,7 +534,7 @@ desc = "An advanced trash bag with bluespace properties; capable of holding a plethora of garbage." id = "blutrash" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium = 250, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT * 1.5) + materials = list(/datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/uranium = SMALL_MATERIAL_AMOUNT*2.5, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/storage/bag/trash/bluespace category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -494,7 +546,7 @@ desc = "A device to automatically replace lights. Refill with working light bulbs." id = "light_replacer" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver = 150, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 1.5) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver = SMALL_MATERIAL_AMOUNT*1.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 1.5) build_path = /obj/item/lightreplacer category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -506,7 +558,7 @@ desc = "A device to automatically replace lights at a distance. Refill with working light bulbs." id = "light_replacer_blue" build_type = PROTOLATHE - materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver = 150, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT * 3) + materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver = SMALL_MATERIAL_AMOUNT*1.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT * 3) build_path = /obj/item/lightreplacer/blue category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_JANITORIAL @@ -583,7 +635,7 @@ name = "Advanced Watering Can" id = "adv_watering_can" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2500, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) + materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT*2.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_BOTANY_ADVANCED ) @@ -675,7 +727,13 @@ desc = "An experimental suit of armour capable of utilizing an implanted anomaly core to protect the user." id = "reactive_armour" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/diamond =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/uranium = 8000, /datum/material/silver = 4500, /datum/material/gold =SHEET_MATERIAL_AMOUNT * 2.5) + materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT*5, + /datum/material/uranium = SHEET_MATERIAL_AMOUNT*4, + /datum/material/diamond = SHEET_MATERIAL_AMOUNT * 2.5, + /datum/material/silver = SHEET_MATERIAL_AMOUNT*2.5, + /datum/material/gold = SHEET_MATERIAL_AMOUNT * 2.5, + ) build_path = /obj/item/reactive_armour_shell category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE @@ -687,7 +745,7 @@ desc = "A royal knight's favorite garments. Can be trimmed by any friendly person." id = "knight_armour" build_type = AUTOLATHE - materials = list(MAT_CATEGORY_ITEM_MATERIAL = 10000) + materials = list(MAT_CATEGORY_ITEM_MATERIAL = SHEET_MATERIAL_AMOUNT*5) build_path = /obj/item/clothing/suit/armor/riot/knight/greyscale category = list(RND_CATEGORY_IMPORTED) @@ -696,12 +754,10 @@ desc = "A royal knight's favorite hat. If you hold it upside down it's actually a bucket." id = "knight_helmet" build_type = AUTOLATHE - materials = list(MAT_CATEGORY_ITEM_MATERIAL =SHEET_MATERIAL_AMOUNT * 2.5) + materials = list(MAT_CATEGORY_ITEM_MATERIAL = SHEET_MATERIAL_AMOUNT*2.5) build_path = /obj/item/clothing/head/helmet/knight/greyscale category = list(RND_CATEGORY_IMPORTED) - - ///////////////////////////////////////// /////////////Security//////////////////// ///////////////////////////////////////// @@ -711,7 +767,7 @@ desc = "A robust flashlight used by security." id = "seclite" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 2500) + materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT*2.5) build_path = /obj/item/flashlight/seclite category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY @@ -748,7 +804,7 @@ desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use." id = "zipties" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 250) + materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT*2.5) build_path = /obj/item/restraints/handcuffs/cable/zipties category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY @@ -783,7 +839,7 @@ name = "Plumbing Constructor" id = "plumbing_rcd" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500, /datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*38, /datum/material/glass = SHEET_MATERIAL_AMOUNT*18, /datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT) build_path = /obj/item/construction/plumbing category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_PLUMBING @@ -857,7 +913,7 @@ name = "Dolphin Gloves" id = "tackle_dolphin" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/plastic = 2500) + materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT*2.5) build_path = /obj/item/clothing/gloves/tackler/dolphin category = list( RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY diff --git a/code/modules/research/designs/smelting_designs.dm b/code/modules/research/designs/smelting_designs.dm index ef9077f562c..925a2d31897 100644 --- a/code/modules/research/designs/smelting_designs.dm +++ b/code/modules/research/designs/smelting_designs.dm @@ -77,7 +77,7 @@ desc = "A sheet of reverse-engineered alien alloy." id = "alienalloy" build_type = SMELTER | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000, /datum/material/plasma = 4000) + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/plasma = SHEET_MATERIAL_AMOUNT*2) build_path = /obj/item/stack/sheet/mineral/abductor category = list( RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index 82640246391..885e2e22273 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -7,7 +7,7 @@ desc = "Special mechanical module made to store, sort, and apply standard machine parts." id = "rped" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 10000, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5) //hardcore + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5) build_path = /obj/item/storage/part_replacer category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_EXCHANGERS @@ -19,7 +19,7 @@ desc = "Powered by bluespace technology, this RPED variant can upgrade buildings from a distance, without needing to remove the panel first." id = "bs_rped" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 15000, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver = 2500) //hardcore + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT*2.5) build_path = /obj/item/storage/part_replacer/bluespace category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_EXCHANGERS @@ -45,7 +45,7 @@ desc = "A stock part used in the construction of various devices." id = "adv_capacitor" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 150, /datum/material/glass = 150) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT*1.5) build_path = /obj/item/stock_parts/capacitor/adv category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -98,7 +98,7 @@ desc = "A stock part used in the construction of various devices." id = "adv_scanning" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 150, /datum/material/glass =SMALL_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/scanning_module/adv category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -111,7 +111,7 @@ desc = "A stock part used in the construction of various devices." id = "phasic_scanning" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass = 150, /datum/material/silver = 60) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass = SMALL_MATERIAL_AMOUNT*1.5, /datum/material/silver = SMALL_MATERIAL_AMOUNT*0.6) build_path = /obj/item/stock_parts/scanning_module/phasic category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -124,7 +124,7 @@ desc = "A stock part used in the construction of various devices." id = "triphasic_scanning" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2, /datum/material/diamond = 30, /datum/material/bluespace = 30) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2, /datum/material/diamond = SMALL_MATERIAL_AMOUNT*0.3, /datum/material/bluespace = SMALL_MATERIAL_AMOUNT*0.5) build_path = /obj/item/stock_parts/scanning_module/triphasic category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -151,7 +151,7 @@ desc = "A stock part used in the construction of various devices." id = "nano_servo" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 150) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.5) build_path = /obj/item/stock_parts/servo/nano category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -177,7 +177,7 @@ desc = "A stock part used in the construction of various devices." id = "femto_servo" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/diamond = 30, /datum/material/titanium = 30) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/diamond = SMALL_MATERIAL_AMOUNT*0.3, /datum/material/titanium = SMALL_MATERIAL_AMOUNT*0.3) build_path = /obj/item/stock_parts/servo/femto category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -204,7 +204,7 @@ desc = "A stock part used in the construction of various devices." id = "high_micro_laser" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 150, /datum/material/glass =SMALL_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/micro_laser/high category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -217,7 +217,7 @@ desc = "A stock part used in the construction of various devices." id = "ultra_micro_laser" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass = 150, /datum/material/uranium = 60) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass = SMALL_MATERIAL_AMOUNT*1.5, /datum/material/uranium = SMALL_MATERIAL_AMOUNT*0.6) build_path = /obj/item/stock_parts/micro_laser/ultra category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 @@ -230,7 +230,7 @@ desc = "A stock part used in the construction of various devices." id = "quadultra_micro_laser" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2, /datum/material/uranium =SMALL_MATERIAL_AMOUNT, /datum/material/diamond = 60) + materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass =SMALL_MATERIAL_AMOUNT * 2, /datum/material/uranium =SMALL_MATERIAL_AMOUNT, /datum/material/diamond = SMALL_MATERIAL_AMOUNT*0.6) build_path = /obj/item/stock_parts/micro_laser/quadultra category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -256,7 +256,7 @@ desc = "A stock part used in the construction of various devices." id = "adv_matter_bin" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 150) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.5) build_path = /obj/item/stock_parts/matter_bin/adv category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 @@ -282,7 +282,7 @@ desc = "A stock part used in the construction of various devices." id = "bluespace_matter_bin" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 250, /datum/material/diamond =SMALL_MATERIAL_AMOUNT, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT) + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*2.5, /datum/material/diamond =SMALL_MATERIAL_AMOUNT, /datum/material/bluespace =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/matter_bin/bluespace category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4 @@ -356,7 +356,7 @@ desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." id = "s_crystal" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/glass = 800, /datum/material/silver =SMALL_MATERIAL_AMOUNT, /datum/material/gold =SMALL_MATERIAL_AMOUNT) + materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT*8, /datum/material/silver =SMALL_MATERIAL_AMOUNT, /datum/material/gold =SMALL_MATERIAL_AMOUNT) build_path = /obj/item/stock_parts/subspace/crystal category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_TELECOMMS @@ -380,7 +380,7 @@ desc = "A small magnetic card reader, used for devices that take and transmit holocredits." id = "c-reader" build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=10) + materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.1) build_path = /obj/item/stock_parts/card_reader category = list( RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_MISC diff --git a/code/modules/research/designs/wiremod_designs.dm b/code/modules/research/designs/wiremod_designs.dm index 7e07a641f82..7e40b8e9f2b 100644 --- a/code/modules/research/designs/wiremod_designs.dm +++ b/code/modules/research/designs/wiremod_designs.dm @@ -32,7 +32,7 @@ RND_CATEGORY_CIRCUITRY + RND_CATEGORY_CIRCUITRY_CORE ) // Yes, it would make sense to make them take plastic, but then less people would make them, and I think they're cool - materials = list(/datum/material/iron = 2500) + materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT*2.5) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/component @@ -463,7 +463,7 @@ id = "controller_shell" build_path = /obj/item/controller build_type = COMPONENT_PRINTER - materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 7000) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = SHEET_MATERIAL_AMOUNT*3.5) category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS ) @@ -474,7 +474,7 @@ id = "scanner_shell" build_path = /obj/item/wiremod_scanner build_type = COMPONENT_PRINTER - materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 7000) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = SHEET_MATERIAL_AMOUNT*3.5) category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS ) @@ -484,7 +484,7 @@ desc = "A handheld shell that allows the user to input a string" id = "keyboard_shell" build_path = /obj/item/keyboard_shell - materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 10000) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = SHEET_MATERIAL_AMOUNT*5) build_type = COMPONENT_PRINTER category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS @@ -496,7 +496,7 @@ id = "gun_shell" build_path = /obj/item/gun/energy/wiremod_gun build_type = COMPONENT_PRINTER - materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 10000, /datum/material/plasma =SMALL_MATERIAL_AMOUNT) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT) category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS ) @@ -507,7 +507,7 @@ id = "bot_shell" build_path = /obj/item/shell/bot build_type = COMPONENT_PRINTER - materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 10000) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = SHEET_MATERIAL_AMOUNT*5) category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS ) @@ -518,7 +518,7 @@ id = "money_bot_shell" build_path = /obj/item/shell/money_bot build_type = COMPONENT_PRINTER - materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = 10000, /datum/material/gold =SMALL_MATERIAL_AMOUNT*0.5) + materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/gold =SMALL_MATERIAL_AMOUNT*0.5) category = list( RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_SHELLS ) @@ -531,7 +531,7 @@ build_type = COMPONENT_PRINTER materials = list( /datum/material/glass =SHEET_MATERIAL_AMOUNT, - /datum/material/iron = 11000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*5.5, /datum/material/gold =SMALL_MATERIAL_AMOUNT*5, ) category = list( @@ -544,7 +544,7 @@ id = "server_shell" materials = list( /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, - /datum/material/iron = 15000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, ) build_path = /obj/item/shell/server @@ -559,7 +559,7 @@ id = "door_shell" materials = list( /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, - /datum/material/iron = 15000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5, ) build_path = /obj/item/shell/airlock build_type = COMPONENT_PRINTER @@ -573,7 +573,7 @@ id = "dispenser_shell" materials = list( /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, - /datum/material/iron = 15000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5, ) build_path = /obj/item/shell/dispenser build_type = COMPONENT_PRINTER @@ -587,7 +587,7 @@ id = "bci_shell" materials = list( /datum/material/glass =SHEET_MATERIAL_AMOUNT, - /datum/material/iron = 8000, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*4, ) build_path = /obj/item/shell/bci build_type = COMPONENT_PRINTER @@ -600,8 +600,8 @@ desc = "A scanner gate shell that performs mid-depth scans on people when they pass through it." id = "scanner_gate_shell" materials = list( - /datum/material/glass = 4000, - /datum/material/iron = 12000, + /datum/material/glass = SHEET_MATERIAL_AMOUNT*2, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*6, ) build_path = /obj/item/shell/scanner_gate build_type = COMPONENT_PRINTER