[MIRROR] Industrial Expansion

2025-12-11 18:53:06 +00:00 · 2021-03-09 21:53:03 +00:00
parent 4dafc3196e
commit b85e9fc4d9
61 changed files with 251392 additions and 215 deletions
--- a/code/modules/research/designs/HUDs.dm
+++ b/code/modules/research/designs/HUDs.dm
@@ -1,7 +1,7 @@
 // HUDs

 /datum/design/item/hud
-	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 10)

 /datum/design/item/hud/AssembleDesignName()
 	..()
@@ -42,6 +42,6 @@
 	name = "graviton visor"
 	id = "graviton_goggles"
 	req_tech = list(TECH_MAGNET = 5, TECH_ENGINEERING = 3, TECH_BLUESPACE = 3, TECH_PHORON = 3)
-	materials = list(MAT_PLASTEEL = 2000, "glass" = 3000, MAT_PHORON = 1500)
+	materials = list(MAT_PLASTEEL = 2000, "glass" = 3000, MAT_PHORON = 1500, MAT_COPPER = 10)
 	build_path = /obj/item/clothing/glasses/graviton
 	sort_string = "EAAAE"
--- a/code/modules/research/designs/ai_holders.dm
+++ b/code/modules/research/designs/ai_holders.dm
@@ -8,7 +8,7 @@
 	id = "mmi"
 	req_tech = list(TECH_DATA = 2, TECH_BIO = 3)
 	build_type = PROTOLATHE | PROSFAB
-	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 500, MAT_COPPER = 200)
 	build_path = /obj/item/device/mmi
 	category = list("Misc")
 	sort_string = "SAAAA"
@@ -18,7 +18,7 @@
 	id = "posibrain"
 	req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 6, TECH_BLUESPACE = 2, TECH_DATA = 4)
 	build_type = PROTOLATHE | PROSFAB
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 500, "phoron" = 500, "diamond" = 100)
+	materials = list(MAT_TITANIUM = 2000, "glass" = 1000, "silver" = 500, "gold" = 500, "phoron" = 500, MAT_DIAMOND = 100)
 	build_path = /obj/item/device/mmi/digital/posibrain
 	category = list("Misc")
 	sort_string = "SAAAB"
@@ -28,7 +28,7 @@
 	id = "dronebrain"
 	req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 5, TECH_DATA = 4)
 	build_type = PROTOLATHE | PROSFAB
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 500, MAT_COPPER = 100)
 	build_path = /obj/item/device/mmi/digital/robot
 	category = list("Misc")
 	sort_string = "SAAAC"
@@ -37,7 +37,7 @@
 	name = "'pAI', personal artificial intelligence device"
 	id = "paicard"
 	req_tech = list(TECH_DATA = 2)
-	materials = list("glass" = 500, DEFAULT_WALL_MATERIAL = 500)
+	materials = list("glass" = 500, DEFAULT_WALL_MATERIAL = 500, MAT_COPPER = 250)
 	build_path = /obj/item/device/paicard
 	sort_string = "SBAAA"

@@ -46,6 +46,6 @@
 	desc = "Allows for the construction of an intelliCore."
 	id = "intellicore"
 	req_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4)
-	materials = list("glass" = 1000, "gold" = 200)
+	materials = list(MAT_TITANIUM = 2500, MAT_ALUMINIUM = 500, "glass" = 500, "gold" = 200)
 	build_path = /obj/item/device/aicard
 	sort_string = "SCAAA"
--- a/code/modules/research/designs/bag_of_holding.dm
+++ b/code/modules/research/designs/bag_of_holding.dm
@@ -9,7 +9,7 @@
 	desc = "Using localized pockets of bluespace this bag prototype offers incredible storage capacity with the contents weighting nothing. It's a shame the bag itself is pretty heavy."
 	id = "bag_holding"
 	req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6)
-	materials = list("gold" = 3000, "diamond" = 1500, "uranium" = 250)
+	materials = list(MAT_TITANIUM = 2000, "gold" = 1000, "diamond" = 1500, "uranium" = 250)
 	build_path = /obj/item/weapon/storage/backpack/holding
 	sort_string = "QAAAA"

@@ -18,6 +18,6 @@
 	desc = "A minaturized prototype of the popular Bag of Holding, the Dufflebag of Holding is, functionally, identical to the bag of holding, but comes in a more stylish and compact form."
 	id = "dufflebag_holding"
 	req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6)
-	materials = list("gold" = 3000, "diamond" = 1500, "uranium" = 250)
+	materials = list(MAT_TITANIUM = 2000, "gold" = 1000, "diamond" = 1500, "uranium" = 250)
 	build_path = /obj/item/weapon/storage/backpack/holding/duffle
 	sort_string = "QAAAB"
--- a/code/modules/research/designs/bio_devices.dm
+++ b/code/modules/research/designs/bio_devices.dm
@@ -1,5 +1,5 @@
 /datum/design/item/biotech
-	materials = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 20)
+	materials = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 20, MAT_COPPER = 10)

 /datum/design/item/biotech/AssembleDesignName()
 	..()
@@ -39,7 +39,7 @@
 	desc = "A hand-held scanner able to diagnose robotic injuries."
 	id = "robot_scanner"
 	req_tech = list(TECH_MAGNET = 3, TECH_BIO = 2, TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 200)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 200, MAT_COPPER = 20)
 	build_path = /obj/item/device/robotanalyzer
 	sort_string = "JAACA"

@@ -47,7 +47,7 @@
 	desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery."
 	id = "nanopaste"
 	req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 7000)
+	materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 7000, MAT_COPPER = 15)
 	build_path = /obj/item/stack/nanopaste
 	sort_string = "JAACB"

@@ -55,7 +55,7 @@
 	desc = "A device capable of quickly scanning all relevant data about a plant."
 	id = "plant_analyzer"
 	req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 500, MAT_COPPER = 10)
 	build_path = /obj/item/device/analyzer/plant_analyzer
 	sort_string = "JAADA"

--- a/code/modules/research/designs/circuits/ai_modules.dm
+++ b/code/modules/research/designs/circuits/ai_modules.dm
@@ -1,6 +1,6 @@
 /datum/design/aimodule
 	build_type = IMPRINTER
-	materials = list("glass" = 2000, "gold" = 100)
+	materials = list("glass" = 1800, MAT_COPPER = 200, "gold" = 100)

 /datum/design/aimodule/AssembleDesignName()
 	name = "AI module design ([name])"
--- a/code/modules/research/designs/circuits/circuits.dm
+++ b/code/modules/research/designs/circuits/circuits.dm
@@ -5,7 +5,7 @@ CIRCUITS BELOW
 /datum/design/circuit
 	build_type = IMPRINTER
 	req_tech = list(TECH_DATA = 2)
-	materials = list("glass" = 2000)
+	materials = list("glass" = 1850, MAT_COPPER = 150)
 	chemicals = list("sacid" = 20)
 	time = 5

@@ -493,7 +493,7 @@ CIRCUITS BELOW
 	name = "'Durand' central control"
 	id = "durand_main"
 	req_tech = list(TECH_DATA = 4)
-	materials = list("glass" = 2000, MAT_GRAPHITE = 1250)
+	materials = list("glass" = 2000, MAT_GRAPHITE = 1250, MAT_COPPER = 100)
 	chemicals = list("sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/mecha/durand/main
 	sort_string = "NAADA"
@@ -502,7 +502,7 @@ CIRCUITS BELOW
 	name = "'Durand' peripherals control"
 	id = "durand_peri"
 	req_tech = list(TECH_DATA = 4)
-	materials = list("glass" = 2000, MAT_GRAPHITE = 1250)
+	materials = list("glass" = 2000, MAT_GRAPHITE = 1250, MAT_COPPER = 100)
 	chemicals = list("sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/mecha/durand/peripherals
 	sort_string = "NAADB"
@@ -511,7 +511,7 @@ CIRCUITS BELOW
 	name = "'Durand' weapon control and targeting"
 	id = "durand_targ"
 	req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2)
-	materials = list("glass" = 2000, MAT_GRAPHITE = 1250)
+	materials = list("glass" = 2000, MAT_GRAPHITE = 1250, MAT_COPPER = 100)
 	chemicals = list("sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/mecha/durand/targeting
 	sort_string = "NAADC"
@@ -576,6 +576,36 @@ CIRCUITS BELOW
 	build_path = /obj/item/weapon/circuitboard/telecomms/exonet_node
 	sort_string = "PAAAH"

+/datum/design/circuit/shield
+	req_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3)
+	materials = list("glass" = 2000, MAT_COPPER = 100, "gold" = 1000)
+
+/datum/design/circuit/shield/AssembleDesignName()
+	name = "Shield generator circuit design ([name])"
+/datum/design/circuit/shield/AssembleDesignDesc()
+	if(!desc)
+		desc = "Allows for the construction of \a [name] shield generator."
+
+/datum/design/circuit/shield/bubble
+	name = "bubble (OBSOLETE)" //VOREStation Edit
+	id = "shield_gen"
+	build_path = /obj/item/weapon/circuitboard/shield_gen
+	sort_string = "VAAAZ"	// Duplicate string, really need to redo this whole thing
+
+/datum/design/circuit/shield/hull
+	name = "hull (OBSOLETE)" //VOREStation Edit
+	id = "shield_gen_ex"
+	build_path = /obj/item/weapon/circuitboard/shield_gen_ex
+	sort_string = "VAAAB"
+
+/datum/design/circuit/shield/capacitor
+	name = "capacitor (OBSOLETE)" //VOREStation Edit"
+	desc = "Allows for the construction of a shield capacitor circuit board."
+	id = "shield_cap"
+	req_tech = list(TECH_MAGNET = 3, TECH_POWER = 4)
+	build_path = /obj/item/weapon/circuitboard/shield_cap
+	sort_string = "VAAAC"
+
 /datum/design/circuit/ntnet_relay
 	name = "NTNet Quantum Relay"
 	id = "ntnet_relay"
--- a/code/modules/research/designs/circuits/disks.dm
+++ b/code/modules/research/designs/circuits/disks.dm
@@ -2,7 +2,7 @@
 /datum/design/circuit/disk
 	build_type = IMPRINTER
 	req_tech = list(TECH_DATA = 3)
-	materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 1000)
+	materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 1000, MAT_COPPER = 150)
 	chemicals = list("pacid" = 10)
 	time = 5

--- a/code/modules/research/designs/engineering.dm
+++ b/code/modules/research/designs/engineering.dm
@@ -9,7 +9,7 @@
 	desc = "A welding tool that generate fuel for itself."
 	id = "expwelder"
 	req_tech = list(TECH_ENGINEERING = 4, TECH_PHORON = 3, TECH_MATERIAL = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 70, "glass" = 120, "phoron" = 100)
+	materials = list(DEFAULT_WALL_MATERIAL = 70, "glass" = 120, "phoron" = 100, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/weldingtool/experimental
 	sort_string = "NAAAA"

@@ -18,7 +18,7 @@
 	desc = "A simple powered hand drill."
 	id = "handdrill"
 	req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 300, "silver" = 100)
+	materials = list(MAT_ALUMINIUM = 300, "silver" = 100, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/tool/screwdriver/power
 	sort_string = "NAAAB"

@@ -27,7 +27,7 @@
 	desc = "A set of jaws of life, compressed through the magic of science."
 	id = "jawslife"
 	req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 300, "silver" = 100)
+	materials = list(MAT_ALUMINIUM = 300, MAT_TITANIUM = 100, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/tool/crowbar/power
 	sort_string = "NAAAC"
 // YW addition begins
@@ -70,7 +70,7 @@
 	desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
 	id = "tscanner"
 	req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_MATERIAL = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 200)
+	materials = list(DEFAULT_WALL_MATERIAL = 200, MAT_COPPER = 10)
 	build_path = /obj/item/device/t_scanner
 	sort_string = "NBAAA"

@@ -79,7 +79,7 @@
 	desc = "An upgraded version of the terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
 	id = "upgradedtscanner"
 	req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_MATERIAL = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 500, "phoron" = 150)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, "phoron" = 150, MAT_COPPER = 10)
 	build_path = /obj/item/device/t_scanner/upgraded
 	sort_string = "NBAAB"

@@ -88,7 +88,7 @@
 	desc = "An advanced version of the terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
 	id = "advancedtscanner"
 	req_tech = list(TECH_MAGNET = 6, TECH_ENGINEERING = 6, TECH_MATERIAL = 6)
-	materials = list(DEFAULT_WALL_MATERIAL = 1250, "phoron" = 500, "silver" = 50)
+	materials = list(MAT_ALUMINIUM = 1250, "phoron" = 500, "silver" = 50)
 	build_path = /obj/item/device/t_scanner/advanced
 	sort_string = "NBAAC"

@@ -97,6 +97,6 @@
 	desc = "A hand-held environmental scanner which reports current gas levels."
 	id = "atmosanalyzer"
 	req_tech = list(TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 200, "glass" = 100)
+	materials = list(DEFAULT_WALL_MATERIAL = 200, "glass" = 100, MAT_COPPER = 10)
 	build_path = /obj/item/device/analyzer
 	sort_string = "NBABA"
--- a/code/modules/research/designs/implants.dm
+++ b/code/modules/research/designs/implants.dm
@@ -1,7 +1,7 @@
 // Implants

 /datum/design/item/implant
-	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 5)

 /datum/design/item/implant/AssembleDesignName()
 	..()
@@ -17,6 +17,7 @@
 /datum/design/item/implant/freedom
 	name = "freedom"
 	id = "implant_free"
-	req_tech = list(TECH_ILLEGAL = 2, TECH_BIO = 3)
+	req_tech = list(TECH_MATERIAL = 3, TECH_ILLEGAL = 2, TECH_BIO = 3)
 	build_path = /obj/item/weapon/implantcase/freedom
-	sort_string = "MFAAB"
+	sort_string = "MFAAB"
+	materials = list(MAT_TITANIUM = 50, "glass" = 50, MAT_COPPER = 5)
--- a/code/modules/research/designs/locator_devices.dm
+++ b/code/modules/research/designs/locator_devices.dm
@@ -2,7 +2,7 @@

 /datum/design/item/gps
 	req_tech = list(TECH_MATERIAL = 2, TECH_DATA = 2, TECH_BLUESPACE = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, MAT_COPPER = 5)

 /datum/design/item/gps/AssembleDesignName()
 	..()
@@ -67,7 +67,7 @@
 	desc = "Used to scan and locate signals on a particular frequency."
 	id = "beacon_locator"
 	req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 2, TECH_BLUESPACE = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 1000,"glass" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 1000,"glass" = 500, MAT_COPPER = 150)
 	build_path = /obj/item/device/beacon_locator
 	sort_string = "DBAAA"

@@ -75,6 +75,6 @@
 	name = "Bluespace tracking beacon"
 	id = "beacon"
 	req_tech = list(TECH_BLUESPACE = 1)
-	materials = list (DEFAULT_WALL_MATERIAL = 20, "glass" = 10)
+	materials = list (DEFAULT_WALL_MATERIAL = 20, "glass" = 10, MAT_COPPER = 5)
 	build_path = /obj/item/device/radio/beacon
 	sort_string = "DBABA"
--- a/code/modules/research/designs/medical.dm
+++ b/code/modules/research/designs/medical.dm
@@ -12,7 +12,7 @@
 	desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks basic and could be improved."
 	id = "scalpel_laser1"
 	req_tech = list(TECH_BIO = 2, TECH_MATERIAL = 2, TECH_MAGNET = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 12500, "glass" = 7500)
+	materials = list(DEFAULT_WALL_MATERIAL = 12500, "glass" = 7500, MAT_COPPER = 120)
 	build_path = /obj/item/weapon/surgical/scalpel/laser1
 	sort_string = "KAAAA"

@@ -75,7 +75,7 @@
 	desc = "A hand-held body scanner able to distinguish vital signs of the subject."
 	id = "medical_analyzer"
 	req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 500, MAT_COPPER = 20)
 	build_path = /obj/item/device/healthanalyzer
 	sort_string = "KBAAA"

@@ -121,6 +121,6 @@
 	desc = "A more advanced version of the regular roller bed, with inbuilt surgical stabilisers and an improved folding system."
 	id = "roller_bed"
 	req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 3, TECH_MAGNET = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 2000, "phoron" = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 2000, "phoron" = 2000, MAT_COPPER = 100)
 	build_path = /obj/item/roller/adv
 	sort_string = "KCAAA"
--- a/code/modules/research/designs/mining_toys.dm
+++ b/code/modules/research/designs/mining_toys.dm
@@ -7,14 +7,14 @@
 /datum/design/item/weapon/mining/drill
 	id = "drill"
 	req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 1000) //expensive, but no need for miners.
+	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 1000, MAT_COPPER = 10) //expensive, but no need for miners.
 	build_path = /obj/item/weapon/pickaxe/drill
 	sort_string = "FAAAA"

 /datum/design/item/weapon/mining/jackhammer
 	id = "jackhammer"
 	req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 500, "silver" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 500, "silver" = 500, MAT_COPPER = 20)
 	build_path = /obj/item/weapon/pickaxe/jackhammer
 	sort_string = "FAAAB"

@@ -28,14 +28,14 @@
 /datum/design/item/weapon/mining/pick_diamond
 	id = "pick_diamond"
 	req_tech = list(TECH_MATERIAL = 6)
-	materials = list("diamond" = 3000)
+	materials = list(MAT_WOOD = 2000, "diamond" = 3000)
 	build_path = /obj/item/weapon/pickaxe/diamond
 	sort_string = "FAAAD"

 /datum/design/item/weapon/mining/drill_diamond
 	id = "drill_diamond"
 	req_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 1000, "diamond" = 2000)
+	materials = list(MAT_ALUMINIUM = 2000, DEFAULT_WALL_MATERIAL = 1000, "glass" = 500, "diamond" = 2000, MAT_COPPER = 50)
 	build_path = /obj/item/weapon/pickaxe/diamonddrill
 	sort_string = "FAAAE"

@@ -45,7 +45,7 @@
 	desc = "Used to check spatial depth and density of rock outcroppings."
 	id = "depth_scanner"
 	req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 1000,"glass" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 1000,"glass" = 1000, MAT_COPPER = 50)
 	build_path = /obj/item/device/depth_scanner
 	sort_string = "FBAAA"
 // CHOMPstation addition
--- a/code/modules/research/designs/misc.dm
+++ b/code/modules/research/designs/misc.dm
@@ -8,7 +8,7 @@
 	name = "Communicator"
 	id = "communicator"
 	req_tech = list(TECH_DATA = 2, TECH_MAGNET = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 500, MAT_COPPER = 50)
 	build_path = /obj/item/device/communicator
 	sort_string = "TAAAA"

@@ -17,7 +17,7 @@ datum/design/item/general/laserpointer
 	desc = "Don't shine it in your eyes!"
 	id = "laser_pointer"
 	req_tech = list(TECH_MAGNET = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 100, "glass" = 50)
+	materials = list(DEFAULT_WALL_MATERIAL = 100, "glass" = 50, MAT_COPPER = 10)
 	build_path = /obj/item/device/laser_pointer
 	sort_string = "TAABA"

@@ -25,7 +25,7 @@ datum/design/item/general/laserpointer
 	name = "handheld translator"
 	id = "translator"
 	req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 3000)
+	materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 3000, MAT_COPPER = 50)
 	build_path = /obj/item/device/universal_translator
 	sort_string = "TAACA"

@@ -33,7 +33,7 @@ datum/design/item/general/laserpointer
 	name = "earpiece translator"
 	id = "ear_translator"
 	req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5)	//It's been hella miniaturized.
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 2000, "gold" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 2000, "gold" = 1000, MAT_COPPER = 50)
 	build_path = /obj/item/device/universal_translator/ear
 	sort_string = "TAACB"

@@ -51,7 +51,7 @@ datum/design/item/general/laserpointer
 	desc = "Allows for deciphering the binary channel on-the-fly."
 	id = "binaryencrypt"
 	req_tech = list(TECH_ILLEGAL = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 300, "glass" = 300)
+	materials = list(DEFAULT_WALL_MATERIAL = 300, "glass" = 300, MAT_COPPER = 30)
 	build_path = /obj/item/device/encryptionkey/binary
 	sort_string = "TBAAA"

@@ -60,7 +60,7 @@ datum/design/item/general/laserpointer
 	desc = "A kit of dangerous, high-tech equipment with changeable looks."
 	id = "chameleon"
 	req_tech = list(TECH_ILLEGAL = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 500)
+	materials = list(MAT_PLASTIC = 500, MAT_COPPER = 500, DEFAULT_WALL_MATERIAL = 500)
 	build_path = /obj/item/weapon/storage/box/syndie_kit/chameleon
 	sort_string = "TBAAB"

--- a/code/modules/research/designs/modular_computer.dm
+++ b/code/modules/research/designs/modular_computer.dm
@@ -9,14 +9,14 @@
 	name = "basic hard drive"
 	id = "hdd_basic"
 	req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 100)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 100, MAT_COPPER = 50)
 	build_path = /obj/item/weapon/computer_hardware/hard_drive/
 	sort_string = "VAAAA"

 /datum/design/item/modularcomponent/disk/advanced
 	name = "advanced hard drive"
 	id = "hdd_advanced"
-	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 200)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 200, MAT_COPPER = 50)
 	build_path = /obj/item/weapon/computer_hardware/hard_drive/advanced
 	sort_string = "VAAAB"

@@ -24,7 +24,7 @@
 	name = "super hard drive"
 	id = "hdd_super"
 	req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 8000, "glass" = 400)
+	materials = list(DEFAULT_WALL_MATERIAL = 8000, "glass" = 400, MAT_COPPER = 50)
 	build_path = /obj/item/weapon/computer_hardware/hard_drive/super
 	sort_string = "VAAAC"

@@ -32,7 +32,7 @@
 	name = "cluster hard drive"
 	id = "hdd_cluster"
 	req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 16000, "glass" = 800)
+	materials = list(DEFAULT_WALL_MATERIAL = 16000, "glass" = 800, MAT_COPPER = 40)
 	build_path = /obj/item/weapon/computer_hardware/hard_drive/cluster
 	sort_string = "VAAAD"

@@ -40,7 +40,7 @@
 	name = "small hard drive"
 	id = "hdd_small"
 	req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 200)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 200, MAT_COPPER = 30)
 	build_path = /obj/item/weapon/computer_hardware/hard_drive/small
 	sort_string = "VAAAE"

@@ -48,7 +48,7 @@
 	name = "micro hard drive"
 	id = "hdd_micro"
 	req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 100)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 100, MAT_COPPER = 20)
 	build_path = /obj/item/weapon/computer_hardware/hard_drive/micro
 	sort_string = "VAAAF"

@@ -58,7 +58,7 @@
 	name = "basic network card"
 	id = "netcard_basic"
 	req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 100)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 100, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/network_card
 	sort_string = "VBAAA"

@@ -66,7 +66,7 @@
 	name = "advanced network card"
 	id = "netcard_advanced"
 	req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 200)
+	materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 200, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/network_card/advanced
 	sort_string = "VBAAB"

@@ -74,7 +74,7 @@
 	name = "wired network card"
 	id = "netcard_wired"
 	req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 400)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 400, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/network_card/wired
 	sort_string = "VBAAC"

@@ -84,7 +84,7 @@
 	name = "standard battery module"
 	id = "bat_normal"
 	req_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/battery_module
 	sort_string = "VCAAA"

@@ -92,7 +92,7 @@
 	name = "advanced battery module"
 	id = "bat_advanced"
 	req_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 4000)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/battery_module/advanced
 	sort_string = "VCAAB"

@@ -100,7 +100,7 @@
 	name = "super battery module"
 	id = "bat_super"
 	req_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 8000)
+	materials = list(DEFAULT_WALL_MATERIAL = 8000, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/battery_module/super
 	sort_string = "VCAAC"

@@ -108,7 +108,7 @@
 	name = "ultra battery module"
 	id = "bat_ultra"
 	req_tech = list(TECH_POWER = 5, TECH_ENGINEERING = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 16000)
+	materials = list(DEFAULT_WALL_MATERIAL = 16000, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/battery_module/ultra
 	sort_string = "VCAAD"

@@ -116,7 +116,7 @@
 	name = "nano battery module"
 	id = "bat_nano"
 	req_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/battery_module/nano
 	sort_string = "VCAAE"

@@ -124,7 +124,7 @@
 	name = "micro battery module"
 	id = "bat_micro"
 	req_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 4000)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/battery_module/micro
 	sort_string = "VCAAF"

@@ -134,7 +134,7 @@
 	name = "computer processor unit"
 	id = "cpu_normal"
 	req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 8000)
+	materials = list(DEFAULT_WALL_MATERIAL = 8000, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/processor_unit
 	sort_string = "VDAAA"

@@ -142,7 +142,7 @@
 	name = "computer microprocessor unit"
 	id = "cpu_small"
 	req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 4000)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/processor_unit/small
 	sort_string = "VDAAB"

@@ -150,7 +150,7 @@
 	name = "computer photonic processor unit"
 	id = "pcpu_normal"
 	req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 32000, glass = 8000)
+	materials = list(DEFAULT_WALL_MATERIAL = 32000, glass = 8000, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/processor_unit/photonic
 	sort_string = "VDAAC"

@@ -158,7 +158,7 @@
 	name = "computer photonic microprocessor unit"
 	id = "pcpu_small"
 	req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 16000, glass = 4000)
+	materials = list(DEFAULT_WALL_MATERIAL = 16000, glass = 4000, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/processor_unit/photonic/small
 	sort_string = "VDAAD"

@@ -168,7 +168,7 @@
 	name = "RFID card slot"
 	id = "cardslot"
 	req_tech = list(TECH_DATA = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 3000)
+	materials = list(DEFAULT_WALL_MATERIAL = 3000, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/card_slot
 	sort_string = "VEAAA"

@@ -176,7 +176,7 @@
 	name = "nano printer"
 	id = "nanoprinter"
 	req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 3000)
+	materials = list(DEFAULT_WALL_MATERIAL = 3000, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/nano_printer
 	sort_string = "VEAAB"

@@ -184,7 +184,7 @@
 	name = "tesla link"
 	id = "teslalink"
 	req_tech = list(TECH_DATA = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 10000)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, MAT_PHORON = 350, MAT_GOLD = 500)
 	build_path = /obj/item/weapon/computer_hardware/tesla_link
 	sort_string = "VEAAC"

@@ -198,7 +198,7 @@
 	name = "basic data crystal"
 	id = "portadrive_basic"
 	req_tech = list(TECH_DATA = 1)
-	materials = list("glass" = 8000)
+	materials = list("glass" = 8000, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/computer_hardware/hard_drive/portable
 	sort_string = "VFAAA"

@@ -206,7 +206,7 @@
 	name = "advanced data crystal"
 	id = "portadrive_advanced"
 	req_tech = list(TECH_DATA = 2)
-	materials = list("glass" = 16000)
+	materials = list("glass" = 16000, MAT_COPPER = 20)
 	build_path = /obj/item/weapon/computer_hardware/hard_drive/portable/advanced
 	sort_string = "VFAAB"

@@ -214,6 +214,6 @@
 	name = "super data crystal"
 	id = "portadrive_super"
 	req_tech = list(TECH_DATA = 4)
-	materials = list("glass" = 32000)
+	materials = list("glass" = 32000, MAT_COPPER = 60)
 	build_path = /obj/item/weapon/computer_hardware/hard_drive/portable/super
 	sort_string = "VFAAC"
--- a/code/modules/research/designs/pdas.dm
+++ b/code/modules/research/designs/pdas.dm
@@ -5,7 +5,7 @@
 	desc = "Cheaper than whiny non-digital assistants."
 	id = "pda"
 	req_tech = list(TECH_ENGINEERING = 2, TECH_POWER = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 10)
 	build_path = /obj/item/device/pda
 	sort_string = "WAAAA"

--- a/code/modules/research/designs/power_cells.dm
+++ b/code/modules/research/designs/power_cells.dm
@@ -20,7 +20,7 @@
 	build_type = PROTOLATHE | MECHFAB
 	id = "basic_cell"
 	req_tech = list(TECH_POWER = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50)
+	materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50, MAT_COPPER = 15)
 	build_path = /obj/item/weapon/cell
 	category = list("Misc")
 	sort_string = "BAAAA"
@@ -30,7 +30,7 @@
 	build_type = PROTOLATHE | MECHFAB
 	id = "high_cell"
 	req_tech = list(TECH_POWER = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 60)
+	materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 60, MAT_COPPER = 15)
 	build_path = /obj/item/weapon/cell/high
 	category = list("Misc")
 	sort_string = "BAAAB"
@@ -39,7 +39,7 @@
 	name = "super-capacity"
 	id = "super_cell"
 	req_tech = list(TECH_POWER = 3, TECH_MATERIAL = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 70)
+	materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 70, MAT_COPPER = 15)
 	build_path = /obj/item/weapon/cell/super
 	category = list("Misc")
 	sort_string = "BAAAC"
@@ -57,7 +57,7 @@
 	name = "device"
 	build_type = PROTOLATHE
 	id = "device"
-	materials = list(DEFAULT_WALL_MATERIAL = 350, "glass" = 25)
+	materials = list(DEFAULT_WALL_MATERIAL = 350, "glass" = 25, MAT_COPPER = 5)
 	build_path = /obj/item/weapon/cell/device
 	category = list("Misc")
 	sort_string = "BAABA"
@@ -66,8 +66,16 @@
 /datum/design/item/powercell/advance_device
 	name = "device, advanced"
 	build_type = PROTOLATHE
+<<<<<<< HEAD
 	id = "advance_device"
 	materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50)
+||||||| parent of 4e5a8041e8... Merge pull request #9620 from VOREStation/upstream-merge-7811
+	id = "weapon"
+	materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50)
+=======
+	id = "weapon"
+	materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50, MAT_COPPER = 15)
+>>>>>>> 4e5a8041e8... Merge pull request #9620 from VOREStation/upstream-merge-7811
 	build_path = /obj/item/weapon/cell/device/weapon
 	category = list("Misc")
 	sort_string = "BAABB"
--- a/code/modules/research/designs/stock_parts.dm
+++ b/code/modules/research/designs/stock_parts.dm
@@ -40,14 +40,14 @@
 /datum/design/item/stock_part/hyper_matter_bin
 	id = "hyper_matter_bin"
 	req_tech = list(TECH_MATERIAL = 6, TECH_ARCANE = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 200, MAT_VERDANTIUM = 60, MAT_DURASTEEL = 75)
+	materials = list(MAT_ALUMINIUM = 200, MAT_VERDANTIUM = 60, MAT_TITANIUM = 75)
 	build_path = /obj/item/weapon/stock_parts/matter_bin/hyper
 	sort_string = "AAAAD"

 /datum/design/item/stock_part/omni_matter_bin
 	id = "omni_matter_bin"
 	req_tech = list(TECH_MATERIAL = 7, TECH_PRECURSOR = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, MAT_PLASTEEL = 100, MAT_MORPHIUM = 100, MAT_DURASTEEL = 100)
+	materials = list(MAT_TITANIUM = 2000, MAT_PLASTEEL = 100, MAT_MORPHIUM = 100, MAT_DURASTEEL = 100)
 	build_path = /obj/item/weapon/stock_parts/matter_bin/omni
 	sort_string = "AAAAE"

@@ -77,14 +77,14 @@
 /datum/design/item/stock_part/hyper_mani
 	id = "hyper_mani"
 	req_tech = list(TECH_MATERIAL = 6, TECH_DATA = 3, TECH_ARCANE = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 200, MAT_VERDANTIUM = 50, MAT_DURASTEEL = 50)
+	materials = list(MAT_ALUMINIUM = 200, MAT_VERDANTIUM = 50, MAT_TITANIUM = 50)
 	build_path = /obj/item/weapon/stock_parts/manipulator/hyper
 	sort_string = "AAABD"

 /datum/design/item/stock_part/omni_mani
 	id = "omni_mani"
 	req_tech = list(TECH_MATERIAL = 7, TECH_DATA = 4, TECH_PRECURSOR = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, MAT_PLASTEEL = 500, MAT_MORPHIUM = 100, MAT_DURASTEEL = 100)
+	materials = list(MAT_ALUMINIUM = 2000, MAT_PLASTEEL = 500, MAT_MORPHIUM = 100, MAT_DURASTEEL = 100)
 	build_path = /obj/item/weapon/stock_parts/manipulator/omni
 	sort_string = "AAABE"

@@ -93,14 +93,14 @@
 /datum/design/item/stock_part/basic_capacitor
 	id = "basic_capacitor"
 	req_tech = list(TECH_POWER = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/stock_parts/capacitor
 	sort_string = "AAACA"

 /datum/design/item/stock_part/adv_capacitor
 	id = "adv_capacitor"
 	req_tech = list(TECH_POWER = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/stock_parts/capacitor/adv
 	sort_string = "AAACB"

@@ -114,7 +114,7 @@
 /datum/design/item/stock_part/hyper_capacitor
 	id = "hyper_capacitor"
 	req_tech = list(TECH_POWER = 6, TECH_MATERIAL = 5, TECH_BLUESPACE = 1, TECH_ARCANE = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 200, MAT_GLASS = 100, MAT_VERDANTIUM = 30, MAT_DURASTEEL = 25)
+	materials = list(MAT_ALUMINIUM = 200, MAT_GLASS = 100, MAT_VERDANTIUM = 30, MAT_TITANIUM = 25)
 	build_path = /obj/item/weapon/stock_parts/capacitor/hyper
 	sort_string = "AAACD"

@@ -130,14 +130,14 @@
 /datum/design/item/stock_part/basic_sensor
 	id = "basic_sensor"
 	req_tech = list(TECH_MAGNET = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
+	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/stock_parts/scanning_module
 	sort_string = "AAADA"

 /datum/design/item/stock_part/adv_sensor
 	id = "adv_sensor"
 	req_tech = list(TECH_MAGNET = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
+	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20, MAT_COPPER = 10)
 	build_path = /obj/item/weapon/stock_parts/scanning_module/adv
 	sort_string = "AAADB"

@@ -151,14 +151,14 @@
 /datum/design/item/stock_part/hyper_sensor
 	id = "hyper_sensor"
 	req_tech = list(TECH_MAGNET = 6, TECH_MATERIAL = 4, TECH_ARCANE = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 50, MAT_GLASS = 20, MAT_SILVER = 50, MAT_VERDANTIUM = 40, MAT_DURASTEEL = 50)
+	materials = list(MAT_ALUMINIUM = 50, MAT_GLASS = 20, MAT_SILVER = 50, MAT_VERDANTIUM = 40, MAT_TITANIUM = 50)
 	build_path = /obj/item/weapon/stock_parts/scanning_module/hyper
 	sort_string = "AAADD"

 /datum/design/item/stock_part/omni_sensor
 	id = "omni_sensor"
 	req_tech = list(TECH_MAGNET = 7, TECH_MATERIAL = 5, TECH_PRECURSOR = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 1000, MAT_PLASTEEL = 500, MAT_GLASS = 750, MAT_SILVER = 500, MAT_MORPHIUM = 60, MAT_DURASTEEL = 100)
+	materials = list(MAT_ALUMINIUM = 1000, MAT_TITANIUM = 500, MAT_GLASS = 750, MAT_SILVER = 500, MAT_MORPHIUM = 60, MAT_DURASTEEL = 100)
 	build_path = /obj/item/weapon/stock_parts/scanning_module/omni
 	sort_string = "AAADE"

@@ -188,14 +188,14 @@
 /datum/design/item/stock_part/hyper_micro_laser
 	id = "hyper_micro_laser"
 	req_tech = list(TECH_MAGNET = 6, TECH_MATERIAL = 6, TECH_ARCANE = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 200, MAT_GLASS = 20, MAT_URANIUM = 30, MAT_VERDANTIUM = 50, MAT_DURASTEEL = 100)
+	materials = list(MAT_ALUMINIUM = 200, MAT_GLASS = 20, MAT_URANIUM = 30, MAT_VERDANTIUM = 50, MAT_TITANIUM = 100)
 	build_path = /obj/item/weapon/stock_parts/micro_laser/hyper
 	sort_string = "AAAED"

 /datum/design/item/stock_part/omni_micro_laser
 	id = "omni_micro_laser"
 	req_tech = list(TECH_MAGNET = 7, TECH_MATERIAL = 7, TECH_PRECURSOR = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, MAT_GLASS = 500, MAT_URANIUM = 2000, MAT_MORPHIUM = 50, MAT_DURASTEEL = 100)
+	materials = list(MAT_TITANIUM = 2000, MAT_GLASS = 500, MAT_URANIUM = 2000, MAT_MORPHIUM = 50, MAT_DURASTEEL = 100)
 	build_path = /obj/item/weapon/stock_parts/micro_laser/omni
 	sort_string = "AAAEE"

--- a/code/modules/research/designs/weapons.dm
+++ b/code/modules/research/designs/weapons.dm
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /datum/design/item/weapon/AssembleDesignName()
 	..()
 	name = "Weapon prototype ([item_name])"
@@ -255,3 +256,529 @@
 	materials = list(DEFAULT_WALL_MATERIAL = 3000)
 	build_path = /obj/item/weapon/grenade/chem_grenade/large
 	sort_string = "MCAAA"
+||||||| parent of 4e5a8041e8... Merge pull request #9620 from VOREStation/upstream-merge-7811
+/datum/design/item/weapon/AssembleDesignName()
+	..()
+	name = "Weapon prototype ([item_name])"
+
+/datum/design/item/weapon/ammo/AssembleDesignName()
+	..()
+	name = "Weapon ammo prototype ([item_name])"
+
+/datum/design/item/weapon/AssembleDesignDesc()
+	if(!desc)
+		if(build_path)
+			var/obj/item/I = build_path
+			desc = initial(I.desc)
+		..()
+
+// Energy weapons
+
+/datum/design/item/weapon/energy/AssembleDesignName()
+	..()
+	name = "Energy weapon prototype ([item_name])"
+
+/datum/design/item/weapon/energy/stunrevolver
+	id = "stunrevolver"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000)
+	build_path = /obj/item/weapon/gun/energy/stunrevolver
+	sort_string = "MAAAA"
+
+/datum/design/item/weapon/energy/nuclear_gun
+	id = "nuclear_gun"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, "uranium" = 500)
+	build_path = /obj/item/weapon/gun/energy/gun/nuclear
+	sort_string = "MAAAB"
+
+/datum/design/item/weapon/energy/phoronpistol
+	id = "ppistol"
+	req_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, "phoron" = 3000)
+	build_path = /obj/item/weapon/gun/energy/toxgun
+	sort_string = "MAAAC"
+
+/datum/design/item/weapon/energy/lasercannon
+	desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core."
+	id = "lasercannon"
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 1000, "diamond" = 2000)
+	build_path = /obj/item/weapon/gun/energy/lasercannon
+	sort_string = "MAAAD"
+
+/datum/design/item/weapon/energy/decloner
+	id = "decloner"
+	req_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 7, TECH_BIO = 5, TECH_POWER = 6)
+	materials = list("gold" = 5000,"uranium" = 10000)
+	build_path = /obj/item/weapon/gun/energy/decloner
+	sort_string = "MAAAE"
+
+/datum/design/item/weapon/energy/temp_gun
+	desc = "A gun that shoots high-powered glass-encased energy temperature bullets."
+	id = "temp_gun"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_POWER = 3, TECH_MAGNET = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 500, "silver" = 3000)
+	build_path = /obj/item/weapon/gun/energy/temperature
+	sort_string = "MAAAF"
+
+/datum/design/item/weapon/energy/flora_gun
+	id = "flora_gun"
+	req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 500, "uranium" = 500)
+	build_path = /obj/item/weapon/gun/energy/floragun
+	sort_string = "MAAAG"
+
+// Ballistic weapons
+
+/datum/design/item/weapon/ballistic/AssembleDesignName()
+	..()
+	name = "Ballistic weapon prototype ([item_name])"
+
+/datum/design/item/weapon/ballistic/advanced_smg
+	id = "smg"
+	desc = "An advanced 9mm SMG with a reflective laser optic."
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 8000, "silver" = 2000, "diamond" = 1000)
+	build_path = /obj/item/weapon/gun/projectile/automatic/advanced_smg
+	sort_string = "MABAA"
+
+// Ballistic ammo
+
+/datum/design/item/weapon/ballistic/ammo/AssembleDesignName()
+	..()
+	name = "Ballistic weapon ammo prototype ([name])"
+
+/datum/design/item/weapon/ballistic/ammo/ammo_9mmAdvanced
+	name = "9mm magazine"
+	id = "ammo_9mm"
+	desc = "A 21 round magazine for an advanced 9mm SMG."
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 3750, "silver" = 100) // Requires silver for proprietary magazines! Or something.
+	build_path = /obj/item/ammo_magazine/m9mmAdvanced
+	sort_string = "MABBA"
+
+/datum/design/item/weapon/ballistic/ammo/stunshell
+	name = "stun shells"
+	desc = "A stunning shell for a shotgun."
+	id = "stunshell"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000)
+	build_path = /obj/item/weapon/storage/box/stunshells
+	sort_string = "MABBB"
+
+/datum/design/item/weapon/ballistic/ammo/empshell
+	name = "emp shells"
+	desc = "An electromagnetic shell for a shotgun."
+	id = "empshell"
+	req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, MAT_URANIUM = 1000)
+	build_path = /obj/item/weapon/storage/box/empshells
+	sort_string = "MABBC"
+
+// Phase weapons
+
+/datum/design/item/weapon/phase/AssembleDesignName()
+	..()
+	name = "Phase weapon prototype ([item_name])"
+
+/* //VOREStation Removal Start
+/datum/design/item/weapon/phase/phase_pistol
+	id = "phasepistol"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2, TECH_POWER = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000)
+	build_path = /obj/item/weapon/gun/energy/phasegun/pistol
+	sort_string = "MACAA"
+
+/datum/design/item/weapon/phase/phase_carbine
+	id = "phasecarbine"
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2, TECH_POWER = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 1500)
+	build_path = /obj/item/weapon/gun/energy/phasegun
+	sort_string = "MACAB"
+
+/datum/design/item/weapon/phase/phase_rifle
+	id = "phaserifle"
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 2000, "silver" = 500)
+	build_path = /obj/item/weapon/gun/energy/phasegun/rifle
+	sort_string = "MACAC"
+
+/datum/design/item/weapon/phase/phase_cannon
+	id = "phasecannon"
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_POWER = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 2000, "silver" = 1000, "diamond" = 750)
+	build_path = /obj/item/weapon/gun/energy/phasegun/cannon
+	sort_string = "MACAD"
+*/ //VOREStation Removal End
+
+// Other weapons
+
+/datum/design/item/weapon/rapidsyringe
+	id = "rapidsyringe"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000)
+	build_path = /obj/item/weapon/gun/launcher/syringe/rapid
+	sort_string = "MADAA"
+
+/datum/design/item/weapon/dartgun
+	desc = "A gun that fires small hollow chemical-payload darts."
+	id = "dartgun_r"
+	req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_BIO = 4, TECH_MAGNET = 3, TECH_ILLEGAL = 1)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "gold" = 5000, "silver" = 2500, "glass" = 750)
+	build_path = /obj/item/weapon/gun/projectile/dartgun/research
+	sort_string = "MADAB"
+
+/datum/design/item/weapon/chemsprayer
+	desc = "An advanced chem spraying device."
+	id = "chemsprayer"
+	req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000)
+	build_path = /obj/item/weapon/reagent_containers/spray/chemsprayer
+	sort_string = "MADAC"
+
+/datum/design/item/weapon/fuelrod
+	id = "fuelrod_gun"
+	req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_PHORON = 4, TECH_ILLEGAL = 5, TECH_MAGNET = 5)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 2000, "gold" = 500, "silver" = 500, "uranium" = 1000, "phoron" = 3000, "diamond" = 1000)
+	build_path = /obj/item/weapon/gun/magnetic/fuelrod
+	sort_string = "MADAD"
+
+// Ammo for those
+
+/datum/design/item/weapon/ammo/dartgunmag_small
+	id = "dartgun_mag_s"
+	req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
+	materials = list(DEFAULT_WALL_MATERIAL = 300, "gold" = 100, "silver" = 100, "glass" = 300)
+	build_path = /obj/item/ammo_magazine/chemdart/small
+	sort_string = "MADBA"
+
+/datum/design/item/weapon/ammo/dartgun_ammo_small
+	id = "dartgun_ammo_s"
+	req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
+	materials = list(DEFAULT_WALL_MATERIAL = 50, "gold" = 30, "silver" = 30, "glass" = 50)
+	build_path = /obj/item/ammo_casing/chemdart/small
+	sort_string = "MADBB"
+
+/datum/design/item/weapon/ammo/dartgunmag_med
+	id = "dartgun_mag_m"
+	req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, "gold" = 150, "silver" = 150, "diamond" = 200, "glass" = 400)
+	build_path = /obj/item/ammo_magazine/chemdart
+	sort_string = "MADBC"
+
+/datum/design/item/weapon/ammo/dartgun_ammo_med
+	id = "dartgun_ammo_m"
+	req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
+	materials = list(DEFAULT_WALL_MATERIAL = 80, "gold" = 40, "silver" = 40, "glass" = 60)
+	build_path = /obj/item/ammo_casing/chemdart
+	sort_string = "MADBD"
+
+/datum/design/item/weapon/ammo/flechette
+	id = "magnetic_ammo"
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_MAGNET = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, "gold" = 300, "glass" = 150, MAT_PHORON = 100)
+	build_path = /obj/item/weapon/magnetic_ammo
+	sort_string = "MADBE"
+
+// Melee weapons
+
+/datum/design/item/weapon/melee/AssembleDesignName()
+	..()
+	name = "Melee weapon prototype ([item_name])"
+
+/datum/design/item/weapon/melee/esword
+	name = "Portable Energy Blade"
+	id = "chargesword"
+	req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 4, TECH_ENGINEERING = 5, TECH_ILLEGAL = 4, TECH_ARCANE = 1)
+	materials = list(MAT_PLASTEEL = 3500, "glass" = 1000, MAT_LEAD = 2250, MAT_METALHYDROGEN = 500)
+	build_path = /obj/item/weapon/melee/energy/sword/charge
+	sort_string = "MBAAA"
+
+/datum/design/item/weapon/melee/eaxe
+	name = "Energy Axe"
+	id = "chargeaxe"
+	req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 5, TECH_ENGINEERING = 4, TECH_ILLEGAL = 4)
+	materials = list(MAT_PLASTEEL = 3500, MAT_OSMIUM = 2000, MAT_LEAD = 2000, MAT_METALHYDROGEN = 500)
+	build_path = /obj/item/weapon/melee/energy/axe/charge
+	sort_string = "MBAAB"
+
+// Grenade stuff
+/datum/design/item/weapon/grenade/AssembleDesignName()
+	..()
+	name = "Grenade casing prototype ([item_name])"
+
+/datum/design/item/weapon/grenade/large_grenade
+	id = "large_Grenade"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 3000)
+	build_path = /obj/item/weapon/grenade/chem_grenade/large
+	sort_string = "MCAAA"
+=======
+/datum/design/item/weapon/AssembleDesignName()
+	..()
+	name = "Weapon prototype ([item_name])"
+
+/datum/design/item/weapon/ammo/AssembleDesignName()
+	..()
+	name = "Weapon ammo prototype ([item_name])"
+
+/datum/design/item/weapon/AssembleDesignDesc()
+	if(!desc)
+		if(build_path)
+			var/obj/item/I = build_path
+			desc = initial(I.desc)
+		..()
+
+// Energy weapons
+
+/datum/design/item/weapon/energy/AssembleDesignName()
+	..()
+	name = "Energy weapon prototype ([item_name])"
+
+/datum/design/item/weapon/energy/stunrevolver
+	id = "stunrevolver"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, MAT_COPPER = 30)
+	build_path = /obj/item/weapon/gun/energy/stunrevolver
+	sort_string = "MAAAA"
+
+/datum/design/item/weapon/energy/nuclear_gun
+	id = "nuclear_gun"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, "uranium" = 500, MAT_COPPER = 50)
+	build_path = /obj/item/weapon/gun/energy/gun/nuclear
+	sort_string = "MAAAB"
+
+/datum/design/item/weapon/energy/phoronpistol
+	id = "ppistol"
+	req_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, "phoron" = 3000, MAT_COPPER = 50)
+	build_path = /obj/item/weapon/gun/energy/toxgun
+	sort_string = "MAAAC"
+
+/datum/design/item/weapon/energy/lasercannon
+	desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core."
+	id = "lasercannon"
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
+	materials = list(MAT_TITANIUM = 5000, MAT_BOROSILICATE = 1000, "diamond" = 2000, MAT_COPPER = 50)
+	build_path = /obj/item/weapon/gun/energy/lasercannon
+	sort_string = "MAAAD"
+
+/datum/design/item/weapon/energy/decloner
+	id = "decloner"
+	req_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 7, TECH_BIO = 5, TECH_POWER = 6)
+	materials = list(MAT_TITANIUM = 2750, "gold" = 5000,"uranium" = 10000)
+	build_path = /obj/item/weapon/gun/energy/decloner
+	sort_string = "MAAAE"
+
+/datum/design/item/weapon/energy/temp_gun
+	desc = "A gun that shoots high-powered glass-encased energy temperature bullets."
+	id = "temp_gun"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_POWER = 3, TECH_MAGNET = 2)
+	materials = list(MAT_ALUMINIUM = 5000, "glass" = 500, "silver" = 3000)
+	build_path = /obj/item/weapon/gun/energy/temperature
+	sort_string = "MAAAF"
+
+/datum/design/item/weapon/energy/flora_gun
+	id = "flora_gun"
+	req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3)
+	materials = list(MAT_ALUMINIUM = 2000, "glass" = 500, "uranium" = 500)
+	build_path = /obj/item/weapon/gun/energy/floragun
+	sort_string = "MAAAG"
+
+// Ballistic weapons
+
+/datum/design/item/weapon/ballistic/AssembleDesignName()
+	..()
+	name = "Ballistic weapon prototype ([item_name])"
+
+/datum/design/item/weapon/ballistic/advanced_smg
+	id = "smg"
+	desc = "An advanced 9mm SMG with a reflective laser optic."
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 8000, "silver" = 2000, "diamond" = 1000)
+	build_path = /obj/item/weapon/gun/projectile/automatic/advanced_smg
+	sort_string = "MABAA"
+
+// Ballistic ammo
+
+/datum/design/item/weapon/ballistic/ammo/AssembleDesignName()
+	..()
+	name = "Ballistic weapon ammo prototype ([name])"
+
+/datum/design/item/weapon/ballistic/ammo/ammo_9mmAdvanced
+	name = "9mm magazine"
+	id = "ammo_9mm"
+	desc = "A 21 round magazine for an advanced 9mm SMG."
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 3750, "silver" = 100) // Requires silver for proprietary magazines! Or something.
+	build_path = /obj/item/ammo_magazine/m9mmAdvanced
+	sort_string = "MABBA"
+
+/datum/design/item/weapon/ballistic/ammo/stunshell
+	name = "stun shells"
+	desc = "A stunning shell for a shotgun."
+	id = "stunshell"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000)
+	build_path = /obj/item/weapon/storage/box/stunshells
+	sort_string = "MABBB"
+
+/datum/design/item/weapon/ballistic/ammo/empshell
+	name = "emp shells"
+	desc = "An electromagnetic shell for a shotgun."
+	id = "empshell"
+	req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, MAT_URANIUM = 1000)
+	build_path = /obj/item/weapon/storage/box/empshells
+	sort_string = "MABBC"
+
+/datum/design/item/weapon/ballistic/ammo/ptrshell
+	name = "14.5mm shell"
+	desc = "A dense-core projectile fired from a small cannon."
+	id = "ptrshell"
+	req_tech = list(TECH_COMBAT = 7, TECH_ILLEGAL = 4)
+	materials = list(MAT_TITANIUM = 4000, MAT_URANIUM = 500, MAT_PLASTEEL = 500)
+	build_path = /obj/item/ammo_casing/a145
+	sort_string = "MABBD"
+
+// Phase weapons
+
+/datum/design/item/weapon/phase/AssembleDesignName()
+	..()
+	name = "Phase weapon prototype ([item_name])"
+
+/* //VOREStation Removal Start
+/datum/design/item/weapon/phase/phase_pistol
+	id = "phasepistol"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2, TECH_POWER = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, MAT_COPPER = 30)
+	build_path = /obj/item/weapon/gun/energy/phasegun/pistol
+	sort_string = "MACAA"
+
+/datum/design/item/weapon/phase/phase_carbine
+	id = "phasecarbine"
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2, TECH_POWER = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 1500, MAT_COPPER = 40)
+	build_path = /obj/item/weapon/gun/energy/phasegun
+	sort_string = "MACAB"
+
+/datum/design/item/weapon/phase/phase_rifle
+	id = "phaserifle"
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 2000, "silver" = 500)
+	build_path = /obj/item/weapon/gun/energy/phasegun/rifle
+	sort_string = "MACAC"
+
+/datum/design/item/weapon/phase/phase_cannon
+	id = "phasecannon"
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_POWER = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 2000, "silver" = 1000, "diamond" = 750)
+	build_path = /obj/item/weapon/gun/energy/phasegun/cannon
+	sort_string = "MACAD"
+*/ //VOREStation Removal End
+
+// Other weapons
+
+/datum/design/item/weapon/rapidsyringe
+	id = "rapidsyringe"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, MAT_COPPER = 20)
+	build_path = /obj/item/weapon/gun/launcher/syringe/rapid
+	sort_string = "MADAA"
+
+/datum/design/item/weapon/dartgun
+	desc = "A gun that fires small hollow chemical-payload darts."
+	id = "dartgun_r"
+	req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_BIO = 4, TECH_MAGNET = 3, TECH_ILLEGAL = 1)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "gold" = 5000, "silver" = 2500, "glass" = 750)
+	build_path = /obj/item/weapon/gun/projectile/dartgun/research
+	sort_string = "MADAB"
+
+/datum/design/item/weapon/chemsprayer
+	desc = "An advanced chem spraying device."
+	id = "chemsprayer"
+	req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, MAT_COPPER = 30)
+	build_path = /obj/item/weapon/reagent_containers/spray/chemsprayer
+	sort_string = "MADAC"
+
+/datum/design/item/weapon/fuelrod
+	id = "fuelrod_gun"
+	req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_PHORON = 4, TECH_ILLEGAL = 5, TECH_MAGNET = 5)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 2000, "gold" = 500, "silver" = 500, "uranium" = 1000, "phoron" = 3000, "diamond" = 1000)
+	build_path = /obj/item/weapon/gun/magnetic/fuelrod
+	sort_string = "MADAD"
+
+// Ammo for those
+
+/datum/design/item/weapon/ammo/dartgunmag_small
+	id = "dartgun_mag_s"
+	req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
+	materials = list(DEFAULT_WALL_MATERIAL = 300, "gold" = 100, "silver" = 100, "glass" = 300)
+	build_path = /obj/item/ammo_magazine/chemdart/small
+	sort_string = "MADBA"
+
+/datum/design/item/weapon/ammo/dartgun_ammo_small
+	id = "dartgun_ammo_s"
+	req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
+	materials = list(DEFAULT_WALL_MATERIAL = 50, "gold" = 30, "silver" = 30, "glass" = 50)
+	build_path = /obj/item/ammo_casing/chemdart/small
+	sort_string = "MADBB"
+
+/datum/design/item/weapon/ammo/dartgunmag_med
+	id = "dartgun_mag_m"
+	req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, "gold" = 150, "silver" = 150, "diamond" = 200, "glass" = 400)
+	build_path = /obj/item/ammo_magazine/chemdart
+	sort_string = "MADBC"
+
+/datum/design/item/weapon/ammo/dartgun_ammo_med
+	id = "dartgun_ammo_m"
+	req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1)
+	materials = list(DEFAULT_WALL_MATERIAL = 80, "gold" = 40, "silver" = 40, "glass" = 60)
+	build_path = /obj/item/ammo_casing/chemdart
+	sort_string = "MADBD"
+
+/datum/design/item/weapon/ammo/flechette
+	id = "magnetic_ammo"
+	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_MAGNET = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, "gold" = 300, "glass" = 150, MAT_PHORON = 100)
+	build_path = /obj/item/weapon/magnetic_ammo
+	sort_string = "MADBE"
+
+// Melee weapons
+
+/datum/design/item/weapon/melee/AssembleDesignName()
+	..()
+	name = "Melee weapon prototype ([item_name])"
+
+/datum/design/item/weapon/melee/esword
+	name = "Portable Energy Blade"
+	id = "chargesword"
+	req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 4, TECH_ENGINEERING = 5, TECH_ILLEGAL = 4, TECH_ARCANE = 1)
+	materials = list(MAT_PLASTEEL = 3500, "glass" = 1000, MAT_LEAD = 2250, MAT_METALHYDROGEN = 500)
+	build_path = /obj/item/weapon/melee/energy/sword/charge
+	sort_string = "MBAAA"
+
+/datum/design/item/weapon/melee/eaxe
+	name = "Energy Axe"
+	id = "chargeaxe"
+	req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 5, TECH_ENGINEERING = 4, TECH_ILLEGAL = 4)
+	materials = list(MAT_PLASTEEL = 3500, MAT_OSMIUM = 2000, MAT_LEAD = 2000, MAT_METALHYDROGEN = 500)
+	build_path = /obj/item/weapon/melee/energy/axe/charge
+	sort_string = "MBAAB"
+
+// Grenade stuff
+/datum/design/item/weapon/grenade/AssembleDesignName()
+	..()
+	name = "Grenade casing prototype ([item_name])"
+
+/datum/design/item/weapon/grenade/large_grenade
+	id = "large_Grenade"
+	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 3000)
+	build_path = /obj/item/weapon/grenade/chem_grenade/large
+	sort_string = "MCAAA"
+>>>>>>> 4e5a8041e8... Merge pull request #9620 from VOREStation/upstream-merge-7811
--- a/code/modules/research/designs/xenoarch_toys.dm
+++ b/code/modules/research/designs/xenoarch_toys.dm
@@ -9,7 +9,7 @@
 	id = "ano_scanner"
 	desc = "Aids in triangulation of exotic particles."
 	req_tech = list(TECH_BLUESPACE = 3, TECH_MAGNET = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 10000,"glass" = 5000)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000,"glass" = 5000, MAT_COPPER = 20)
 	build_path = /obj/item/device/ano_scanner
 	sort_string = "GAAAA"

@@ -18,7 +18,7 @@
 	id = "xenoarch_multitool"
 	req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3, TECH_BLUESPACE = 3)
 	build_path = /obj/item/device/xenoarch_multi_tool
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "uranium" = 500, "phoron" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "uranium" = 500, "phoron" = 500, MAT_COPPER = 40)
 	sort_string = "GAAAB"

 /datum/design/item/weapon/xenoarch/excavationdrill
@@ -26,6 +26,6 @@
 	id = "excavationdrill"
 	req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 3)
 	build_type = PROTOLATHE
-	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 4000)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 4000, MAT_COPPER = 30)
 	build_path = /obj/item/weapon/pickaxe/excavationdrill
 	sort_string = "GAAAC"
--- a/code/modules/research/designs/xenobio_toys.dm
+++ b/code/modules/research/designs/xenobio_toys.dm
@@ -7,14 +7,14 @@
 /datum/design/item/weapon/xenobio/slimebaton
 	id = "slimebaton"
 	req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2, TECH_POWER = 3, TECH_COMBAT = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, MAT_COPPER = 30)
 	build_path = /obj/item/weapon/melee/baton/slime
 	sort_string = "HAAAA"

 /datum/design/item/weapon/xenobio/slimetaser
 	id = "slimetaser"
 	req_tech = list(TECH_MATERIAL = 3, TECH_BIO = 3, TECH_POWER = 4, TECH_COMBAT = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, MAT_COPPER = 40)
 	build_path = /obj/item/weapon/gun/energy/taser/xeno
 	sort_string = "HAAAB"

@@ -25,6 +25,6 @@
 	desc = "A hand-held body scanner able to learn information about slimes."
 	id = "slime_scanner"
 	req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 500, MAT_COPPER = 30)
 	build_path = /obj/item/device/slime_scanner
 	sort_string = "HBAAA"
--- a/code/modules/research/mechfab_designs.dm
+++ b/code/modules/research/mechfab_designs.dm
@@ -357,11 +357,13 @@
 	name = "PBT \"Pacifier\" Mounted Taser"
 	id = "mech_taser"
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser
+	materials = list(DEFAULT_WALL_MATERIAL = 6500, MAT_COPPER = 1000)

 /datum/design/item/mecha/rigged_taser
 	name = "Jury-Rigged Taser"
 	id = "mech_taser-r"
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser/rigged
+	materials = list(DEFAULT_WALL_MATERIAL = 6500, MAT_COPPER = 200)

 /datum/design/item/mecha/shocker
 	name = "Exosuit Electrifier"
@@ -573,7 +575,7 @@
 	desc = "Automated repair droid, exosuits' best companion. BEEP BOOP"
 	id = "mech_repair_droid"
 	req_tech = list(TECH_MAGNET = 3, TECH_DATA = 3, TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 7500, "gold" = 750, "silver" = 1500, "glass" = 3750)
+	materials = list(DEFAULT_WALL_MATERIAL = 7500, "gold" = 750, "silver" = 1500, MAT_ALUMINIUM = 3750)
 	build_path = /obj/item/mecha_parts/mecha_equipment/repair_droid

 /datum/design/item/mecha/combat_shield
@@ -597,7 +599,7 @@
 	desc = "Deploys a small medical drone capable of patching small wounds in order to stabilize nearby patients."
 	id = "mech_med_droid"
 	req_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_BIO = 5, TECH_DATA = 4, TECH_ARCANE = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 8000, MAT_GOLD = 2000, MAT_SILVER = 3000, MAT_VERDANTIUM = 2500, MAT_GLASS = 3000)
+	materials = list(DEFAULT_WALL_MATERIAL = 8000, MAT_GOLD = 2000, MAT_ALUMINIUM = 3750, MAT_VERDANTIUM = 2500, MAT_GLASS = 3000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/crisis_drone

 /datum/design/item/mecha/rad_drone
@@ -605,7 +607,7 @@
 	desc = "Deploys a small hazmat drone capable of purging minor radiation damage in order to stabilize nearby patients."
 	id = "mech_rad_droid"
 	req_tech = list(TECH_PHORON = 4, TECH_MAGNET = 5, TECH_BIO = 6, TECH_DATA = 4, TECH_ARCANE = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 8000, MAT_GOLD = 2000, MAT_URANIUM = 3000, MAT_VERDANTIUM = 2500, MAT_GLASS = 3000)
+	materials = list(DEFAULT_WALL_MATERIAL = 8000, MAT_GOLD = 2000, MAT_ALUMINIUM = 2500, MAT_URANIUM = 1000, MAT_VERDANTIUM = 1000, MAT_GLASS = 3000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/crisis_drone/rad

 /datum/design/item/mecha/medanalyzer
@@ -613,7 +615,7 @@
 	desc = "An advanced mech-mounted device that is not quite as powerful as a stationary body scanner, though still suitably powerful."
 	id = "mech_med_analyzer"
 	req_tech = list(TECH_PHORON = 4, TECH_MAGNET = 5, TECH_BIO = 5, TECH_DATA = 4)
-	materials = list(MAT_PLASTEEL = 4500, MAT_GOLD = 2000, MAT_URANIUM = 3000, MAT_GLASS = 3000)
+	materials = list(MAT_ALUMINIUM = 4500, MAT_GOLD = 2000, MAT_URANIUM = 3000, MAT_GLASS = 3000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/medanalyzer

 /datum/design/item/mecha/jetpack
@@ -622,7 +624,7 @@
 	id = "mech_jetpack"
 	req_tech = list(TECH_ENGINEERING = 3, TECH_MAGNET = 4) //One less magnet than the actual got-damn teleporter.
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/jetpack
-	materials = list(DEFAULT_WALL_MATERIAL = 7500, "silver" = 300, "glass" = 600)
+	materials = list(MAT_ALUMINIUM = 7500, "silver" = 300, "glass" = 600)

 /datum/design/item/mecha/phoron_generator
 	desc = "Phoron Reactor"
@@ -667,7 +669,7 @@
 	desc = "A heavy duty bore. Bigger, better, stronger than the core sampler, but not quite as good as a large drill."
 	id = "mech_ground_drill"
 	req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 2, TECH_PHORON = 1)
-	materials = list(DEFAULT_WALL_MATERIAL = 7000, "silver" = 3000, "phoron" = 2000)
+	materials = list(MAT_ALUMINIUM = 5000, "silver" = 3000, DEFAULT_WALL_MATERIAL = 2000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/bore

 /datum/design/item/mecha/orescanner
@@ -675,7 +677,7 @@
 	desc = "A hefty device used to scan for subterranean veins of ore."
 	id = "mech_ore_scanner"
 	req_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2, TECH_POWER = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 1000)
+	materials = list(MAT_ALUMINIUM = 3000, MAT_COPPER = 1000, "glass" = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/orescanner

 /datum/design/item/mecha/advorescanner
@@ -683,7 +685,7 @@
 	desc = "A hefty device used to scan for the exact volumes of subterranean veins of ore."
 	id = "mech_ore_scanner_adv"
 	req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 4, TECH_POWER = 4, TECH_BLUESPACE = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "osmium" = 3000, "silver" = 1000)
+	materials = list(MAT_ALUMINIUM = 5000, "osmium" = 3000, "silver" = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/orescanner/advanced

 /datum/design/item/mecha/runningboard
@@ -755,15 +757,23 @@
 	desc = "Exosuit-held nuclear reactor. Converts uranium and everyone's health to energy."
 	id = "mech_generator_nuclear"
 	req_tech = list(TECH_POWER= 3, TECH_ENGINEERING = 3, TECH_MATERIAL = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 7500, "silver" = 375, "glass" = 750)
+	materials = list(MAT_ALUMINIUM = 7500, "silver" = 375, MAT_LEAD = 1250)
 	build_path = /obj/item/mecha_parts/mecha_equipment/generator/nuclear

 /datum/design/item/mecha/speedboost_ripley
 	name = "Ripley Leg Actuator Overdrive"
 	desc = "System enhancements and overdrives to make a mech's legs move faster."
 	id = "mech_speedboost_ripley"
+<<<<<<< HEAD
 	req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4, TECH_ENGINEERING = 4)
 	materials = list(DEFAULT_WALL_MATERIAL = 10000, "silver" = 1000, "gold" = 1000)
+||||||| parent of 4e5a8041e8... Merge pull request #9620 from VOREStation/upstream-merge-7811
+	req_tech = list( TECH_POWER = 5, TECH_MATERIAL = 4, TECH_ENGINEERING = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, "silver" = 1000, "gold" = 1000)
+=======
+	req_tech = list( TECH_POWER = 5, TECH_MATERIAL = 4, TECH_ENGINEERING = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, MAT_ALUMINIUM = 1000, "gold" = 1000)
+>>>>>>> 4e5a8041e8... Merge pull request #9620 from VOREStation/upstream-merge-7811
 	build_path = /obj/item/mecha_parts/mecha_equipment/speedboost

 /datum/design/item/synthetic_flash
@@ -789,7 +799,7 @@
 	desc = "A space-bike's un-assembled frame."
 	id = "vehicle_chassis_spacebike"
 	req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_BLUESPACE = 3, TECH_PHORON = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 12000, "silver" = 3000, "phoron" = 3000, "osmium" = 1000)
+	materials = list(MAT_ALUMINIUM = 9000, "silver" = 3000, "phoron" = 3000, "osmium" = 1000)
 	build_path = /obj/item/weapon/vehicle_assembly/spacebike

 /datum/design/item/mechfab/vehicle/quadbike_chassis
@@ -931,7 +941,7 @@
 	desc = "A compact cleaning-foam grenade system for a hardsuit."
 	id = "rig_grenade_cleanfoam"
 	req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2, TECH_POWER = 2)
-	materials = list(MAT_PLASTEEL = 2000, MAT_GLASS = 1000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 750)
+	materials = list(MAT_ALUMINIUM = 2000, MAT_GLASS = 1000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 750)
 	build_path = /obj/item/rig_module/cleaner_launcher

 /datum/design/item/mechfab/rigsuit/taser
@@ -939,7 +949,7 @@
 	desc = "A compact taser system for a hardsuit."
 	id = "rig_gun_taser"
 	req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 3, TECH_MAGNET = 2, TECH_POWER = 3, TECH_COMBAT = 2)
-	materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500)
+	materials = list(MAT_ALUMINIUM = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500)
 	build_path = /obj/item/rig_module/mounted/taser

 /datum/design/item/mechfab/rigsuit/egun
@@ -963,7 +973,7 @@
 	desc = "A compact overclocking system for a hardsuit."
 	id = "rig_component_sprinter"
 	req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_BIO = 4, TECH_POWER = 4)
-	materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500, MAT_VERDANTIUM = 1000)
+	materials = list(MAT_ALUMINIUM = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500, MAT_VERDANTIUM = 1000)
 	build_path = /obj/item/rig_module/sprinter

 /datum/design/item/mechfab/rigsuit/meson
@@ -971,7 +981,7 @@
 	desc = "A compact meson visor for a hardsuit."
 	id = "rig_component_meson"
 	req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 5, TECH_MAGNET = 3, TECH_POWER = 4)
-	materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_OSMIUM = 500)
+	materials = list(MAT_ALUMINIUM = 2000, MAT_GRAPHITE = 1500, MAT_OSMIUM = 500)
 	build_path = /obj/item/rig_module/vision/meson

 /datum/design/item/mechfab/rigsuit/material
@@ -979,7 +989,7 @@
 	desc = "A compact material visor for a hardsuit."
 	id = "rig_component_material"
 	req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 5, TECH_MAGNET = 3, TECH_POWER = 4)
-	materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_OSMIUM = 500)
+	materials = list(MAT_ALUMINIUM = 2000, MAT_GRAPHITE = 1500, MAT_OSMIUM = 500)
 	build_path = /obj/item/rig_module/vision/material

 /datum/design/item/mechfab/rigsuit/nvg
@@ -987,7 +997,7 @@
 	desc = "A compact night-vision visor for a hardsuit."
 	id = "rig_component_nvg"
 	req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_MAGNET = 4, TECH_POWER = 5)
-	materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_OSMIUM = 500, MAT_URANIUM = 1000)
+	materials = list(MAT_ALUMINIUM = 2000, MAT_GRAPHITE = 1500, MAT_OSMIUM = 500, MAT_URANIUM = 1000)
 	build_path = /obj/item/rig_module/vision/nvg

 /datum/design/item/mechfab/rigsuit/sechud
@@ -995,7 +1005,7 @@
 	desc = "A compact security visor for a hardsuit."
 	id = "rig_component_sechud"
 	req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_MAGNET = 3, TECH_POWER = 2)
-	materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500, MAT_SILVER = 500)
+	materials = list(MAT_ALUMINIUM = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500, MAT_SILVER = 500)
 	build_path = /obj/item/rig_module/vision/sechud

 /datum/design/item/mechfab/rigsuit/medhud
@@ -1003,7 +1013,7 @@
 	desc = "A compact medical visor for a hardsuit."
 	id = "rig_component_medhud"
 	req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_MAGNET = 3, TECH_BIO = 2)
-	materials = list(MAT_PLASTEEL = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500, MAT_SILVER = 500)
+	materials = list(MAT_ALUMINIUM = 2000, MAT_GRAPHITE = 1500, MAT_PLASTIC = 500, MAT_SILVER = 500)
 	build_path = /obj/item/rig_module/vision/medhud

 /datum/design/item/mechfab/rigsuit/voice
@@ -1035,7 +1045,7 @@
 	desc = "A compact chemical injector network for a hardsuit."
 	id = "rig_component_chemicals"
 	req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_MAGNET = 5, TECH_BIO = 4)
-	materials = list(MAT_PLASTEEL = 3000, MAT_GRAPHITE = 2000, MAT_PLASTIC = 3500, MAT_SILVER = 1750, MAT_GOLD = 1250)
+	materials = list(MAT_ALUMINIUM = 3000, MAT_GRAPHITE = 2000, MAT_PLASTIC = 3500, MAT_SILVER = 1750, MAT_GOLD = 1250)
 	build_path = /obj/item/rig_module/chem_dispenser/injector/advanced/empty

 /datum/design/item/mechfab/rigsuit/teleporter
@@ -1052,7 +1062,7 @@
 	build_path = /obj/item/device/uav
 	time = 20
 	req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 5, TECH_PHORON = 3, TECH_MAGNET = 4, TECH_POWER = 6)
-	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 6000, "silver" = 4000)
+	materials = list(MAT_ALUMINIUM = 5000, "glass" = 6000, MAT_COPPER = 4000)

 // Exosuit Internals

@@ -1074,7 +1084,7 @@
 	category = list("Exosuit Internals")
 	id = "exo_int_armor_lightweight"
 	req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, MAT_PLASTIC = 3000)
+	materials = list(MAT_ALUMINIUM = 5000, MAT_PLASTIC = 3000)
 	build_path = /obj/item/mecha_parts/component/armor/lightweight

 /datum/design/item/mechfab/exointernal/reinf_armor
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -246,4 +246,4 @@
 		return
 	materials[material] -= ejected * S.perunit
 	if(recursive && materials[material] >= S.perunit)
-		eject_materials(material, -1)
+		eject_materials(material, -1)