From 5bb851b771b6859fd85b40d64724282717ddc027 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 4 Sep 2015 16:32:18 -0400 Subject: [PATCH] Pass II --- .../research/designs/AI_module_designs.dm | 54 ++--- .../research/designs/autolathe_designs.dm | 136 +++++------ .../research/designs/bluespace_designs.dm | 26 +-- .../research/designs/comp_board_designs.dm | 72 +++--- .../research/designs/equipment_designs.dm | 22 +- .../research/designs/janitorial_designs.dm | 8 +- .../research/designs/machine_designs.dm | 86 +++---- .../modules/research/designs/mecha_designs.dm | 32 +-- .../designs/mechfabricator_designs.dm | 214 +++++++++--------- .../research/designs/medical_designs.dm | 38 ++-- .../research/designs/mining_designs.dm | 12 +- code/modules/research/designs/misc_designs.dm | 14 +- .../modules/research/designs/power_designs.dm | 16 +- .../research/designs/spacepod_designs.dm | 22 +- .../research/designs/stock_parts_designs.dm | 44 ++-- .../research/designs/telecomms_designs.dm | 46 ++-- .../research/designs/weapon_designs.dm | 38 ++-- .../modules/shieldgen/circuits_and_designs.dm | 6 +- 18 files changed, 443 insertions(+), 443 deletions(-) diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm index f58f8075893..01de6f63848 100644 --- a/code/modules/research/designs/AI_module_designs.dm +++ b/code/modules/research/designs/AI_module_designs.dm @@ -8,27 +8,27 @@ id = "freeform_module" req_tech = list("programming" = 4, "materials" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_GOLD = 100) build_path = /obj/item/weapon/aiModule/freeform category = list("AI Modules") - + /datum/design/onecrewmember_module name = "AI Module (oneCrewMember)" desc = "Allows for the construction of a oneCrewMember AI Module." id = "onecrewmember_module" req_tech = list("programming" = 4, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100) build_path = /obj/item/weapon/aiModule/oneCrewMember category = list("AI Modules") - + /datum/design/oxygen_module name = "AI Module (OxygenIsToxicToHumans)" desc = "Allows for the construction of a Safeguard AI Module." id = "oxygen_module" req_tech = list("programming" = 3, "biotech" = 2, "materials" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_GOLD = 100) build_path = /obj/item/weapon/aiModule/oxygen category = list("AI Modules") @@ -38,9 +38,9 @@ id = "protectstation_module" req_tech = list("programming" = 3, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_GOLD = 100) build_path = /obj/item/weapon/aiModule/protectStation - category = list("AI Modules") + category = list("AI Modules") /datum/design/purge_module name = "AI Module (Purge)" @@ -48,7 +48,7 @@ id = "purge_module" req_tech = list("programming" = 4, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) + materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_DIAMOND = 100) build_path = /obj/item/weapon/aiModule/purge category = list("AI Modules") @@ -58,27 +58,27 @@ id = "quarantine_module" req_tech = list("programming" = 3, "biotech" = 2, "materials" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_GOLD = 100) build_path = /obj/item/weapon/aiModule/quarantine category = list("AI Modules") - + /datum/design/reset_module name = "AI Module (Reset)" desc = "Allows for the construction of a Reset AI Module." id = "reset_module" req_tech = list("programming" = 3, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_GOLD = 100) build_path = /obj/item/weapon/aiModule/reset category = list("AI Modules") - + /datum/design/safeguard_module name = "AI Module (Safeguard)" desc = "Allows for the construction of a Safeguard AI Module." id = "safeguard_module" req_tech = list("programming" = 3, "materials" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_GOLD = 100) build_path = /obj/item/weapon/aiModule/safeguard category = list("AI Modules") @@ -88,47 +88,47 @@ id = "antimov_module" req_tech = list("programming" = 4, "materials" = 6, "syndicate" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100) build_path = /obj/item/weapon/aiModule/antimov - category = list("AI Modules") - + category = list("AI Modules") + /datum/design/asimov name = "Core AI Module (Asimov)" desc = "Allows for the construction of a Asimov AI Core Module." id = "asimov_module" req_tech = list("programming" = 3, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100) build_path = /obj/item/weapon/aiModule/asimov - category = list("AI Modules") - + category = list("AI Modules") + /datum/design/corporate_module name = "Core AI Module (Corporate)" desc = "Allows for the construction of a Corporate AI Core Module." id = "corporate_module" req_tech = list("programming" = 4, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100) build_path = /obj/item/weapon/aiModule/corp category = list("AI Modules") - + /datum/design/crewsimov name = "Core AI Module (Crewsimov)" desc = "Allows for the construction of a Crewsimov AI Core Module." id = "crewsimov_module" req_tech = list("programming" = 3, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100) build_path = /obj/item/weapon/aiModule/crewsimov - category = list("AI Modules") - + category = list("AI Modules") + /datum/design/freeformcore_module name = "Core AI Module (Freeform)" desc = "Allows for the construction of a Freeform AI Core Module." id = "freeformcore_module" req_tech = list("programming" = 4, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100) build_path = /obj/item/weapon/aiModule/freeformcore category = list("AI Modules") @@ -138,7 +138,7 @@ id = "paladin_module" req_tech = list("programming" = 4, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100) build_path = /obj/item/weapon/aiModule/paladin category = list("AI Modules") @@ -148,6 +148,6 @@ id = "tyrant_module" req_tech = list("programming" = 4, "syndicate" = 2, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) + materials = list(MAT_GLASS = 1000, "sacid" = 20, MAT_DIAMOND = 100) build_path = /obj/item/weapon/aiModule/tyrant category = list("AI Modules") diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index d58d23f09cf..e68cf4df4c4 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -6,7 +6,7 @@ name = "Analyzer" id = "analyzer" build_type = AUTOLATHE - materials = list("$metal" = 30, "$glass" = 20) + materials = list(MAT_METAL = 30, MAT_GLASS = 20) build_path = /obj/item/device/analyzer category = list("initial","Tools") @@ -14,7 +14,7 @@ name = "Bucket" id = "bucket" build_type = AUTOLATHE - materials = list("$metal" = 200) + materials = list(MAT_METAL = 200) build_path = /obj/item/weapon/reagent_containers/glass/bucket category = list("initial","Tools") @@ -22,7 +22,7 @@ name = "Pocket Crowbar" id = "crowbar" build_type = AUTOLATHE - materials = list("$metal" = 50) + materials = list(MAT_METAL = 50) build_path = /obj/item/weapon/crowbar category = list("initial","Tools") @@ -30,7 +30,7 @@ name = "Fire Extinguisher" id = "extinguisher" build_type = AUTOLATHE - materials = list("$metal" = 90) + materials = list(MAT_METAL = 90) build_path = /obj/item/weapon/extinguisher category = list("initial","Tools") @@ -38,7 +38,7 @@ name = "Flashlight" id = "flashlight" build_type = AUTOLATHE - materials = list("$metal" = 50, "$glass" = 20) + materials = list(MAT_METAL = 50, MAT_GLASS = 20) build_path = /obj/item/device/flashlight category = list("initial","Tools") @@ -46,7 +46,7 @@ name = "Multitool" id = "multitool" build_type = AUTOLATHE - materials = list("$metal" = 50, "$glass" = 20) + materials = list(MAT_METAL = 50, MAT_GLASS = 20) build_path = /obj/item/device/multitool category = list("initial","Tools") @@ -54,7 +54,7 @@ name = "Screwdriver" id = "screwdriver" build_type = AUTOLATHE - materials = list("$metal" = 75) + materials = list(MAT_METAL = 75) build_path = /obj/item/weapon/screwdriver category = list("initial","Tools") @@ -62,7 +62,7 @@ name = "T-ray Scanner" id = "tscanner" build_type = AUTOLATHE - materials = list("$metal" = 150) + materials = list(MAT_METAL = 150) build_path = /obj/item/device/t_scanner category = list("initial","Tools") @@ -70,7 +70,7 @@ name = "Welding Helmet" id = "welding_helmet" build_type = AUTOLATHE - materials = list("$metal" = 1750, "$glass" = 400) + materials = list(MAT_METAL = 1750, MAT_GLASS = 400) build_path = /obj/item/clothing/head/welding category = list("initial","Tools") @@ -78,7 +78,7 @@ name = "Welding Tool" id = "welding_tool" build_type = AUTOLATHE - materials = list("$metal" = 70, "$glass" = 20) + materials = list(MAT_METAL = 70, MAT_GLASS = 20) build_path = /obj/item/weapon/weldingtool category = list("initial","Tools") @@ -86,7 +86,7 @@ name = "Wirecutters" id = "wirecutters" build_type = AUTOLATHE - materials = list("$metal" = 80) + materials = list(MAT_METAL = 80) build_path = /obj/item/weapon/wirecutters category = list("initial","Tools") @@ -94,7 +94,7 @@ name = "Wrench" id = "wrench" build_type = AUTOLATHE - materials = list("$metal" = 150) + materials = list(MAT_METAL = 150) build_path = /obj/item/weapon/wrench category = list("initial","Tools") @@ -102,7 +102,7 @@ name = "Spraycan" id = "spraycan" build_type = AUTOLATHE - materials = list("$metal" = 100, "$glass" = 100) + materials = list(MAT_METAL = 100, MAT_GLASS = 100) build_path = /obj/item/toy/crayon/spraycan category = list("initial", "Tools") @@ -110,7 +110,7 @@ name = "Air Alarm Electronics" id = "airalarm_electronics" build_type = AUTOLATHE - materials = list("$metal" = 50, "$glass" = 50) + materials = list(MAT_METAL = 50, MAT_GLASS = 50) build_path = /obj/item/weapon/airalarm_electronics category = list("initial", "Electronics") @@ -118,7 +118,7 @@ name = "Airlock Electronics" id = "airlock_board" build_type = AUTOLATHE - materials = list("$metal" = 50, "$glass" = 50) + materials = list(MAT_METAL = 50, MAT_GLASS = 50) build_path = /obj/item/weapon/airlock_electronics category = list("initial", "Electronics") @@ -126,7 +126,7 @@ name = "Intercom Electronics" id = "intercom_electronics" build_type = AUTOLATHE - materials = list("$metal" = 50, "$glass" = 50) + materials = list(MAT_METAL = 50, MAT_GLASS = 50) build_path = /obj/item/weapon/intercom_electronics category = list("initial", "Electronics") @@ -134,7 +134,7 @@ name = "Console Screen" id = "console_screen" build_type = AUTOLATHE - materials = list("$glass" = 200) + materials = list(MAT_GLASS = 200) build_path = /obj/item/weapon/stock_parts/console_screen category = list("initial", "Electronics") @@ -142,7 +142,7 @@ name = "Fire Alarm Electronics" id = "firealarm_electronics" build_type = AUTOLATHE - materials = list("$metal" = 50, "$glass" = 50) + materials = list(MAT_METAL = 50, MAT_GLASS = 50) build_path = /obj/item/weapon/firealarm_electronics category = list("initial", "Electronics") @@ -150,7 +150,7 @@ name = "Igniter" id = "igniter" build_type = AUTOLATHE - materials = list("$metal" = 500, "$glass" = 50) + materials = list(MAT_METAL = 500, MAT_GLASS = 50) build_path = /obj/item/device/assembly/igniter category = list("initial", "Miscellaneous") @@ -158,7 +158,7 @@ name = "Infrared Emitter" id = "infrared_emitter" build_type = AUTOLATHE - materials = list("$metal" = 1000, "$glass" = 500) + materials = list(MAT_METAL = 1000, MAT_GLASS = 500) build_path = /obj/item/device/assembly/infra category = list("initial", "Miscellaneous") @@ -166,7 +166,7 @@ name = "Kitchen knife" id = "kitchen_knife" build_type = AUTOLATHE - materials = list("$metal" = 12000) + materials = list(MAT_METAL = 12000) build_path = /obj/item/weapon/kitchenknife category = list("initial","Miscellaneous") @@ -174,7 +174,7 @@ name = "Pipe Painter" id = "pipe_painter" build_type = AUTOLATHE - materials = list("$metal" = 5000, "$glass" = 2000) + materials = list(MAT_METAL = 5000, MAT_GLASS = 2000) build_path = /obj/item/device/pipe_painter category = list("initial", "Miscellaneous") @@ -182,7 +182,7 @@ name = "Proximity Sensor" id = "prox_sensor" build_type = AUTOLATHE - materials = list("$metal" = 800, "$glass" = 200) + materials = list(MAT_METAL = 800, MAT_GLASS = 200) build_path = /obj/item/device/assembly/prox_sensor category = list("initial", "Miscellaneous") @@ -190,7 +190,7 @@ name = "Mousetrap" id = "mousetrap" build_type = AUTOLATHE - materials = list("$metal" = 800, "$glass" = 200) + materials = list(MAT_METAL = 800, MAT_GLASS = 200) build_path = /obj/item/device/assembly/mousetrap category = list("initial", "Miscellaneous") @@ -198,7 +198,7 @@ name = "Timer" id = "timer" build_type = AUTOLATHE - materials = list("$metal" = 500, "$glass" = 50) + materials = list(MAT_METAL = 500, MAT_GLASS = 50) build_path = /obj/item/device/assembly/timer category = list("initial", "Miscellaneous") @@ -206,7 +206,7 @@ name = "Universal Recorder" id = "recorder" build_type = AUTOLATHE - materials = list("$metal" = 60, "$glass" = 30) + materials = list(MAT_METAL = 60, MAT_GLASS = 30) build_path = /obj/item/device/taperecorder/empty category = list("initial", "Miscellaneous") @@ -214,7 +214,7 @@ name = "Tape" id = "tape" build_type = AUTOLATHE - materials = list("$metal" = 20, "$glass" = 5) + materials = list(MAT_METAL = 20, MAT_GLASS = 5) build_path = /obj/item/device/tape/random category = list("initial", "Miscellaneous") @@ -222,7 +222,7 @@ name = "Voice Analyser" id = "voice_analyser" build_type = AUTOLATHE - materials = list("$metal" = 500, "$glass" = 50) + materials = list(MAT_METAL = 500, MAT_GLASS = 50) build_path = /obj/item/device/assembly/voice category = list("initial", "Miscellaneous") @@ -230,7 +230,7 @@ name = "11px by 11px Canvas" id = "canvas" build_type = AUTOLATHE - materials = list("$metal" = 50) + materials = list(MAT_METAL = 50) build_path = /obj/item/weapon/canvas category = list("initial", "Miscellaneous") @@ -238,7 +238,7 @@ name = "19px by 19px Canvas" id = "canvas19x19" build_type = AUTOLATHE - materials = list("$metal" = 50) + materials = list(MAT_METAL = 50) build_path = /obj/item/weapon/canvas/nineteenXnineteen category = list("initial", "Miscellaneous") @@ -246,7 +246,7 @@ name = "23px by 19px Canvas" id = "canvas23x19" build_type = AUTOLATHE - materials = list("$metal" = 70) + materials = list(MAT_METAL = 70) build_path = /obj/item/weapon/canvas/twentythreeXnineteen category = list("initial", "Miscellaneous") @@ -254,7 +254,7 @@ name = "23px by 23px Canvas" id = "canvas23x23" build_type = AUTOLATHE - materials = list("$metal" = 100) + materials = list(MAT_METAL = 100) build_path = /obj/item/weapon/canvas/twentythreeXtwentythree category = list("initial", "Miscellaneous") @@ -262,7 +262,7 @@ name = "Camera Assembly" id = "camera_assembly" build_type = AUTOLATHE - materials = list("$metal" = 400, "$glass" = 250) + materials = list(MAT_METAL = 400, MAT_GLASS = 250) build_path = /obj/item/weapon/camera_assembly category = list("initial", "Construction") @@ -270,7 +270,7 @@ name = "Glass" id = "glass" build_type = AUTOLATHE - materials = list("$glass" = MINERAL_MATERIAL_AMOUNT) + materials = list(MAT_GLASS = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/glass category = list("initial","Construction") @@ -278,7 +278,7 @@ name = "Light Bulb" id = "light_bulb" build_type = AUTOLATHE - materials = list("$metal" = 60, "$glass" = 100) + materials = list(MAT_METAL = 60, MAT_GLASS = 100) build_path = /obj/item/weapon/light/bulb category = list("initial", "Construction") @@ -286,7 +286,7 @@ name = "Light Tube" id = "light_tube" build_type = AUTOLATHE - materials = list("$metal" = 60, "$glass" = 100) + materials = list(MAT_METAL = 60, MAT_GLASS = 100) build_path = /obj/item/weapon/light/tube category = list("initial", "Construction") @@ -294,7 +294,7 @@ name = "Metal" id = "metal" build_type = AUTOLATHE - materials = list("$metal" = 3750) + materials = list(MAT_METAL = 3750) build_path = /obj/item/stack/sheet/metal category = list("initial","Construction") @@ -302,7 +302,7 @@ name = "Newscaster Frame" id = "newscaster_frame" build_type = AUTOLATHE - materials = list("$metal" = 14000, "$glass" = 8000) + materials = list(MAT_METAL = 14000, MAT_GLASS = 8000) build_path = /obj/item/mounted/frame/newscaster_frame category = list("initial", "Construction") @@ -310,7 +310,7 @@ name = "Compressed Matter Cardridge" id = "rcd_ammo" build_type = AUTOLATHE - materials = list("$metal" = 16000, "$glass"=8000) + materials = list(MAT_METAL = 16000, MAT_GLASS=8000) build_path = /obj/item/weapon/rcd_ammo category = list("initial","Construction") @@ -318,7 +318,7 @@ name = "Reinforced Glass" id = "rglass" build_type = AUTOLATHE - materials = list("$metal" = 1875, "$glass" = MINERAL_MATERIAL_AMOUNT) + materials = list(MAT_METAL = 1875, MAT_GLASS = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/rglass category = list("initial","Construction") @@ -326,7 +326,7 @@ name = "Metal Rod" id = "rods" build_type = AUTOLATHE - materials = list("$metal" = 1875) + materials = list(MAT_METAL = 1875) build_path = /obj/item/stack/rods category = list("initial","Construction") @@ -334,7 +334,7 @@ name = "Beaker" id = "beaker" build_type = AUTOLATHE - materials = list("$glass" = 500) + materials = list(MAT_GLASS = 500) build_path = /obj/item/weapon/reagent_containers/glass/beaker category = list("initial", "Medical") @@ -342,7 +342,7 @@ name = "Cautery" id = "cautery" build_type = AUTOLATHE - materials = list("$metal" = 2500, "$glass" = 750) + materials = list(MAT_METAL = 2500, MAT_GLASS = 750) build_path = /obj/item/weapon/cautery category = list("initial", "Medical") @@ -350,7 +350,7 @@ name = "Circular Saw" id = "circular_saw" build_type = AUTOLATHE - materials = list("$metal" = 10000, "$glass" = 6000) + materials = list(MAT_METAL = 10000, MAT_GLASS = 6000) build_path = /obj/item/weapon/circular_saw category = list("initial", "Medical") @@ -358,7 +358,7 @@ name = "Hemostat" id = "hemostat" build_type = AUTOLATHE - materials = list("$metal" = 5000, "$glass" = 2500) + materials = list(MAT_METAL = 5000, MAT_GLASS = 2500) build_path = /obj/item/weapon/hemostat category = list("initial", "Medical") @@ -366,7 +366,7 @@ name = "Large Beaker" id = "large_beaker" build_type = AUTOLATHE - materials = list("$glass" = 2500) + materials = list(MAT_GLASS = 2500) build_path = /obj/item/weapon/reagent_containers/glass/beaker/large category = list("initial", "Medical") @@ -374,7 +374,7 @@ name = "Retractor" id = "retractor" build_type = AUTOLATHE - materials = list("$metal" = 6000, "$glass" = 3000) + materials = list(MAT_METAL = 6000, MAT_GLASS = 3000) build_path = /obj/item/weapon/retractor category = list("initial", "Medical") @@ -382,7 +382,7 @@ name = "Scalpel" id = "scalpel" build_type = AUTOLATHE - materials = list("$metal" = 4000, "$glass" = 1000) + materials = list(MAT_METAL = 4000, MAT_GLASS = 1000) build_path = /obj/item/weapon/scalpel category = list("initial", "Medical") @@ -390,7 +390,7 @@ name = "Surgical Drill" id = "surgicaldrill" build_type = AUTOLATHE - materials = list("$metal" = 10000, "$glass" = 6000) + materials = list(MAT_METAL = 10000, MAT_GLASS = 6000) build_path = /obj/item/weapon/surgicaldrill category = list("initial", "Medical") @@ -398,7 +398,7 @@ name = "Syringe" id = "syringe" build_type = AUTOLATHE - materials = list("$metal" = 10, "$glass" = 20) + materials = list(MAT_METAL = 10, MAT_GLASS = 20) build_path = /obj/item/weapon/reagent_containers/syringe category = list("initial", "Medical") @@ -406,7 +406,7 @@ name = "Beanbag Slug" id = "beanbag_slug" build_type = AUTOLATHE - materials = list("$metal" = 250) + materials = list(MAT_METAL = 250) build_path = /obj/item/ammo_casing/shotgun/beanbag category = list("initial", "Security") @@ -414,7 +414,7 @@ name = "Speed Loader (.38)" id = "c38" build_type = AUTOLATHE - materials = list("$metal" = 30000) + materials = list(MAT_METAL = 30000) build_path = /obj/item/ammo_box/c38 category = list("initial", "Security") @@ -422,7 +422,7 @@ name = "Radio Headset" id = "radio_headset" build_type = AUTOLATHE - materials = list("$metal" = 75) + materials = list(MAT_METAL = 75) build_path = /obj/item/device/radio/headset category = list("initial", "Communication") @@ -430,7 +430,7 @@ name = "Remote Signaling Device" id = "signaler" build_type = AUTOLATHE - materials = list("$metal" = 400, "$glass" = 120) + materials = list(MAT_METAL = 400, MAT_GLASS = 120) build_path = /obj/item/device/assembly/signaler category = list("initial", "Communication") @@ -438,7 +438,7 @@ name = "Station Bounced Radio" id = "bounced_radio" build_type = AUTOLATHE - materials = list("$metal" = 75, "$glass" = 25) + materials = list(MAT_METAL = 75, MAT_GLASS = 25) build_path = /obj/item/device/radio/off category = list("initial", "Communication") @@ -447,7 +447,7 @@ name = "Ammo Box (.45)" id = "c45" build_type = AUTOLATHE - materials = list("$metal" = 30000) + materials = list(MAT_METAL = 30000) build_path = /obj/item/ammo_box/c45 category = list("hacked", "Security") @@ -455,7 +455,7 @@ name = "Ammo Box (.357)" id = "a357" build_type = AUTOLATHE - materials = list("$metal" = 30000) + materials = list(MAT_METAL = 30000) build_path = /obj/item/ammo_box/a357 category = list("hacked", "Security") @@ -463,7 +463,7 @@ name = "Ammo Box (9mm)" id = "c9mm" build_type = AUTOLATHE - materials = list("$metal" = 30000) + materials = list(MAT_METAL = 30000) build_path = /obj/item/ammo_box/c9mm category = list("hacked", "Security") @@ -471,7 +471,7 @@ name = "Ammo Box (10mm)" id = "c10mm" build_type = AUTOLATHE - materials = list("$metal" = 30000) + materials = list(MAT_METAL = 30000) build_path = /obj/item/ammo_box/c10mm category = list("hacked", "Security") @@ -479,7 +479,7 @@ name = "Buckshot Shell" id = "buckshot_shell" build_type = AUTOLATHE - materials = list("$metal" = 4000) + materials = list(MAT_METAL = 4000) build_path = /obj/item/ammo_casing/shotgun/buckshot category = list("hacked", "Security") @@ -487,7 +487,7 @@ name = "Electropack" id = "electropack" build_type = AUTOLATHE - materials = list("$metal" = 10000, "$glass" = 2500) + materials = list(MAT_METAL = 10000, MAT_GLASS = 2500) build_path = /obj/item/device/radio/electropack category = list("hacked", "Tools") @@ -495,7 +495,7 @@ name = "Flamethrower" id = "flamethrower" build_type = AUTOLATHE - materials = list("$metal" = 500) + materials = list(MAT_METAL = 500) build_path = /obj/item/weapon/flamethrower/full category = list("hacked", "Security") @@ -503,7 +503,7 @@ name = "Handcuffs" id = "handcuffs" build_type = AUTOLATHE - materials = list("$metal" = 500) + materials = list(MAT_METAL = 500) build_path = /obj/item/weapon/restraints/handcuffs category = list("hacked", "Security") @@ -511,7 +511,7 @@ name = "Incendiary Slug" id = "incendiary_slug" build_type = AUTOLATHE - materials = list("$metal" = 4000) + materials = list(MAT_METAL = 4000) build_path = /obj/item/ammo_casing/shotgun/incendiary category = list("hacked", "Security") @@ -519,7 +519,7 @@ name = "Industrial Welding Tool" id = "large_welding_tool" build_type = AUTOLATHE - materials = list("$metal" = 70, "$glass" = 60) + materials = list(MAT_METAL = 70, MAT_GLASS = 60) build_path = /obj/item/weapon/weldingtool/largetank category = list("hacked", "Tools") @@ -527,7 +527,7 @@ name = "Rapid Construction Device (RCD)" id = "rcd" build_type = AUTOLATHE - materials = list("$metal" = 30000) + materials = list(MAT_METAL = 30000) build_path = /obj/item/weapon/rcd category = list("hacked", "Construction") @@ -535,7 +535,7 @@ name = "Shotgun Dart" id = "shotgun_dart" build_type = AUTOLATHE - materials = list("$metal" = 4000) + materials = list(MAT_METAL = 4000) build_path = /obj/item/ammo_casing/shotgun/dart category = list("hacked", "Security") @@ -543,6 +543,6 @@ name = "Shotgun Slug" id = "shotgun_slug" build_type = AUTOLATHE - materials = list("$metal" = 4000) + materials = list(MAT_METAL = 4000) build_path = /obj/item/ammo_casing/shotgun category = list("hacked", "Security") diff --git a/code/modules/research/designs/bluespace_designs.dm b/code/modules/research/designs/bluespace_designs.dm index 13b3dcadf7c..13a1923c76f 100644 --- a/code/modules/research/designs/bluespace_designs.dm +++ b/code/modules/research/designs/bluespace_designs.dm @@ -7,40 +7,40 @@ id = "bluespace_crystal" req_tech = list("bluespace" = 4, "materials" = 6) build_type = PROTOLATHE - materials = list("$diamond" = 1500, "$plasma" = 1500) + materials = list(MAT_DIAMOND = 1500, MAT_PLASMA = 1500) reliability_base = 100 build_path = /obj/item/bluespace_crystal/artificial - category = list("Bluespace") - + category = list("Bluespace") + /datum/design/bag_holding name = "Bag of Holding" desc = "A backpack that opens into a localized pocket of Blue Space." id = "bag_holding" req_tech = list("bluespace" = 4, "materials" = 6) build_type = PROTOLATHE - materials = list("$gold" = 3000, "$diamond" = 1500, "$uranium" = 250) + materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 1500, MAT_URANIUM = 250) reliability_base = 80 build_path = /obj/item/weapon/storage/backpack/holding category = list("Bluespace") - + /datum/design/bluespace_belt name = "Belt of Holding" desc = "An astonishingly complex belt popularized by a rich blue-space technology magnate." id = "bluespace_belt" req_tech = list("bluespace" = 4, "materials" = 6) build_type = PROTOLATHE - materials = list("$gold" = 1500, "$diamond" = 3000, "$uranium" = 1000) + materials = list(MAT_GOLD = 1500, MAT_DIAMOND = 3000, MAT_URANIUM = 1000) reliability_base = 80 build_path = /obj/item/weapon/storage/belt/bluespace category = list("Bluespace") - + /datum/design/bluespacebeaker name = "Bluespace Beaker" desc = "A bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 300 units." id = "bluespacebeaker" req_tech = list("bluespace" = 2, "materials" = 6) build_type = PROTOLATHE - materials = list("$metal" = 3000, "$plasma" = 3000, "$diamond" = 500) + materials = list(MAT_METAL = 3000, MAT_PLASMA = 3000, MAT_DIAMOND = 500) reliability_base = 76 build_path = /obj/item/weapon/reagent_containers/glass/beaker/bluespace category = list("Medical") @@ -51,17 +51,17 @@ id = "telesci_Gps" req_tech = list("materials" = 2, "magnets" = 3, "bluespace" = 3) build_type = PROTOLATHE - materials = list("$metal" = 500, "$glass" = 1000) + materials = list(MAT_METAL = 500, MAT_GLASS = 1000) build_path = /obj/item/device/gps category = list("Bluespace") - + /datum/design/miningsatchel_holding name = "Mining Satchel of Holding" desc = "A mining satchel that can hold an infinite amount of ores." id = "minerbag_holding" req_tech = list("bluespace" = 3, "materials" = 4) build_type = PROTOLATHE - materials = list("$gold" = 250, "$uranium" = 500) //quite cheap, for more convenience + materials = list(MAT_GOLD = 250, MAT_URANIUM = 500) //quite cheap, for more convenience reliability = 100 build_path = /obj/item/weapon/storage/bag/ore/holding category = list("Bluespace") @@ -72,7 +72,7 @@ id = "telepad_beacon" req_tech = list("bluespace" = 3, "materials" = 4) build_type = PROTOLATHE - materials = list ("$metal" = 2000, "$glass" = 1750, "$silver" = 500) + materials = list (MAT_METAL = 2000, MAT_GLASS = 1750, MAT_SILVER = 500) build_path = /obj/item/device/telepad_beacon category = list("Bluespace") @@ -82,6 +82,6 @@ id = "beacon" req_tech = list("bluespace" = 1) build_type = PROTOLATHE - materials = list ("$metal" = 20, "$glass" = 10) + materials = list (MAT_METAL = 20, MAT_GLASS = 10) build_path = /obj/item/device/radio/beacon category = list("Bluespace") \ No newline at end of file diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index 7318429f7e7..416f901c455 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -8,7 +8,7 @@ id = "aicore" req_tech = list("programming" = 4, "biotech" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/aicore category = list("Computer Boards") @@ -18,7 +18,7 @@ id = "aifixer" req_tech = list("programming" = 3, "biotech" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/aifixer category = list("Computer Boards") @@ -28,7 +28,7 @@ id = "aiupload" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/aiupload category = list("Computer Boards") @@ -38,7 +38,7 @@ id = "atmosalerts" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/atmos_alert category = list("Computer Boards") @@ -48,7 +48,7 @@ id = "air_management" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/air_management category = list("Computer Boards") @@ -58,7 +58,7 @@ id = "seccamera" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/camera category = list("Computer Boards") @@ -68,7 +68,7 @@ id = "clonecontrol" req_tech = list("programming" = 3, "biotech" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/cloning category = list("Computer Boards") @@ -78,7 +78,7 @@ id = "comconsole" req_tech = list("programming" = 2, "magnets" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/communications category = list("Computer Boards") @@ -88,7 +88,7 @@ id = "crewconsole" req_tech = list("programming" = 3, "magnets" = 2, "biotech" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/crew category = list("Computer Boards") @@ -98,7 +98,7 @@ id = "borgupload" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/borgupload category = list("Computer Boards") @@ -108,7 +108,7 @@ id = "scan_console" req_tech = list("programming" = 2, "biotech" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/scan_consolenew category = list("Computer Boards") @@ -118,7 +118,7 @@ id = "dronecontrol" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/drone_control category = list("Computer Boards") @@ -128,7 +128,7 @@ id = "mechacontrol" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha_control category = list("Computer Boards") @@ -138,7 +138,7 @@ id = "idcardconsole" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/card category = list("Computer Boards") @@ -148,7 +148,7 @@ id = "mechapower" req_tech = list("programming" = 2, "powerstorage" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mech_bay_power_console category = list("Computer Boards") @@ -158,7 +158,7 @@ id = "med_data" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/med_data category = list("Computer Boards") @@ -168,7 +168,7 @@ id = "message_monitor" req_tech = list("programming" = 5) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/message_monitor category = list("Computer Boards") @@ -178,7 +178,7 @@ id = "operating" req_tech = list("programming" = 2, "biotech" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/operating category = list("Computer Boards") @@ -188,7 +188,7 @@ id = "powermonitor" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/powermonitor category = list("Computer Boards") @@ -198,7 +198,7 @@ id = "prisonmanage" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/prisoner category = list("Computer Boards") @@ -208,7 +208,7 @@ id = "rdconsole" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/rdconsole category = list("Computer Boards") @@ -218,7 +218,7 @@ id = "rdservercontrol" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/rdservercontrol category = list("Computer Boards") @@ -228,7 +228,7 @@ id = "robocontrol" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/robotics category = list("Computer Boards") @@ -238,7 +238,7 @@ id = "secdata" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/secure_data category = list("Computer Boards") @@ -248,7 +248,7 @@ id = "solarcontrol" req_tech = list("programming" = 2, "powerstorage" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/solar_control category = list("Computer Boards") @@ -258,7 +258,7 @@ id = "spacepodc" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/pod_locater category = list("Computer Boards") @@ -268,7 +268,7 @@ id = "ordercomp" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/ordercomp category = list("Computer Boards") @@ -278,7 +278,7 @@ id = "supplycomp" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/supplycomp category = list("Computer Boards") @@ -288,7 +288,7 @@ id = "comm_monitor" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/comm_monitor category = list("Computer Boards") @@ -298,7 +298,7 @@ id = "comm_server" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/comm_server category = list("Computer Boards") @@ -308,7 +308,7 @@ id = "comm_traffic" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/comm_traffic category = list("Computer Boards") @@ -318,7 +318,7 @@ id = "telesci_console" req_tech = list("programming" = 3, "bluespace" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/telesci_console category = list("Computer Boards") @@ -328,7 +328,7 @@ id = "teleconsole" req_tech = list("programming" = 3, "bluespace" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/teleporter category = list("Computer Boards") @@ -338,7 +338,7 @@ datum/design/GAC id = "GAC" req_tech = list("programming" = 3, "magnets" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/air_management datum/design/tank_control @@ -347,7 +347,7 @@ datum/design/tank_control id = "tankcontrol" req_tech = list("programming" = 3, "magnets" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/large_tank_control datum/design/AAC @@ -356,5 +356,5 @@ datum/design/AAC id = "AAC" req_tech = list("programming" = 4, "magnets" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/atmos_automation diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm index ab78834a877..9cdefac2cb6 100644 --- a/code/modules/research/designs/equipment_designs.dm +++ b/code/modules/research/designs/equipment_designs.dm @@ -7,7 +7,7 @@ id = "health_hud" req_tech = list("biotech" = 2, "magnets" = 3) build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) + materials = list(MAT_METAL = 50, MAT_GLASS = 50) build_path = /obj/item/clothing/glasses/hud/health category = list("Equipment") @@ -17,7 +17,7 @@ id = "magboots" req_tech = list("materials" = 4, "magnets" = 4, "engineering" = 5) build_type = PROTOLATHE - materials = list("$metal" = 4500, "$silver" = 1500, "$gold" = 2500) + materials = list(MAT_METAL = 4500, MAT_SILVER = 1500, MAT_GOLD = 2500) build_path = /obj/item/clothing/shoes/magboots category = list("Equipment") @@ -27,7 +27,7 @@ id = "night_vision_goggles" req_tech = list("magnets" = 4) build_type = PROTOLATHE - materials = list("$metal" = 100, "$glass" = 100, "$uranium" = 1000) + materials = list(MAT_METAL = 100, MAT_GLASS = 100, MAT_URANIUM = 1000) build_path = /obj/item/clothing/glasses/night category = list("Equipment") @@ -37,7 +37,7 @@ id = "health_hud_night" req_tech = list("biotech" = 4, "magnets" = 5) build_type = PROTOLATHE - materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$silver" = 250) + materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_URANIUM = 1000, MAT_SILVER = 250) build_path = /obj/item/clothing/glasses/hud/health/night category = list("Equipment") @@ -47,7 +47,7 @@ id = "security_hud_night" req_tech = list("magnets" = 5, "combat" = 4) build_type = PROTOLATHE - materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$gold" = 350) + materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_URANIUM = 1000, MAT_GOLD = 350) build_path = /obj/item/clothing/glasses/hud/security/night category = list("Equipment") @@ -57,7 +57,7 @@ id = "nvgmesons" req_tech = list("materials" = 5, "magnets" = 5, "engineering" = 4) build_type = PROTOLATHE - materials = list("$metal" = 300, "$glass" = 400, "$plasma" = 250, "$uranium" = 1000) + materials = list(MAT_METAL = 300, MAT_GLASS = 400, MAT_PLASMA = 250, MAT_URANIUM = 1000) build_path = /obj/item/clothing/glasses/meson/night category = list("Equipment") @@ -67,7 +67,7 @@ id = "mesons" req_tech = list("materials" = 3, "magnets" = 3, "engineering" = 3) build_type = PROTOLATHE - materials = list("$metal" = 200, "$glass" = 300, "$plasma" = 100) + materials = list(MAT_METAL = 200, MAT_GLASS = 300, MAT_PLASMA = 100) build_path = /obj/item/clothing/glasses/meson category = list("Equipment") @@ -77,7 +77,7 @@ id = "security_hud" req_tech = list("magnets" = 3, "combat" = 2) build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) + materials = list(MAT_METAL = 50, MAT_GLASS = 50) build_path = /obj/item/clothing/glasses/hud/security category = list("Equipment") @@ -87,7 +87,7 @@ id = "air_horn" req_tech = list("materials" = 2, "engineering" = 2) build_type = PROTOLATHE - materials = list("$metal" = 4000, "$bananium" = 1000) + materials = list(MAT_METAL = 4000, MAT_BANANIUM = 1000) build_path = /obj/item/weapon/bikehorn/airhorn category = list("Equipment") @@ -97,7 +97,7 @@ id = "weldingmask" req_tech = list("materials" = 2, "engineering" = 2) build_type = PROTOLATHE - materials = list("$metal" = 4000, "$glass" = 1000) + materials = list(MAT_METAL = 4000, MAT_GLASS = 1000) build_path = /obj/item/clothing/mask/gas/welding category = list("Equipment") @@ -107,7 +107,7 @@ id = "detectivescanner" req_tech = list("biotech" = 2, "magnets" = 4) build_type = PROTOLATHE - materials = list("$metal" = 6000, "$glass" = 2000) + materials = list(MAT_METAL = 6000, MAT_GLASS = 2000) build_path = /obj/item/device/detective_scanner locked = 1 //no validhunting scientists. category = list("Equipment") \ No newline at end of file diff --git a/code/modules/research/designs/janitorial_designs.dm b/code/modules/research/designs/janitorial_designs.dm index 3d81f8614ef..76a469d04e6 100644 --- a/code/modules/research/designs/janitorial_designs.dm +++ b/code/modules/research/designs/janitorial_designs.dm @@ -7,7 +7,7 @@ id = "advmop" req_tech = list("materials" = 4, "engineering" = 3) build_type = PROTOLATHE - materials = list("$metal" = 2500, "$glass" = 200) + materials = list(MAT_METAL = 2500, MAT_GLASS = 200) build_path = /obj/item/weapon/mop/advanced category = list("Janitorial") @@ -17,16 +17,16 @@ id = "holosign" req_tech = list("magnets" = 3, "powerstorage" = 2) build_type = PROTOLATHE - materials = list("$metal" = 2000, "$glass" = 1000) + materials = list(MAT_METAL = 2000, MAT_GLASS = 1000) build_path = /obj/item/weapon/holosign_creator category = list("Janitorial") - + /datum/design/light_replacer name = "Light Replacer" desc = "A device to automatically replace lights. Refill with working lightbulbs." id = "light_replacer" req_tech = list("magnets" = 3, "materials" = 4) build_type = PROTOLATHE - materials = list("$metal" = 1500, "$silver" = 150, "$glass" = 3000) + materials = list(MAT_METAL = 1500, MAT_SILVER = 150, MAT_GLASS = 3000) build_path = /obj/item/device/lightreplacer category = list("Janitorial") \ No newline at end of file diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index f7c2252dbd9..7a2e7046de1 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -8,7 +8,7 @@ id = "thermomachine" req_tech = list("programming" = 3, "plasmatech" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/thermomachine category = list ("Engineering Machinery") @@ -18,7 +18,7 @@ id = "smes" req_tech = list("programming" = 4, "power" = 5, "engineering" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/smes category = list ("Engineering Machinery") @@ -28,7 +28,7 @@ id = "emitter" req_tech = list("programming" = 4, "powerstorage" = 5, "engineering" = 5) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/emitter category = list ("Engineering Machinery") @@ -38,7 +38,7 @@ id = "telepad" req_tech = list("programming" = 4, "bluespace" = 4, "materials" = 3, "engineering" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/telesci_pad category = list ("Teleportation Machinery") @@ -48,7 +48,7 @@ id = "tele_hub" req_tech = list("programming" = 3, "bluespace" = 5, "materials" = 4, "engineering" = 5) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/teleporter_hub category = list ("Teleportation Machinery") @@ -58,7 +58,7 @@ id = "tele_station" req_tech = list("programming" = 4, "bluespace" = 4, "engineering" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/teleporter_station category = list ("Teleportation Machinery") @@ -68,7 +68,7 @@ id = "bodyscanner" req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3, "engineering" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/bodyscanner category = list("Medical Machinery") @@ -78,7 +78,7 @@ id = "bodyscanner_console" req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3, "engineering" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/bodyscanner_console category = list("Medical Machinery") @@ -88,7 +88,7 @@ id = "clonepod" req_tech = list("programming" = 3, "biotech" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/clonepod category = list("Medical Machinery") @@ -98,7 +98,7 @@ id = "clonescanner" req_tech = list("programming" = 3, "biotech" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/clonescanner category = list("Medical Machinery") @@ -108,7 +108,7 @@ id = "cryotube" req_tech = list("programming" = 4, "biotech" = 3, "engineering" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/cryo_tube category = list("Medical Machinery") @@ -118,7 +118,7 @@ id = "chem_dispenser" req_tech = list("programming" = 4, "biotech" = 3, "engineering" = 4, "materials" = 4, "plasmatech" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/chem_dispenser category = list("Medical Machinery") @@ -128,7 +128,7 @@ id = "chem_heater" req_tech = list("engineering" = 2, "materials" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/chem_heater category = list ("Medical Machinery") @@ -138,7 +138,7 @@ id = "sleeper" req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3, "engineering" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/sleeper category = list("Medical Machinery") @@ -148,7 +148,7 @@ id = "sleeper_console" req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3, "engineering" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/sleep_console category = list("Medical Machinery") @@ -158,7 +158,7 @@ id = "biogenerator" req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/biogenerator category = list ("Hydroponics Machinery") @@ -168,7 +168,7 @@ id = "hydro_tray" req_tech = list("programming" = 1, "biotech" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/hydroponics category = list ("Hydroponics Machinery") @@ -178,7 +178,7 @@ id = "autolathe" req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/autolathe category = list("Research Machinery") @@ -188,7 +188,7 @@ id = "circuit_imprinter" req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/circuit_imprinter category = list("Research Machinery") @@ -198,7 +198,7 @@ id = "cyborgrecharger" req_tech = list("powerstorage" = 3, "engineering" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/cyborgrecharger category = list("Research Machinery") @@ -208,7 +208,7 @@ id = "destructive_analyzer" req_tech = list("programming" = 2, "magnets" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/destructive_analyzer category = list("Research Machinery") @@ -218,7 +218,7 @@ id = "mechfab" req_tech = list("programming" = 3, "engineering" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mechfab category = list("Research Machinery") @@ -228,7 +228,7 @@ id = "mech_recharger" req_tech = list("programming" = 3, "powerstorage" = 4, "engineering" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mech_recharger category = list("Research Machinery") @@ -238,7 +238,7 @@ id = "protolathe" req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/protolathe category = list("Research Machinery") @@ -248,7 +248,7 @@ id = "rdserver" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/rdserver category = list("Research Machinery") @@ -258,7 +258,7 @@ id = "gibber" req_tech = list("programming" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/gibber category = list ("Misc. Machinery") @@ -268,7 +268,7 @@ id = "smartfridge" req_tech = list("programming" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/smartfridge category = list ("Misc. Machinery") @@ -278,7 +278,7 @@ id = "monkey_recycler" req_tech = list("programming" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/monkey_recycler category = list ("Misc. Machinery") @@ -288,7 +288,7 @@ id = "seed_extractor" req_tech = list("programming" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/seed_extractor category = list ("Misc. Machinery") @@ -298,7 +298,7 @@ id = "processor" req_tech = list("programming" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/processor category = list ("Misc. Machinery") @@ -308,7 +308,7 @@ id = "recycler" req_tech = list("programming" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/recycler category = list ("Misc. Machinery") @@ -318,7 +318,7 @@ id = "holopad" req_tech = list("programming" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/holopad category = list ("Misc. Machinery") @@ -328,7 +328,7 @@ id = "arcademachinebattle" req_tech = list("programming" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/arcade/battle category = list("Misc. Machinery") @@ -338,7 +338,7 @@ id = "microwave" req_tech = list("programming" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/microwave category = list("Misc. Machinery") @@ -348,7 +348,7 @@ id = "oven" req_tech = list("programming" = 1, "plasmatech" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/oven category = list("Misc. Machinery") @@ -358,7 +358,7 @@ id = "grill" req_tech = list("programming" = 1, "plasmatech" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/grill category = list("Misc. Machinery") @@ -368,7 +368,7 @@ id = "candymaker" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/candy_maker category = list("Misc. Machinery") @@ -378,7 +378,7 @@ id = "arcademachineonion" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/arcade/orion_trail category = list("Misc. Machinery") @@ -388,7 +388,7 @@ id = "selunload" req_tech = list("programming" = 5) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list(MAT_GLASS = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/programmable category = list("Misc. Machinery") @@ -398,7 +398,7 @@ id = "vendor" req_tech = list("programming" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/vendor category = list("Misc. Machinery") @@ -408,7 +408,7 @@ id = "pod" req_tech = list("programming" = 2,"engineering" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list(MAT_GLASS = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/pod category = list("Misc. Machinery") @@ -418,7 +418,7 @@ id = "ore_redemption" req_tech = list("programming" = 1, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass"=1000, "sacid"=20) + materials = list(MAT_GLASS=1000, "sacid"=20) build_path = /obj/item/weapon/circuitboard/ore_redemption category = list ("Misc. Machinery") @@ -428,6 +428,6 @@ id = "mining_equipment_vendor" req_tech = list("programming" = 1, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass"=1000, "sacid"=20) + materials = list(MAT_GLASS=1000, "sacid"=20) build_path = /obj/item/weapon/circuitboard/mining_equipment_vendor category = list ("Misc. Machinery") \ No newline at end of file diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm index f1f58a0ca0e..842fde52857 100644 --- a/code/modules/research/designs/mecha_designs.dm +++ b/code/modules/research/designs/mecha_designs.dm @@ -8,7 +8,7 @@ id = "ripley_main" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/ripley/main category = list("Exosuit Modules") @@ -18,7 +18,7 @@ id = "ripley_peri" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/ripley/peripherals category = list("Exosuit Modules") @@ -29,7 +29,7 @@ id = "odysseus_main" req_tech = list("programming" = 3,"biotech" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/odysseus/main category = list("Exosuit Modules") @@ -39,7 +39,7 @@ id = "odysseus_peri" req_tech = list("programming" = 3,"biotech" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/odysseus/peripherals category = list("Exosuit Modules") @@ -50,7 +50,7 @@ id = "gygax_main" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/gygax/main category = list("Exosuit Modules") @@ -60,7 +60,7 @@ id = "gygax_peri" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/gygax/peripherals category = list("Exosuit Modules") @@ -70,7 +70,7 @@ id = "gygax_targ" req_tech = list("programming" = 4, "combat" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/gygax/targeting category = list("Exosuit Modules") @@ -81,7 +81,7 @@ id = "durand_main" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/durand/main category = list("Exosuit Modules") @@ -91,7 +91,7 @@ id = "durand_peri" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/durand/peripherals category = list("Exosuit Modules") @@ -101,7 +101,7 @@ id = "durand_targ" req_tech = list("programming" = 4, "combat" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/durand/targeting category = list("Exosuit Modules") @@ -112,7 +112,7 @@ id = "phazon_main" req_tech = list("programming" = 5, "materials" = 7, "powerstorage" = 6) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/phazon/main category = list("Exosuit Modules") @@ -122,7 +122,7 @@ id = "phazon_peri" req_tech = list("programming" = 5, "bluespace" = 6) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/phazon/peripherals category = list("Exosuit Modules") @@ -132,7 +132,7 @@ id = "phazon_targ" req_tech = list("programming" = 5, "magnets" = 6) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/phazon/targeting category = list("Exosuit Modules") @@ -143,7 +143,7 @@ id = "honker_main" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/honker/main category = list("Exosuit Modules") @@ -153,7 +153,7 @@ id = "honker_peri" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/honker/peripherals category = list("Exosuit Modules") @@ -163,6 +163,6 @@ id = "honker_targ" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/honker/targeting category = list("Exosuit Modules") diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 2ae7d1216d3..62acc4f884b 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -7,7 +7,7 @@ id = "borg_suit" build_type = MECHFAB build_path = /obj/item/robot_parts/robot_suit - materials = list("$metal"=15000) + materials = list(MAT_METAL=15000) construction_time = 500 category = list("Cyborg") @@ -16,7 +16,7 @@ id = "borg_chest" build_type = MECHFAB build_path = /obj/item/robot_parts/chest - materials = list("$metal"=40000) + materials = list(MAT_METAL=40000) construction_time = 350 category = list("Cyborg") @@ -25,7 +25,7 @@ id = "borg_head" build_type = MECHFAB build_path = /obj/item/robot_parts/head - materials = list("$metal"=5000) + materials = list(MAT_METAL=5000) construction_time = 350 category = list("Cyborg") @@ -34,7 +34,7 @@ id = "borg_l_arm" build_type = MECHFAB build_path = /obj/item/robot_parts/l_arm - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 200 category = list("Cyborg") @@ -43,7 +43,7 @@ id = "borg_r_arm" build_type = MECHFAB build_path = /obj/item/robot_parts/r_arm - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 200 category = list("Cyborg") @@ -52,7 +52,7 @@ id = "borg_l_leg" build_type = MECHFAB build_path = /obj/item/robot_parts/l_leg - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 200 category = list("Cyborg") @@ -61,7 +61,7 @@ id = "borg_r_leg" build_type = MECHFAB build_path = /obj/item/robot_parts/r_leg - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 200 category = list("Cyborg") @@ -71,7 +71,7 @@ id = "borg_binary_communication" build_type = MECHFAB build_path = /obj/item/robot_parts/robot_component/binary_communication_device - materials = list("$metal"=2500, "$glass"=1000) + materials = list(MAT_METAL=2500, MAT_GLASS=1000) construction_time = 200 category = list("Cyborg Repair") @@ -80,7 +80,7 @@ id = "borg_radio" build_type = MECHFAB build_path = /obj/item/robot_parts/robot_component/radio - materials = list("$metal"=2500, "$glass"=1000) + materials = list(MAT_METAL=2500, MAT_GLASS=1000) construction_time = 200 category = list("Cyborg Repair") @@ -89,7 +89,7 @@ id = "borg_actuator" build_type = MECHFAB build_path = /obj/item/robot_parts/robot_component/actuator - materials = list("$metal"=3500) + materials = list(MAT_METAL=3500) construction_time = 200 category = list("Cyborg Repair") @@ -98,7 +98,7 @@ id = "borg_diagnosis_unit" build_type = MECHFAB build_path = /obj/item/robot_parts/robot_component/diagnosis_unit - materials = list("$metal"=3500) + materials = list(MAT_METAL=3500) construction_time = 200 category = list("Cyborg Repair") @@ -107,7 +107,7 @@ id = "borg_camera" build_type = MECHFAB build_path = /obj/item/robot_parts/robot_component/camera - materials = list("$metal"=2500, "$glass"=1000) + materials = list(MAT_METAL=2500, MAT_GLASS=1000) construction_time = 200 category = list("Cyborg Repair") @@ -116,7 +116,7 @@ id = "borg_armor" build_type = MECHFAB build_path = /obj/item/robot_parts/robot_component/armour - materials = list("$metal"=5000) + materials = list(MAT_METAL=5000) construction_time = 200 category = list("Cyborg Repair") @@ -126,7 +126,7 @@ id = "ripley_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/ripley - materials = list("$metal"=20000) + materials = list(MAT_METAL=20000) construction_time = 100 category = list("Ripley") @@ -136,7 +136,7 @@ id = "firefighter_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/firefighter - materials = list("$metal"=20000) + materials = list(MAT_METAL=20000) construction_time = 100 category = list("Firefighter") @@ -145,7 +145,7 @@ id = "ripley_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/ripley_torso - materials = list("$metal"=20000, "$glass"=7500) + materials = list(MAT_METAL=20000, MAT_GLASS=7500) construction_time = 200 category = list("Ripley","Firefighter") @@ -154,7 +154,7 @@ id = "ripley_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/ripley_left_arm - materials = list("$metal"=15000) + materials = list(MAT_METAL=15000) construction_time = 150 category = list("Ripley","Firefighter") @@ -163,7 +163,7 @@ id = "ripley_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/ripley_right_arm - materials = list("$metal"=15000) + materials = list(MAT_METAL=15000) construction_time = 150 category = list("Ripley","Firefighter") @@ -172,7 +172,7 @@ id = "ripley_left_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/ripley_left_leg - materials = list("$metal"=15000) + materials = list(MAT_METAL=15000) construction_time = 150 category = list("Ripley","Firefighter") @@ -181,7 +181,7 @@ id = "ripley_right_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/ripley_right_leg - materials = list("$metal"=15000) + materials = list(MAT_METAL=15000) construction_time = 150 category = list("Ripley","Firefighter") @@ -191,7 +191,7 @@ id = "odysseus_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/odysseus - materials = list("$metal"=20000) + materials = list(MAT_METAL=20000) construction_time = 100 category = list("Odysseus") @@ -200,7 +200,7 @@ id = "odysseus_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/odysseus_torso - materials = list("$metal"=12000) + materials = list(MAT_METAL=12000) construction_time = 180 category = list("Odysseus") @@ -209,7 +209,7 @@ id = "odysseus_head" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/odysseus_head - materials = list("$metal"=6000,"$glass"=10000) + materials = list(MAT_METAL=6000,MAT_GLASS=10000) construction_time = 100 category = list("Odysseus") @@ -218,7 +218,7 @@ id = "odysseus_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/odysseus_left_arm - materials = list("$metal"=6000) + materials = list(MAT_METAL=6000) construction_time = 120 category = list("Odysseus") @@ -227,7 +227,7 @@ id = "odysseus_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/odysseus_right_arm - materials = list("$metal"=6000) + materials = list(MAT_METAL=6000) construction_time = 120 category = list("Odysseus") @@ -236,7 +236,7 @@ id = "odysseus_left_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/odysseus_left_leg - materials = list("$metal"=7000) + materials = list(MAT_METAL=7000) construction_time = 130 category = list("Odysseus") @@ -245,7 +245,7 @@ id = "odysseus_right_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/odysseus_right_leg - materials = list("$metal"=7000) + materials = list(MAT_METAL=7000) construction_time = 130 category = list("Odysseus") @@ -255,7 +255,7 @@ id = "gygax_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/gygax - materials = list("$metal"=20000) + materials = list(MAT_METAL=20000) construction_time = 100 category = list("Gygax") @@ -264,7 +264,7 @@ id = "gygax_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_torso - materials = list("$metal"=20000,"$glass"=10000,"$diamond"=2000) + materials = list(MAT_METAL=20000,MAT_GLASS=10000,MAT_DIAMOND=2000) construction_time = 300 category = list("Gygax") @@ -273,7 +273,7 @@ id = "gygax_head" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_head - materials = list("$metal"=10000,"$glass"=5000, "$diamond"=2000) + materials = list(MAT_METAL=10000,MAT_GLASS=5000, MAT_DIAMOND=2000) construction_time = 200 category = list("Gygax") @@ -282,7 +282,7 @@ id = "gygax_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_left_arm - materials = list("$metal"=15000, "$diamond"=1000) + materials = list(MAT_METAL=15000, MAT_DIAMOND=1000) construction_time = 200 category = list("Gygax") @@ -291,7 +291,7 @@ id = "gygax_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_right_arm - materials = list("$metal"=15000, "$diamond"=1000) + materials = list(MAT_METAL=15000, MAT_DIAMOND=1000) construction_time = 200 category = list("Gygax") @@ -300,7 +300,7 @@ id = "gygax_left_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_left_leg - materials = list("$metal"=15000, "$diamond"=2000) + materials = list(MAT_METAL=15000, MAT_DIAMOND=2000) construction_time = 200 category = list("Gygax") @@ -309,7 +309,7 @@ id = "gygax_right_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_right_leg - materials = list("$metal"=15000, "$diamond"=2000) + materials = list(MAT_METAL=15000, MAT_DIAMOND=2000) construction_time = 200 category = list("Gygax") @@ -318,7 +318,7 @@ id = "gygax_armor" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/gygax_armour - materials = list("$metal"=25000,"$diamond"=10000) + materials = list(MAT_METAL=25000,MAT_DIAMOND=10000) construction_time = 600 category = list("Gygax") @@ -328,7 +328,7 @@ id = "durand_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/durand - materials = list("$metal"=25000) + materials = list(MAT_METAL=25000) construction_time = 100 category = list("Durand") @@ -337,7 +337,7 @@ id = "durand_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_torso - materials = list("$metal"=25000,"$glass"=10000,"$silver"=10000) + materials = list(MAT_METAL=25000,MAT_GLASS=10000,MAT_SILVER=10000) construction_time = 300 category = list("Durand") @@ -346,7 +346,7 @@ id = "durand_head" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_head - materials = list("$metal"=10000,"$glass"=15000,"$silver"=2000) + materials = list(MAT_METAL=10000,MAT_GLASS=15000,MAT_SILVER=2000) construction_time = 200 category = list("Durand") @@ -355,7 +355,7 @@ id = "durand_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_left_arm - materials = list("$metal"=10000,"$silver"=4000) + materials = list(MAT_METAL=10000,MAT_SILVER=4000) construction_time = 200 category = list("Durand") @@ -364,7 +364,7 @@ id = "durand_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_right_arm - materials = list("$metal"=10000,"$silver"=4000) + materials = list(MAT_METAL=10000,MAT_SILVER=4000) construction_time = 200 category = list("Durand") @@ -373,7 +373,7 @@ id = "durand_left_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_left_leg - materials = list("$metal"=15000,"$silver"=4000) + materials = list(MAT_METAL=15000,MAT_SILVER=4000) construction_time = 200 category = list("Durand") @@ -382,7 +382,7 @@ id = "durand_right_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_right_leg - materials = list("$metal"=15000,"$silver"=4000) + materials = list(MAT_METAL=15000,MAT_SILVER=4000) construction_time = 200 category = list("Durand") @@ -391,7 +391,7 @@ id = "durand_armor" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/durand_armor - materials = list("$metal"=50000,"$uranium"=30000) + materials = list(MAT_METAL=50000,MAT_URANIUM=30000) construction_time = 600 category = list("Durand") @@ -401,7 +401,7 @@ id = "honk_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/honker - materials = list("$metal"=20000) + materials = list(MAT_METAL=20000) construction_time = 100 category = list("H.O.N.K") @@ -410,7 +410,7 @@ id = "honk_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/honker_torso - materials = list("$metal"=20000,"$glass"=10000,"$bananium"=10000) + materials = list(MAT_METAL=20000,MAT_GLASS=10000,MAT_BANANIUM=10000) construction_time = 300 category = list("H.O.N.K") @@ -419,7 +419,7 @@ id = "honk_head" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/honker_head - materials = list("$metal"=10000,"$glass"=5000,"$bananium"=5000) + materials = list(MAT_METAL=10000,MAT_GLASS=5000,MAT_BANANIUM=5000) construction_time = 200 category = list("H.O.N.K") @@ -428,7 +428,7 @@ id = "honk_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/honker_left_arm - materials = list("$metal"=15000,"$bananium"=5000) + materials = list(MAT_METAL=15000,MAT_BANANIUM=5000) construction_time = 200 category = list("H.O.N.K") @@ -437,7 +437,7 @@ id = "honk_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/honker_right_arm - materials = list("$metal"=15000,"$bananium"=5000) + materials = list(MAT_METAL=15000,MAT_BANANIUM=5000) construction_time = 200 category = list("H.O.N.K") @@ -446,7 +446,7 @@ id = "honk_left_leg" build_type = MECHFAB build_path =/obj/item/mecha_parts/part/honker_left_leg - materials = list("$metal"=20000,"$bananium"=5000) + materials = list(MAT_METAL=20000,MAT_BANANIUM=5000) construction_time = 200 category = list("H.O.N.K") @@ -455,7 +455,7 @@ id = "honk_right_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/honker_right_leg - materials = list("$metal"=20000,"$bananium"=5000) + materials = list(MAT_METAL=20000,MAT_BANANIUM=5000) construction_time = 200 category = list("H.O.N.K") @@ -465,7 +465,7 @@ id = "phazon_chassis" build_type = MECHFAB build_path = /obj/item/mecha_parts/chassis/phazon - materials = list("$metal"=20000) + materials = list(MAT_METAL=20000) construction_time = 100 category = list("Phazon") @@ -474,7 +474,7 @@ id = "phazon_torso" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_torso - materials = list("$metal"=35000,"$glass"=10000,"$plasma"=20000) + materials = list(MAT_METAL=35000,MAT_GLASS=10000,MAT_PLASMA=20000) construction_time = 300 category = list("Phazon") @@ -483,7 +483,7 @@ id = "phazon_head" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_head - materials = list("$metal"=15000,"$glass"=5000,"$plasma"=10000) + materials = list(MAT_METAL=15000,MAT_GLASS=5000,MAT_PLASMA=10000) construction_time = 200 category = list("Phazon") @@ -492,7 +492,7 @@ id = "phazon_left_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_left_arm - materials = list("$metal"=20000,"$plasma"=10000) + materials = list(MAT_METAL=20000,MAT_PLASMA=10000) construction_time = 200 category = list("Phazon") @@ -501,7 +501,7 @@ id = "phazon_right_arm" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_right_arm - materials = list("$metal"=20000,"$plasma"=10000) + materials = list(MAT_METAL=20000,MAT_PLASMA=10000) construction_time = 200 category = list("Phazon") @@ -510,7 +510,7 @@ id = "phazon_left_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_left_leg - materials = list("$metal"=20000,"$plasma"=10000) + materials = list(MAT_METAL=20000,MAT_PLASMA=10000) construction_time = 200 category = list("Phazon") @@ -519,7 +519,7 @@ id = "phazon_right_leg" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_right_leg - materials = list("$metal"=20000,"$plasma"=10000) + materials = list(MAT_METAL=20000,MAT_PLASMA=10000) construction_time = 200 category = list("Phazon") @@ -528,7 +528,7 @@ id = "phazon_armor" build_type = MECHFAB build_path = /obj/item/mecha_parts/part/phazon_armor - materials = list("$metal"=45000,"$plasma"=30000) + materials = list(MAT_METAL=45000,MAT_PLASMA=30000) construction_time = 300 category = list("Phazon") @@ -538,7 +538,7 @@ id = "mech_cable_layer" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/tool/cable_layer - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -547,7 +547,7 @@ id = "mech_drill" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -556,7 +556,7 @@ id = "mech_extinguisher" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/tool/extinguisher - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -565,7 +565,7 @@ id = "mech_hydraulic_clamp" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -574,7 +574,7 @@ id = "mech_sleeper" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/tool/sleeper - materials = list("$metal"=5000,"$glass"=10000) + materials = list(MAT_METAL=5000,MAT_GLASS=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -583,7 +583,7 @@ id = "mech_syringe_gun" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun - materials = list("$metal"=3000,"$glass"=2000) + materials = list(MAT_METAL=3000,MAT_GLASS=2000) construction_time = 200 category = list("Exosuit Equipment") @@ -592,7 +592,7 @@ id = "mech_generator" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/generator - materials = list("$metal"=10000,"$glass"=1000,"$silver"=500) + materials = list(MAT_METAL=10000,MAT_GLASS=1000,MAT_SILVER=500) construction_time = 100 category = list("Exosuit Equipment") @@ -601,7 +601,7 @@ id = "mech_taser" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -610,7 +610,7 @@ id = "mech_lmg" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -619,7 +619,7 @@ id = "mech_banana_mortar" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar - materials = list("$metal"=20000,"$bananium"=5000) + materials = list(MAT_METAL=20000,MAT_BANANIUM=5000) construction_time = 300 category = list("Exosuit Equipment") @@ -628,7 +628,7 @@ id = "mech_honker" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/honker - materials = list("$metal"=20000,"$bananium"=10000) + materials = list(MAT_METAL=20000,MAT_BANANIUM=10000) construction_time = 500 category = list("Exosuit Equipment") @@ -637,7 +637,7 @@ id = "mech_mousetrap_mortar" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar - materials = list("$metal"=20000,"$bananium"=5000) + materials = list(MAT_METAL=20000,MAT_BANANIUM=5000) construction_time = 300 category = list("Exosuit Equipment") @@ -649,7 +649,7 @@ build_type = MECHFAB req_tech = list("materials" = 4, "engineering" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill - materials = list("$metal"=10000,"$diamond"=6500) + materials = list(MAT_METAL=10000,MAT_DIAMOND=6500) construction_time = 100 category = list("Exosuit Equipment") @@ -658,7 +658,7 @@ id = "mech_mscanner" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/tool/mining_scanner - materials = list("$metal"=5000,"$glass"=2500) + materials = list(MAT_METAL=5000,MAT_GLASS=2500) construction_time = 50 category = list("Exosuit Equipment") @@ -669,7 +669,7 @@ build_type = MECHFAB req_tech = list("powerstorage"= 3, "engineering" = 3, "materials" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/generator/nuclear - materials = list("$metal"=10000,"$glass"=1000,"$silver"=500) + materials = list(MAT_METAL=10000,MAT_GLASS=1000,MAT_SILVER=500) construction_time = 100 category = list("Exosuit Equipment") @@ -680,7 +680,7 @@ build_type = MECHFAB req_tech = list("bluespace" = 2, "magnets" = 3, "engineering" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/gravcatapult - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -691,7 +691,7 @@ build_type = MECHFAB req_tech = list("bluespace" = 3, "magnets" = 2) build_path = /obj/item/mecha_parts/mecha_equipment/wormhole_generator - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -702,7 +702,7 @@ build_type = MECHFAB req_tech = list("materials" = 4, "bluespace" = 3, "magnets" = 4, "powerstorage"=4, "engineering" = 4) build_path = /obj/item/mecha_parts/mecha_equipment/tool/rcd - materials = list("$metal"=30000,"$gold"=20000,"$plasma"=25000,"$silver"=20000) + materials = list(MAT_METAL=30000,MAT_GOLD=20000,MAT_PLASMA=25000,MAT_SILVER=20000) construction_time = 1200 category = list("Exosuit Equipment") @@ -713,7 +713,7 @@ build_type = MECHFAB req_tech = list("materials" = 5, "combat" = 4) build_path = /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster - materials = list("$metal"=20000,"$silver"=5000) + materials = list(MAT_METAL=20000,MAT_SILVER=5000) construction_time = 100 category = list("Exosuit Equipment") @@ -724,7 +724,7 @@ build_type = MECHFAB req_tech = list("materials" = 5, "combat" = 5, "engineering"=3) build_path = /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster - materials = list("$metal"=20000,"$gold"=5000) + materials = list(MAT_METAL=20000,MAT_GOLD=5000) construction_time = 100 category = list("Exosuit Equipment") @@ -735,7 +735,7 @@ build_type = MECHFAB req_tech = list("magnets" = 3, "programming" = 3, "engineering" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/repair_droid - materials = list("$metal"=10000,"$glass"=5000,"$gold"=1000,"$silver"=2000) + materials = list(MAT_METAL=10000,MAT_GLASS=5000,MAT_GOLD=1000,MAT_SILVER=2000) construction_time = 100 category = list("Exosuit Equipment") @@ -746,7 +746,7 @@ build_type = MECHFAB req_tech = list("combat"= 5, "materials" = 5, "syndicate" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang - materials = list("$metal"=20000,"$gold"=10000,"$uranium"=10000) + materials = list(MAT_METAL=20000,MAT_GOLD=10000,MAT_URANIUM=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -757,7 +757,7 @@ build_type = MECHFAB req_tech = list("combat" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bolas - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -768,7 +768,7 @@ build_type = MECHFAB req_tech = list("bluespace" = 10, "magnets" = 5) build_path = /obj/item/mecha_parts/mecha_equipment/teleporter - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -779,7 +779,7 @@ build_type = MECHFAB req_tech = list("magnets" = 4, "powerstorage" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay - materials = list("$metal"=10000,"$glass"=2000,"$gold"=2000,"$silver"=3000) + materials = list(MAT_METAL=10000,MAT_GLASS=2000,MAT_GOLD=2000,MAT_SILVER=3000) construction_time = 100 category = list("Exosuit Equipment") @@ -791,7 +791,7 @@ build_type = MECHFAB req_tech = list("combat" = 4, "magnets" = 4) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -802,7 +802,7 @@ build_type = MECHFAB req_tech = list("combat" = 3, "magnets" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -813,7 +813,7 @@ build_type = MECHFAB req_tech = list("combat" = 5, "materials" = 4) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -824,7 +824,7 @@ build_type = MECHFAB req_tech = list("combat" = 4) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 100 category = list("Exosuit Equipment") @@ -835,7 +835,7 @@ build_type = MECHFAB req_tech = list("combat" = 6, "magnets" = 5, "materials" = 5) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion - materials = list("$metal"=20000,"$silver"=6000,"$uranium"=2000) + materials = list(MAT_METAL=20000,MAT_SILVER=6000,MAT_URANIUM=2000) construction_time = 100 category = list("Exosuit Equipment") @@ -846,7 +846,7 @@ build_type = MECHFAB req_tech = list("combat" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang - materials = list("$metal"=22000,"$gold"=6000,"$silver"=8000) + materials = list(MAT_METAL=22000,MAT_GOLD=6000,MAT_SILVER=8000) construction_time = 100 category = list("Exosuit Equipment") @@ -857,7 +857,7 @@ build_type = MECHFAB req_tech = list("combat" = 6, "materials" = 6) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack - materials = list("$metal"=22000,"$gold"=6000,"$silver"=8000) + materials = list(MAT_METAL=22000,MAT_GOLD=6000,MAT_SILVER=8000) construction_time = 100 category = list("Exosuit Equipment") @@ -868,7 +868,7 @@ build_type = MECHFAB req_tech = list("powerstorage"= 3, "engineering" = 3, "materials" = 3, "combat" = 1, "plasma" = 2) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma - materials = list("$metal"=1500, "$glass"=500, "$plasma"=200) + materials = list(MAT_METAL=1500, MAT_GLASS=500, MAT_PLASMA=200) construction_time = 100 category = list("Exosuit Equipment") @@ -880,7 +880,7 @@ build_type = MECHFAB req_tech = list("combat" = 4, "syndicate" = 3) build_path = /obj/item/borg/upgrade/syndicate - materials = list("$metal"=10000,"$glass"=15000,"$diamond" = 10000) + materials = list(MAT_METAL=10000,MAT_GLASS=15000,MAT_DIAMOND = 10000) construction_time = 120 category = list("Cyborg Upgrade Modules") @@ -890,7 +890,7 @@ build_type = MECHFAB build_path = /obj/item/borg/upgrade/jetpack req_tech = list("engineering" = 4, "power" = 4) - materials = list("$metal"=10000, "$plasma"=5000, "$uranium" = 6000) + materials = list(MAT_METAL=10000, MAT_PLASMA=5000, MAT_URANIUM = 6000) construction_time = 120 category = list("Cyborg Upgrade Modules") @@ -900,7 +900,7 @@ build_type = MECHFAB build_path = /obj/item/borg/upgrade/disablercooler req_tech = list("combat" = 5, "power" = 4) - materials = list("$metal"=80000 , "$glass"=6000 , "$gold"= 2000, "$diamond" = 500) + materials = list(MAT_METAL=80000 , MAT_GLASS=6000 , MAT_GOLD= 2000, MAT_DIAMOND = 500) construction_time = 120 category = list("Cyborg Upgrade Modules") @@ -909,7 +909,7 @@ id = "borg_upgrade_rename" build_type = MECHFAB build_path = /obj/item/borg/upgrade/rename - materials = list("$metal"=35000) + materials = list(MAT_METAL=35000) construction_time = 120 category = list("Cyborg Upgrade Modules") @@ -918,7 +918,7 @@ id = "borg_upgrade_reset" build_type = MECHFAB build_path = /obj/item/borg/upgrade/reset - materials = list("$metal"=10000) + materials = list(MAT_METAL=10000) construction_time = 120 category = list("Cyborg Upgrade Modules") @@ -927,7 +927,7 @@ id = "borg_upgrade_restart" build_type = MECHFAB build_path = /obj/item/borg/upgrade/restart - materials = list("$metal"=60000 , "$glass"=5000) + materials = list(MAT_METAL=60000 , MAT_GLASS=5000) construction_time = 120 category = list("Cyborg Upgrade Modules") @@ -937,7 +937,7 @@ build_type = MECHFAB build_path = /obj/item/borg/upgrade/vtec req_tech = list("engineering" = 4, "materials" = 5) - materials = list("$metal"=80000 , "$glass"=6000 , "$uranium"= 5000) + materials = list(MAT_METAL=80000 , MAT_GLASS=6000 , MAT_URANIUM= 5000) construction_time = 120 category = list("Cyborg Upgrade Modules") @@ -947,7 +947,7 @@ build_type = MECHFAB build_path = /obj/item/borg/upgrade/ddrill req_tech = list("engineering" = 5, "materials" = 5) - materials = list("$metal"=10000, "$diamond"=3750) + materials = list(MAT_METAL=10000, MAT_DIAMOND=3750) construction_time = 120 category = list("Cyborg Upgrade Modules") @@ -957,7 +957,7 @@ build_type = MECHFAB build_path = /obj/item/borg/upgrade/soh req_tech = list("engineering" = 5, "materials" = 5, "bluespace" = 3) - materials = list("$metal" = 10000, "$gold" = 250, "$uranium" = 500) + materials = list(MAT_METAL = 10000, MAT_GOLD = 250, MAT_URANIUM = 500) construction_time = 120 category = list("Cyborg Upgrade Modules") @@ -967,33 +967,33 @@ id = "mecha_tracking" build_type = MECHFAB build_path =/obj/item/mecha_parts/mecha_tracking - materials = list("$metal"=500) + materials = list(MAT_METAL=500) construction_time = 50 category = list("Misc") - + /datum/design/ipc_head name = "IPC Head" id = "ipc_head" build_type = MECHFAB build_path = /obj/item/organ/external/head/ipc - materials = list("$metal"=15000, "$glass"=5000) + materials = list(MAT_METAL=15000, MAT_GLASS=5000) construction_time = 350 category = list("Misc") - + /datum/design/ipc_cell name = "IPC Microbattery" id = "ipc_cell" build_type = MECHFAB build_path = /obj/item/organ/cell - materials = list("$metal"=2000, "$glass"=750) + materials = list(MAT_METAL=2000, MAT_GLASS=750) construction_time = 200 category = list("Misc") - + /datum/design/ipc_optics name = "IPC Optical Sensor" id = "ipc_optics" build_type = MECHFAB build_path = /obj/item/organ/optical_sensor - materials = list("$metal"=1000, "$glass"=2500) + materials = list(MAT_METAL=1000, MAT_GLASS=2500) construction_time = 200 category = list("Misc") \ No newline at end of file diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index f38479d0c93..cf945134663 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -7,7 +7,7 @@ id = "adv_mass_spectrometer" req_tech = list("biotech" = 2, "magnets" = 4) build_type = PROTOLATHE - materials = list("$metal" = 30, "$glass" = 20) + materials = list(MAT_METAL = 30, MAT_GLASS = 20) reliability_base = 74 build_path = "/obj/item/device/mass_spectrometer/adv" category = list("Medical") @@ -18,7 +18,7 @@ id = "adv_reagent_scanner" req_tech = list("biotech" = 2, "magnets" = 4) build_type = PROTOLATHE - materials = list("$metal" = 30, "$glass" = 20) + materials = list(MAT_METAL = 30, MAT_GLASS = 20) reliability_base = 74 build_path = /obj/item/device/reagent_scanner/adv category = list("Medical") @@ -29,7 +29,7 @@ id = "splitbeaker" req_tech = list("materials" = 2) build_type = PROTOLATHE - materials = list("$metal" = 3000) + materials = list(MAT_METAL = 3000) reliability_base = 76 build_path = /obj/item/weapon/reagent_containers/glass/beaker/noreact category = list("Medical") @@ -40,7 +40,7 @@ id = "cyborg_analyzer" req_tech = list("programming" = 2, "biotech" = 2, "magnets" = 2) build_type = PROTOLATHE - materials = list("$metal" = 30, "$glass" = 20) + materials = list(MAT_METAL = 30, MAT_GLASS = 20) reliability_base = 76 build_path = /obj/item/device/robotanalyzer category = list("Medical") @@ -51,7 +51,7 @@ id = "healthanalyzer" req_tech = list("biotech" = 2, "magnets" = 2) build_type = PROTOLATHE - materials = list("$metal" = 20, "$glass" = 20) + materials = list(MAT_METAL = 20, MAT_GLASS = 20) build_path = /obj/item/device/healthanalyzer category = list("Medical") @@ -61,7 +61,7 @@ id = "healthanalyzer_upgrade" req_tech = list("biotech" = 2, "magnets" = 3) build_type = PROTOLATHE - materials = list("$metal" = 20, "$glass" = 20) + materials = list(MAT_METAL = 20, MAT_GLASS = 20) build_path = /obj/item/device/healthupgrade category = list("Medical") @@ -71,7 +71,7 @@ id = "defib" req_tech = list("materials" = 7, "biotech" = 5, "powerstorage" = 5) build_type = PROTOLATHE - materials = list("$metal" = 5000, "$glass" = 2000, "$silver" = 1000) + materials = list(MAT_METAL = 5000, MAT_GLASS = 2000, MAT_SILVER = 1000) reliability = 76 build_path = /obj/item/weapon/defibrillator category = list("Medical") @@ -83,7 +83,7 @@ id = "sensor_device" req_tech = list("biotech" = 4, "magnets" = 3, "materials" = 3) build_type = PROTOLATHE - materials = list("$metal" = 30, "$glass" = 20) + materials = list(MAT_METAL = 30, MAT_GLASS = 20) reliability_base = 76 build_path = /obj/item/device/sensor_device category = list("Medical") @@ -94,7 +94,7 @@ id = "mmi" req_tech = list("programming" = 2, "biotech" = 3) build_type = PROTOLATHE | MECHFAB - materials = list("$metal" = 1000, "$glass" = 500) + materials = list(MAT_METAL = 1000, MAT_GLASS = 500) construction_time = 75 reliability_base = 76 build_path = /obj/item/device/mmi @@ -106,7 +106,7 @@ id = "mass_spectrometer" req_tech = list("biotech" = 2, "magnets" = 2) build_type = PROTOLATHE - materials = list("$metal" = 30, "$glass" = 20) + materials = list(MAT_METAL = 30, MAT_GLASS = 20) reliability_base = 76 build_path = /obj/item/device/mass_spectrometer category = list("Medical") @@ -117,7 +117,7 @@ id = "posibrain" req_tech = list("engineering" = 4, "materials" = 6, "bluespace" = 2, "programming" = 4) build_type = PROTOLATHE - materials = list("$metal" = 2000, "$glass" = 1000, "$silver" = 1000, "$gold" = 500, "$plasma" = 500, "$diamond" = 100) + materials = list(MAT_METAL = 2000, MAT_GLASS = 1000, MAT_SILVER = 1000, MAT_GOLD = 500, MAT_PLASMA = 500, MAT_DIAMOND = 100) build_path = /obj/item/device/mmi/posibrain category = list("Misc","Medical") @@ -127,7 +127,7 @@ id = "mmi_radio" req_tech = list("programming" = 2, "biotech" = 4) build_type = PROTOLATHE | MECHFAB - materials = list("$metal" = 1200, "$glass" = 500) + materials = list(MAT_METAL = 1200, MAT_GLASS = 500) construction_time = 75 reliability_base = 74 build_path = /obj/item/device/mmi/radio_enabled @@ -139,7 +139,7 @@ id = "nanopaste" req_tech = list("materials" = 4, "engineering" = 3) build_type = PROTOLATHE - materials = list("$metal" = 7000, "$glass" = 7000) + materials = list(MAT_METAL = 7000, MAT_GLASS = 7000) build_path = /obj/item/stack/nanopaste category = list("Medical") @@ -149,7 +149,7 @@ id = "reagent_scanner" req_tech = list("biotech" = 2, "magnets" = 2) build_type = PROTOLATHE - materials = list("$metal" = 30, "$glass" = 20) + materials = list(MAT_METAL = 30, MAT_GLASS = 20) reliability_base = 76 build_path = /obj/item/device/reagent_scanner category = list("Medical") @@ -160,7 +160,7 @@ id = "sflash" req_tech = list("magnets" = 3, "combat" = 2) build_type = MECHFAB - materials = list("$metal" = 750, "$glass" = 750) + materials = list(MAT_METAL = 750, MAT_GLASS = 750) construction_time = 100 reliability_base = 76 build_path = /obj/item/device/flash/synthetic @@ -172,7 +172,7 @@ id = "scalpel_laser1" req_tech = list("biotech" = 2, "materials" = 2, "magnets" = 2) build_type = PROTOLATHE - materials = list("$metal" = 12500, "$glass" = 7500) + materials = list(MAT_METAL = 12500, MAT_GLASS = 7500) build_path = /obj/item/weapon/scalpel/laser1 category = list("Medical") @@ -182,7 +182,7 @@ id = "scalpel_laser2" req_tech = list("biotech" = 3, "materials" = 4, "magnets" = 4) build_type = PROTOLATHE - materials = list("$metal" = 12500, "$glass" = 7500, "$silver" = 2500) + materials = list(MAT_METAL = 12500, MAT_GLASS = 7500, MAT_SILVER = 2500) build_path = /obj/item/weapon/scalpel/laser2 category = list("Medical") @@ -192,7 +192,7 @@ id = "scalpel_laser3" req_tech = list("biotech" = 4, "materials" = 6, "magnets" = 5) build_type = PROTOLATHE - materials = list("$metal" = 12500, "$glass" = 7500, "$silver" = 2000, "$gold" = 1500) + materials = list(MAT_METAL = 12500, MAT_GLASS = 7500, MAT_SILVER = 2000, MAT_GOLD = 1500) build_path = /obj/item/weapon/scalpel/laser3 category = list("Medical") @@ -202,6 +202,6 @@ id = "scalpel_manager" req_tech = list("biotech" = 4, "materials" = 7, "magnets" = 5, "programming" = 4) build_type = PROTOLATHE - materials = list ("$metal" = 12500, "$glass" = 7500, "$silver" = 1500, "$gold" = 1500, "$diamond" = 750) + materials = list (MAT_METAL = 12500, MAT_GLASS = 7500, MAT_SILVER = 1500, MAT_GOLD = 1500, MAT_DIAMOND = 750) build_path = /obj/item/weapon/scalpel/manager category = list("Medical") \ No newline at end of file diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm index c78e79ca50f..32a4012926f 100644 --- a/code/modules/research/designs/mining_designs.dm +++ b/code/modules/research/designs/mining_designs.dm @@ -7,7 +7,7 @@ id = "drill_diamond" req_tech = list("materials" = 6, "powerstorage" = 4, "engineering" = 4) build_type = PROTOLATHE - materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed. + materials = list(MAT_METAL = 3000, MAT_GLASS = 1000, MAT_DIAMOND = 3750) //Yes, a whole diamond is needed. reliability_base = 79 build_path = /obj/item/weapon/pickaxe/drill/diamonddrill category = list("Mining") @@ -18,7 +18,7 @@ id = "pick_diamond" req_tech = list("materials" = 6) build_type = PROTOLATHE - materials = list("$diamond" = 3000) + materials = list(MAT_DIAMOND = 3000) build_path = /obj/item/weapon/pickaxe/diamond category = list("Mining") @@ -28,7 +28,7 @@ id = "drill" req_tech = list("materials" = 2, "powerstorage" = 3, "engineering" = 2) build_type = PROTOLATHE - materials = list("$metal" = 6000, "$glass" = 1000) + materials = list(MAT_METAL = 6000, MAT_GLASS = 1000) build_path = /obj/item/weapon/pickaxe/drill category = list("Mining") @@ -38,7 +38,7 @@ id = "plasmacutter" req_tech = list("materials" = 2, "plasmatech" = 2, "engineering" = 2, "combat" = 1, "magnets" = 2) build_type = PROTOLATHE - materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$plasma" = 500) + materials = list(MAT_METAL = 1500, MAT_GLASS = 500, MAT_GOLD = 500, MAT_PLASMA = 500) reliability_base = 79 build_path = /obj/item/weapon/gun/energy/plasmacutter category = list("Mining") @@ -49,7 +49,7 @@ id = "plasmacutter_adv" req_tech = list("materials" = 4, "plasmatech" = 3, "engineering" = 3, "combat" = 3, "magnets" = 3) build_type = PROTOLATHE - materials = list("$metal" = 3000, "$glass" = 1000, "$plasma" = 2000, "$gold" = 500) + materials = list(MAT_METAL = 3000, MAT_GLASS = 1000, MAT_PLASMA = 2000, MAT_GOLD = 500) reliability_base = 79 build_path = /obj/item/weapon/gun/energy/plasmacutter/adv category = list("Mining") @@ -60,6 +60,6 @@ id = "jackhammer" req_tech = list("materials" = 6, "powerstorage" = 6, "engineering" = 5, "magnets" = 6) build_type = PROTOLATHE - materials = list("$metal" = 8000, "$glass" = 1500, "$silver" = 2000, "$diamond" = 6000) + materials = list(MAT_METAL = 8000, MAT_GLASS = 1500, MAT_SILVER = 2000, MAT_DIAMOND = 6000) build_path = /obj/item/weapon/pickaxe/drill/jackhammer category = list("Mining") diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 403e5745ca8..44aff0048d5 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -7,27 +7,27 @@ id = "design_disk" req_tech = list("programming" = 1) build_type = PROTOLATHE | AUTOLATHE - materials = list("$metal" = 30, "$glass" = 10) + materials = list(MAT_METAL = 30, MAT_GLASS = 10) build_path = /obj/item/weapon/disk/design_disk category = list("Miscellaneous") - + /datum/design/intellicard name = "Intellicard" desc = "Allows for the construction of an intellicard." id = "intellicard" req_tech = list("programming" = 4, "materials" = 4) build_type = PROTOLATHE - materials = list("$glass" = 1000, "$gold" = 200) + materials = list(MAT_GLASS = 1000, MAT_GOLD = 200) build_path = /obj/item/device/aicard category = list("Miscellaneous") - + /datum/design/paicard name = "Personal Artificial Intelligence Card" desc = "Allows for the construction of a pAI Card" id = "paicard" req_tech = list("programming" = 2) build_type = PROTOLATHE - materials = list("$glass" = 500, "$metal" = 500) + materials = list(MAT_GLASS = 500, MAT_METAL = 500) build_path = /obj/item/device/paicard category = list("Miscellaneous") @@ -37,7 +37,7 @@ id = "tech_disk" req_tech = list("programming" = 1) build_type = PROTOLATHE | AUTOLATHE - materials = list("$metal" = 30, "$glass" = 10) + materials = list(MAT_METAL = 30, MAT_GLASS = 10) build_path = /obj/item/weapon/disk/tech_disk category = list("Miscellaneous") @@ -47,6 +47,6 @@ id = "digitalcamera" req_tech = list("programming" = 2, "materials" = 2) build_type = PROTOLATHE - materials = list("$metal" = 500, "$glass" = 300) + materials = list(MAT_METAL = 500, MAT_GLASS = 300) build_path = /obj/item/device/camera/digital category = list("Miscellaneous") \ No newline at end of file diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm index 70be59438fa..9fb7000bf52 100644 --- a/code/modules/research/designs/power_designs.dm +++ b/code/modules/research/designs/power_designs.dm @@ -8,7 +8,7 @@ id = "basic_cell" req_tech = list("powerstorage" = 1) build_type = PROTOLATHE | AUTOLATHE | MECHFAB | PODFAB - materials = list("$metal" = 700, "$glass" = 50) + materials = list(MAT_METAL = 700, MAT_GLASS = 50) construction_time=100 build_path = /obj/item/weapon/stock_parts/cell category = list("Misc","Power") @@ -19,7 +19,7 @@ id = "high_cell" req_tech = list("powerstorage" = 2) build_type = PROTOLATHE | AUTOLATHE | MECHFAB | PODFAB - materials = list("$metal" = 700, "$glass" = 60) + materials = list(MAT_METAL = 700, MAT_GLASS = 60) construction_time=100 build_path = /obj/item/weapon/stock_parts/cell/high category = list("Misc","Power") @@ -31,7 +31,7 @@ req_tech = list("powerstorage" = 5, "materials" = 4) reliability_base = 70 build_type = PROTOLATHE | MECHFAB | PODFAB - materials = list("$metal" = 400, "$gold" = 150, "$silver" = 150, "$glass" = 70) + materials = list(MAT_METAL = 400, MAT_GOLD = 150, MAT_SILVER = 150, MAT_GLASS = 70) construction_time=100 build_path = /obj/item/weapon/stock_parts/cell/hyper category = list("Misc","Power") @@ -43,7 +43,7 @@ req_tech = list("powerstorage" = 3, "materials" = 2) reliability_base = 75 build_type = PROTOLATHE | MECHFAB | PODFAB - materials = list("$metal" = 700, "$glass" = 70) + materials = list(MAT_METAL = 700, MAT_GLASS = 70) construction_time=100 build_path = /obj/item/weapon/stock_parts/cell/super category = list("Misc","Power") @@ -55,7 +55,7 @@ req_tech = list("powerstorage" = 6, "materials" = 5) reliability_base = 70 build_type = PROTOLATHE | MECHFAB - materials = list("$metal" = 800, "$gold" = 300, "$silver" = 300, "$glass" = 160, "$diamond" = 160) + materials = list(MAT_METAL = 800, MAT_GOLD = 300, MAT_SILVER = 300, MAT_GLASS = 160, MAT_DIAMOND = 160) construction_time=100 build_path = /obj/item/weapon/stock_parts/cell/bluespace category = list("Misc","Power") @@ -67,7 +67,7 @@ req_tech = list("programming" = 3, "plasmatech" = 3, "powerstorage" = 3, "engineering" = 3) build_type = IMPRINTER reliability_base = 79 - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/pacman category = list("Engineering Machinery") @@ -78,7 +78,7 @@ req_tech = list("programming" = 3, "powerstorage" = 5, "engineering" = 5) build_type = IMPRINTER reliability_base = 74 - materials = list("$glass" = 2000, "sacid" = 20) + materials = list(MAT_GLASS = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/pacman/mrs category = list("Engineering Machinery") @@ -89,6 +89,6 @@ req_tech = list("programming" = 3, "powerstorage" = 4, "engineering" = 4) build_type = IMPRINTER reliability_base = 76 - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/pacman/super category = list("Engineering Machinery") diff --git a/code/modules/research/designs/spacepod_designs.dm b/code/modules/research/designs/spacepod_designs.dm index 3f7b5182d09..57f8490be5e 100644 --- a/code/modules/research/designs/spacepod_designs.dm +++ b/code/modules/research/designs/spacepod_designs.dm @@ -5,7 +5,7 @@ id = "spacepod_main" req_tech = list("materials" = 1) //All parts required to build a basic pod have materials 1, so the mechanic can do his damn job. build_type = PODFAB - materials = list("$metal"=5000) + materials = list(MAT_METAL=5000) build_path = /obj/item/weapon/circuitboard/mecha/pod category = list("Pod_Parts") @@ -21,7 +21,7 @@ req_tech = list("materials" = 1) build_path = /obj/item/pod_parts/pod_frame/fore_port category = list("Pod_Frame") - materials = list("$metal"=15000,"$glass"=5000) + materials = list(MAT_METAL=15000,MAT_GLASS=5000) /datum/design/podframe_ap construction_time = 200 @@ -32,7 +32,7 @@ req_tech = list("materials" = 1) build_path = /obj/item/pod_parts/pod_frame/aft_port category = list("Pod_Frame") - materials = list("$metal"=15000,"$glass"=5000) + materials = list(MAT_METAL=15000,MAT_GLASS=5000) /datum/design/podframe_fs construction_time = 200 @@ -43,7 +43,7 @@ req_tech = list("materials" = 1) build_path = /obj/item/pod_parts/pod_frame/fore_starboard category = list("Pod_Frame") - materials = list("$metal"=15000,"$glass"=5000) + materials = list(MAT_METAL=15000,MAT_GLASS=5000) /datum/design/podframe_as construction_time = 200 @@ -54,7 +54,7 @@ req_tech = list("materials" = 1) build_path = /obj/item/pod_parts/pod_frame/aft_starboard category = list("Pod_Frame") - materials = list("$metal"=15000,"$glass"=5000) + materials = list(MAT_METAL=15000,MAT_GLASS=5000) ////////////////////////// ////////POD CORE//////// @@ -69,7 +69,7 @@ req_tech = list("materials" = 1) build_path = /obj/item/pod_parts/core category = list("Pod_Parts") - materials = list("$metal"=5000,"$uranium"=1000,"$plasma"=5000) + materials = list(MAT_METAL=5000,MAT_URANIUM=1000,MAT_PLASMA=5000) ////////////////////////////////////////// ////////SPACEPOD ARMOR//////////////////// @@ -84,7 +84,7 @@ req_tech = list("materials" = 1) build_path = /obj/item/pod_parts/armor category = list("Pod_Armor") - materials = list("$metal"=15000,"$glass"=5000,"$plasma"=10000) + materials = list(MAT_METAL=15000,MAT_GLASS=5000,MAT_PLASMA=10000) ////////////////////////////////////////// //////SPACEPOD GUNS/////////////////////// @@ -98,7 +98,7 @@ req_tech = list("materials" = 2, "combat" = 2) build_path = /obj/item/device/spacepod_equipment/weaponry/taser category = list("Pod_Weaponry") - materials = list("$metal" = 15000) + materials = list(MAT_METAL = 15000) locked = 1 /datum/design/pod_gun_btaser @@ -110,7 +110,7 @@ req_tech = list("materials" = 3, "combat" = 3) build_path = /obj/item/device/spacepod_equipment/weaponry/burst_taser category = list("Pod_Weaponry") - materials = list("$metal" = 15000,"$plasma"=2000) + materials = list(MAT_METAL = 15000,MAT_PLASMA=2000) locked = 1 /datum/design/pod_gun_laser @@ -122,7 +122,7 @@ req_tech = list("materials" = 3, "combat" = 3, "plasma" = 2) build_path = /obj/item/device/spacepod_equipment/weaponry/laser category = list("Pod_Weaponry") - materials = list("$metal"=10000,"$glass"=5000,"$gold"=1000,"$silver"=2000) + materials = list(MAT_METAL=10000,MAT_GLASS=5000,MAT_GOLD=1000,MAT_SILVER=2000) locked = 1 ////////////////////////////////////////// //////SPACEPOD MISC. ITEMS//////////////// @@ -135,6 +135,6 @@ id = "podmisc_tracker" req_tech = list("materials" = 2) //Materials 2: easy to get, no trackers with 0 science progress build_type = PODFAB - materials = list("$metal"=5000) + materials = list(MAT_METAL=5000) build_path = /obj/item/device/spacepod_equipment/misc/tracker category = list("Pod_Parts") \ No newline at end of file diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index 6f8ff421069..fcfc62012ea 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -8,7 +8,7 @@ id = "basic_capacitor" req_tech = list("powerstorage" = 1) build_type = PROTOLATHE | AUTOLATHE - materials = list("$metal" = 50, "$glass" = 50) + materials = list(MAT_METAL = 50, MAT_GLASS = 50) build_path = /obj/item/weapon/stock_parts/capacitor category = list("Stock Parts") @@ -18,7 +18,7 @@ id = "basic_sensor" req_tech = list("magnets" = 1) build_type = PROTOLATHE | AUTOLATHE - materials = list("$metal" = 50, "$glass" = 20) + materials = list(MAT_METAL = 50, MAT_GLASS = 20) build_path = /obj/item/weapon/stock_parts/scanning_module category = list("Stock Parts") @@ -28,7 +28,7 @@ id = "micro_mani" req_tech = list("materials" = 1, "programming" = 1) build_type = PROTOLATHE | AUTOLATHE - materials = list("$metal" = 30) + materials = list(MAT_METAL = 30) build_path = /obj/item/weapon/stock_parts/manipulator category = list("Stock Parts") @@ -38,7 +38,7 @@ id = "basic_micro_laser" req_tech = list("magnets" = 1) build_type = PROTOLATHE | AUTOLATHE - materials = list("$metal" = 10, "$glass" = 20) + materials = list(MAT_METAL = 10, MAT_GLASS = 20) build_path = /obj/item/weapon/stock_parts/micro_laser category = list("Stock Parts") @@ -48,7 +48,7 @@ id = "basic_matter_bin" req_tech = list("materials" = 1) build_type = PROTOLATHE | AUTOLATHE - materials = list("$metal" = 80) + materials = list(MAT_METAL = 80) build_path = /obj/item/weapon/stock_parts/matter_bin category = list("Stock Parts") @@ -58,7 +58,7 @@ id = "adv_capacitor" req_tech = list("powerstorage" = 3) build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) + materials = list(MAT_METAL = 50, MAT_GLASS = 50) build_path = /obj/item/weapon/stock_parts/capacitor/adv category = list("Stock Parts") @@ -68,7 +68,7 @@ id = "adv_sensor" req_tech = list("magnets" = 3) build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 20) + materials = list(MAT_METAL = 50, MAT_GLASS = 20) build_path = /obj/item/weapon/stock_parts/scanning_module/adv category = list("Stock Parts") @@ -78,7 +78,7 @@ id = "nano_mani" req_tech = list("materials" = 3, "programming" = 2) build_type = PROTOLATHE - materials = list("$metal" = 30) + materials = list(MAT_METAL = 30) build_path = /obj/item/weapon/stock_parts/manipulator/nano category = list("Stock Parts") @@ -88,7 +88,7 @@ id = "high_micro_laser" req_tech = list("magnets" = 3) build_type = PROTOLATHE - materials = list("$metal" = 10, "$glass" = 20) + materials = list(MAT_METAL = 10, MAT_GLASS = 20) build_path = /obj/item/weapon/stock_parts/micro_laser/high category = list("Stock Parts") @@ -98,7 +98,7 @@ id = "adv_matter_bin" req_tech = list("materials" = 3) build_type = PROTOLATHE - materials = list("$metal" = 80) + materials = list(MAT_METAL = 80) build_path = /obj/item/weapon/stock_parts/matter_bin/adv category = list("Stock Parts") @@ -109,7 +109,7 @@ req_tech = list("powerstorage" = 5, "materials" = 4) build_type = PROTOLATHE reliability_base = 71 - materials = list("$metal" = 50, "$glass" = 50, "$gold" = 20) + materials = list(MAT_METAL = 50, MAT_GLASS = 50, MAT_GOLD = 20) build_path = /obj/item/weapon/stock_parts/capacitor/super category = list("Stock Parts") @@ -119,7 +119,7 @@ id = "phasic_sensor" req_tech = list("magnets" = 5, "materials" = 3) build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 20, "$silver" = 10) + materials = list(MAT_METAL = 50, MAT_GLASS = 20, MAT_SILVER = 10) reliability_base = 72 build_path = /obj/item/weapon/stock_parts/scanning_module/phasic category = list("Stock Parts") @@ -130,7 +130,7 @@ id = "pico_mani" req_tech = list("materials" = 5, "programming" = 2) build_type = PROTOLATHE - materials = list("$metal" = 30) + materials = list(MAT_METAL = 30) reliability_base = 73 build_path = /obj/item/weapon/stock_parts/manipulator/pico category = list("Stock Parts") @@ -141,7 +141,7 @@ id = "ultra_micro_laser" req_tech = list("magnets" = 5, "materials" = 5) build_type = PROTOLATHE - materials = list("$metal" = 10, "$glass" = 20, "$uranium" = 10) + materials = list(MAT_METAL = 10, MAT_GLASS = 20, MAT_URANIUM = 10) reliability_base = 70 build_path = /obj/item/weapon/stock_parts/micro_laser/ultra category = list("Stock Parts") @@ -152,7 +152,7 @@ id = "super_matter_bin" req_tech = list("materials" = 5) build_type = PROTOLATHE - materials = list("$metal" = 80) + materials = list(MAT_METAL = 80) reliability_base = 75 build_path = /obj/item/weapon/stock_parts/matter_bin/super category = list("Stock Parts") @@ -164,7 +164,7 @@ req_tech = list("powerstorage" = 6, "materials" = 5) build_type = PROTOLATHE reliability_base = 71 - materials = list("$metal" = 100, "$glass" = 100, "$diamond" = 40) + materials = list(MAT_METAL = 100, MAT_GLASS = 100, MAT_DIAMOND = 40) build_path = /obj/item/weapon/stock_parts/capacitor/quadratic category = list("Stock Parts") @@ -174,7 +174,7 @@ id = "triphasic_scanning" req_tech = list("magnets" = 6, "materials" = 4) build_type = PROTOLATHE - materials = list("$metal" = 100, "$glass" = 40, "$diamond" = 20) + materials = list(MAT_METAL = 100, MAT_GLASS = 40, MAT_DIAMOND = 20) reliability_base = 72 build_path = /obj/item/weapon/stock_parts/scanning_module/triphasic category = list("Stock Parts") @@ -185,7 +185,7 @@ id = "femto_mani" req_tech = list("materials" = 6, "programming" = 3) build_type = PROTOLATHE - materials = list("$metal" = 60, "$diamond" = 30) + materials = list(MAT_METAL = 60, MAT_DIAMOND = 30) reliability_base = 73 build_path = /obj/item/weapon/stock_parts/manipulator/femto category = list("Stock Parts") @@ -196,7 +196,7 @@ id = "quadultra_micro_laser" req_tech = list("magnets" = 6, "materials" = 6) build_type = PROTOLATHE - materials = list("$metal" = 20, "$glass" = 40, "$uranium" = 20, "$diamond" = 20) + materials = list(MAT_METAL = 20, MAT_GLASS = 40, MAT_URANIUM = 20, MAT_DIAMOND = 20) reliability_base = 70 build_path = /obj/item/weapon/stock_parts/micro_laser/quadultra category = list("Stock Parts") @@ -207,7 +207,7 @@ id = "bluespace_matter_bin" req_tech = list("materials" = 6) build_type = PROTOLATHE - materials = list("$metal" = 160, "$diamond" = 200) + materials = list(MAT_METAL = 160, MAT_DIAMOND = 200) reliability_base = 75 build_path = /obj/item/weapon/stock_parts/matter_bin/bluespace category = list("Stock Parts") @@ -218,7 +218,7 @@ id = "rped" req_tech = list("engineering" = 3, "materials" = 3) build_type = PROTOLATHE - materials = list("$metal" = 10000, "$glass" = 5000) //hardcore + materials = list(MAT_METAL = 10000, MAT_GLASS = 5000) //hardcore build_path = /obj/item/weapon/storage/part_replacer category = list("Stock Parts") @@ -228,6 +228,6 @@ id = "bs_rped" req_tech = list("engineering" = 3, "materials" = 5, "programming" = 3, "bluespace" = 3) build_type = PROTOLATHE - materials = list("$metal" = 15000, "$glass" = 5000, "$silver" = 2500) //hardcore + materials = list(MAT_METAL = 15000, MAT_GLASS = 5000, MAT_SILVER = 2500) //hardcore build_path = /obj/item/weapon/storage/part_replacer/bluespace category = list("Stock Parts") \ No newline at end of file diff --git a/code/modules/research/designs/telecomms_designs.dm b/code/modules/research/designs/telecomms_designs.dm index 2f60fc78311..4c6d72c0120 100644 --- a/code/modules/research/designs/telecomms_designs.dm +++ b/code/modules/research/designs/telecomms_designs.dm @@ -7,17 +7,17 @@ id = "s-bus" req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/telecomms/bus category = list("Subspace Telecomms") - + /datum/design/telecomms_hub name = "Machine Board (Hub Mainframe)" desc = "Allows for the construction of Telecommunications Hub Mainframes." id = "s-hub" req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/telecomms/hub category = list("Subspace Telecomms") @@ -28,17 +28,17 @@ id = "s-processor" req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/telecomms/processor category = list("Subspace Telecomms") - + /datum/design/telecomms_relay name = "Machine Board (Relay Mainframe)" desc = "Allows for the construction of Telecommunications Relay Mainframes." id = "s-relay" req_tech = list("programming" = 1, "engineering" = 2, "bluespace" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/telecomms/relay category = list("Subspace Telecomms") @@ -48,7 +48,7 @@ id = "s-server" req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/telecomms/server category = list("Subspace Telecomms") @@ -58,27 +58,27 @@ id = "s-broadcaster" req_tech = list("programming" = 2, "engineering" = 2, "bluespace" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/telecomms/broadcaster category = list("Subspace Telecomms") - + /datum/design/subspace_receiver name = "Machine Board (Subspace Receiver)" desc = "Allows for the construction of Subspace Receiver equipment." id = "s-receiver" req_tech = list("programming" = 2, "engineering" = 1, "bluespace" = 1) build_type = IMPRINTER - materials = list("$glass" = 1000, "sacid" = 20) + materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/telecomms/receiver category = list("Subspace Telecomms") - + /datum/design/subspace_crystal name = "Ansible Crystal" desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." id = "s-crystal" req_tech = list("magnets" = 2, "materials" = 2, "bluespace" = 1) build_type = PROTOLATHE - materials = list("$glass" = 1000, "$silver" = 20, "$gold" = 20) + materials = list(MAT_GLASS = 1000, MAT_SILVER = 20, MAT_GOLD = 20) build_path = /obj/item/weapon/stock_parts/subspace/crystal category = list("Stock Parts") @@ -88,9 +88,9 @@ id = "s-filter" req_tech = list("programming" = 2, "magnets" = 2) build_type = PROTOLATHE - materials = list("$metal" = 40, "$silver" = 10) + materials = list(MAT_METAL = 40, MAT_SILVER = 10) build_path = /obj/item/weapon/stock_parts/subspace/filter - category = list("Stock Parts") + category = list("Stock Parts") /datum/design/subspace_amplifier name = "Subspace Amplifier" @@ -98,7 +98,7 @@ id = "s-amplifier" req_tech = list("programming" = 2, "magnets" = 2, "materials" = 2, "bluespace" = 1) build_type = PROTOLATHE - materials = list("$metal" = 10, "$gold" = 30, "$uranium" = 15) + materials = list(MAT_METAL = 10, MAT_GOLD = 30, MAT_URANIUM = 15) build_path = /obj/item/weapon/stock_parts/subspace/amplifier category = list("Stock Parts") @@ -108,17 +108,17 @@ id = "s-analyzer" req_tech = list("programming" = 2, "magnets" = 2, "materials" = 2, "bluespace" = 1) build_type = PROTOLATHE - materials = list("$metal" = 10, "$gold" = 15) + materials = list(MAT_METAL = 10, MAT_GOLD = 15) build_path = /obj/item/weapon/stock_parts/subspace/analyzer - category = list("Stock Parts") - + category = list("Stock Parts") + /datum/design/subspace_ansible name = "Subspace Ansible" desc = "A compact module capable of sensing extradimensional activity." id = "s-ansible" req_tech = list("programming" = 2, "magnets" = 2, "materials" = 2, "bluespace" = 1) build_type = PROTOLATHE - materials = list("$metal" = 80, "$silver" = 20) + materials = list(MAT_METAL = 80, MAT_SILVER = 20) build_path = /obj/item/weapon/stock_parts/subspace/ansible category = list("Stock Parts") @@ -128,16 +128,16 @@ id = "s-transmitter" req_tech = list("magnets" = 3, "materials" = 3, "bluespace" = 2) build_type = PROTOLATHE - materials = list("$glass" = 100, "$silver" = 10, "$uranium" = 15) + materials = list(MAT_GLASS = 100, MAT_SILVER = 10, MAT_URANIUM = 15) build_path = /obj/item/weapon/stock_parts/subspace/transmitter - category = list("Stock Parts") - + category = list("Stock Parts") + /datum/design/subspace_treatment name = "Subspace Treatment Disk" desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves." id = "s-treatment" req_tech = list("programming" = 2, "magnets" = 1, "materials" = 2, "bluespace" = 1) build_type = PROTOLATHE - materials = list("$metal" = 10, "$silver" = 20) + materials = list(MAT_METAL = 10, MAT_SILVER = 20) build_path = /obj/item/weapon/stock_parts/subspace/treatment category = list("Stock Parts") diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index f27eb81f01e..e750275ef4e 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -8,7 +8,7 @@ id = "nuclear_gun" req_tech = list("combat" = 4, "materials" = 5, "powerstorage" = 3) build_type = PROTOLATHE - materials = list("$metal" = 5000, "$glass" = 1000, "$uranium" = 2000) + materials = list(MAT_METAL = 5000, MAT_GLASS = 1000, MAT_URANIUM = 2000) reliability_base = 76 build_path = /obj/item/weapon/gun/energy/gun/nuclear locked = 1 @@ -20,7 +20,7 @@ id = "decloner" req_tech = list("combat" = 6, "materials" = 7, "biotech" = 5, "powerstorage" = 6) build_type = PROTOLATHE - materials = list("$gold" = 5000,"$uranium" = 10000, "mutagen" = 40) + materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000, "mutagen" = 40) build_path = /obj/item/weapon/gun/energy/decloner locked = 1 category = list("Weapons") @@ -31,7 +31,7 @@ id = "largecrossbow" req_tech = list("combat" = 5, "materials" = 5, "engineering" = 3, "biotech" = 4, "syndicate" = 3) build_type = PROTOLATHE - materials = list("$metal" = 5000, "$glass" = 1500, "$uranium" = 1500, "$silver" = 1500) + materials = list(MAT_METAL = 5000, MAT_GLASS = 1500, MAT_URANIUM = 1500, MAT_SILVER = 1500) build_path = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large locked = 1 category = list("Weapons") @@ -42,7 +42,7 @@ id = "flora_gun" req_tech = list("materials" = 2, "biotech" = 3, "powerstorage" = 3) build_type = PROTOLATHE - materials = list("$metal" = 2000, "$glass" = 500, "radium" = 20) + materials = list(MAT_METAL = 2000, MAT_GLASS = 500, "radium" = 20) build_path = /obj/item/weapon/gun/energy/floragun category = list("Weapons") @@ -52,7 +52,7 @@ id = "ioncarbine" req_tech = list("combat" = 5, "materials" = 4, "magnets" = 4) build_type = PROTOLATHE - materials = list("$silver" = 4000, "$metal" = 6000, "$uranium" = 1000) + materials = list(MAT_SILVER = 4000, MAT_METAL = 6000, MAT_URANIUM = 1000) build_path = /obj/item/weapon/gun/energy/ionrifle/carbine locked = 1 category = list("Weapons") @@ -63,7 +63,7 @@ id = "large_Grenade" req_tech = list("combat" = 3, "materials" = 2) build_type = PROTOLATHE - materials = list("$metal" = 3000) + materials = list(MAT_METAL = 3000) reliability_base = 79 build_path = /obj/item/weapon/grenade/chem_grenade/large category = list("Weapons") @@ -74,7 +74,7 @@ id = "tele_shield" req_tech = list("combat" = 4, "materials" = 3, "engineering" = 3) build_type = PROTOLATHE - materials = list("$metal" = 4000, "$glass" = 5000, "$silver" = 300) + materials = list(MAT_METAL = 4000, MAT_GLASS = 5000, MAT_SILVER = 300) build_path = /obj/item/weapon/shield/riot/tele category = list("Weapons") @@ -84,7 +84,7 @@ id = "lasercannon" req_tech = list("combat" = 4, "materials" = 3, "powerstorage" = 3) build_type = PROTOLATHE - materials = list("$metal" = 10000, "$glass" = 2000, "$diamond" = 2000) + materials = list(MAT_METAL = 10000, MAT_GLASS = 2000, MAT_DIAMOND = 2000) build_path = /obj/item/weapon/gun/energy/lasercannon locked = 1 category = list("Weapons") @@ -95,7 +95,7 @@ id = "receiver" req_tech = list("combat" = 5, "materials" = 4) build_type = PROTOLATHE - materials = list("$metal" = 6500, "$silver" = 500) + materials = list(MAT_METAL = 6500, MAT_SILVER = 500) build_path = /obj/item/weaponcrafting/receiver category = list("Weapons") @@ -105,7 +105,7 @@ id = "ppistol" req_tech = list("combat" = 5, "plasmatech" = 4) build_type = PROTOLATHE - materials = list("$metal" = 5000, "$glass" = 1000, "$plasma" = 3000) + materials = list(MAT_METAL = 5000, MAT_GLASS = 1000, MAT_PLASMA = 3000) build_path = /obj/item/weapon/gun/energy/toxgun locked = 1 category = list("Weapons") @@ -116,7 +116,7 @@ id = "smg" req_tech = list("combat" = 4, "materials" = 3) build_type = PROTOLATHE - materials = list("$metal" = 8000, "$silver" = 2000, "$diamond" = 1000) + materials = list(MAT_METAL = 8000, MAT_SILVER = 2000, MAT_DIAMOND = 1000) build_path = /obj/item/weapon/gun/projectile/automatic locked = 1 category = list("Weapons") @@ -127,7 +127,7 @@ id = "mag_smg" req_tech = list("combat" = 4, "materials" = 3) build_type = PROTOLATHE - materials = list("$metal" = 2000) + materials = list(MAT_METAL = 2000) build_path = /obj/item/ammo_box/magazine/smgm9mm category = list("Weapons") @@ -137,7 +137,7 @@ id = "rapidsyringe" req_tech = list("combat" = 3, "materials" = 3, "engineering" = 3, "biotech" = 2) build_type = PROTOLATHE - materials = list("$metal" = 5000, "$glass" = 1000) + materials = list(MAT_METAL = 5000, MAT_GLASS = 1000) build_path = /obj/item/weapon/gun/syringe/rapidsyringe category = list("Weapons") @@ -147,7 +147,7 @@ id = "stunshell" req_tech = list("combat" = 3, "materials" = 3) build_type = PROTOLATHE - materials = list("$metal" = 200) + materials = list(MAT_METAL = 200) build_path = /obj/item/ammo_casing/shotgun/stunslug category = list("Weapons") @@ -157,7 +157,7 @@ id = "stunrevolver" req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 2) build_type = PROTOLATHE - materials = list("$metal" = 4000, "$glass" = 1000) + materials = list(MAT_METAL = 4000, MAT_GLASS = 1000) build_path = /obj/item/weapon/gun/energy/stunrevolver locked = 1 category = list("Weapons") @@ -168,7 +168,7 @@ id = "temp_gun" req_tech = list("combat" = 3, "materials" = 4, "powerstorage" = 3, "magnets" = 2) build_type = PROTOLATHE - materials = list("$metal" = 5000, "$glass" = 500, "$silver" = 3000) + materials = list(MAT_METAL = 5000, MAT_GLASS = 500, MAT_SILVER = 3000) build_path = /obj/item/weapon/gun/energy/temperature locked = 1 category = list("Weapons") @@ -179,7 +179,7 @@ id = "suppressor" req_tech = list("combat" = 6, "engineering" = 5, "syndicate" = 3) build_type = PROTOLATHE - materials = list("$metal" = 2000, "$silver" = 500) + materials = list(MAT_METAL = 2000, MAT_SILVER = 500) build_path = /obj/item/weapon/suppressor category = list("Weapons") @@ -189,7 +189,7 @@ id = "techshotshell" req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 4, "magnets" = 3) build_type = PROTOLATHE - materials = list("$metal" = 1000, "$glass" = 200, "$silver" = 300) + materials = list(MAT_METAL = 1000, MAT_GLASS = 200, MAT_SILVER = 300) build_path = /obj/item/ammo_casing/shotgun/techshell category = list("Weapons") @@ -199,7 +199,7 @@ id = "xray" req_tech = list("combat" = 6, "materials" = 5, "biotech" = 5, "powerstorage" = 4) build_type = PROTOLATHE - materials = list("$gold" = 5000,"$uranium" = 10000, "$metal" = 4000) + materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000, MAT_METAL = 4000) build_path = /obj/item/weapon/gun/energy/xray locked = 1 category = list("Weapons") \ No newline at end of file diff --git a/code/modules/shieldgen/circuits_and_designs.dm b/code/modules/shieldgen/circuits_and_designs.dm index 1ff3f01dea7..b13a5751822 100644 --- a/code/modules/shieldgen/circuits_and_designs.dm +++ b/code/modules/shieldgen/circuits_and_designs.dm @@ -22,7 +22,7 @@ datum/design/shield_gen_ex id = "shield_gen" req_tech = list("bluespace" = 4, "plasmatech" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 10000, "$diamond" = 5000, "$gold" = 10000) + materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_PLASMA = 10000, MAT_DIAMOND = 5000, MAT_GOLD = 10000) build_path = "/obj/machinery/shield_gen/external" //////////////////////////////////////// @@ -48,7 +48,7 @@ datum/design/shield_gen id = "shield_gen" req_tech = list("bluespace" = 4, "plasmatech" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 10000, "$diamond" = 5000, "$gold" = 10000) + materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_PLASMA = 10000, MAT_DIAMOND = 5000, MAT_GOLD = 10000) build_path = "/obj/machinery/shield_gen/external" //////////////////////////////////////// @@ -74,5 +74,5 @@ datum/design/shield_cap id = "shield_cap" req_tech = list("magnets" = 3, "powerstorage" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 10000, "$diamond" = 5000, "$silver" = 10000) + materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_PLASMA = 10000, MAT_DIAMOND = 5000, MAT_SILVER = 10000) build_path = "/obj/machinery/shield_gen/external"