From b8c1f0667504e65a4bee951e31e9103331d79d69 Mon Sep 17 00:00:00 2001
From: Unknown <RedKerensky@Gmail.com>
Date: Thu, 27 May 2021 13:06:41 -0400
Subject: [PATCH] Finishes this PR

---
 code/game/mecha/micro/mechfab_designs_vr.dm   |  4 +-
 .../modules/power/tesla/telsa_construction.dm |  1 +
 .../research/designs/bio_devices_vr.dm        |  6 +--
 .../research/designs/circuits/circuits_vr.dm  | 14 +++++++
 code/modules/research/designs/implants_vr.dm  |  2 +-
 code/modules/research/designs/medical_vr.dm   | 42 +++++++++----------
 code/modules/research/designs/misc_vr.dm      | 16 +++++--
 code/modules/research/designs/weapons_vr.dm   | 35 ++++++++++------
 maps/offmap_vr/talon/talon_v2.dmm             |  1 -
 maps/submaps/depreciated_vr/talon1.dmm        |  1 -
 maps/tether/tether-03-surface3.dmm            |  2 -
 maps/tether/tether-05-station1.dmm            |  2 -
 12 files changed, 76 insertions(+), 50 deletions(-)

diff --git a/code/game/mecha/micro/mechfab_designs_vr.dm b/code/game/mecha/micro/mechfab_designs_vr.dm
index 3371302795b..80d7945ea4d 100644
--- a/code/game/mecha/micro/mechfab_designs_vr.dm
+++ b/code/game/mecha/micro/mechfab_designs_vr.dm
@@ -117,7 +117,7 @@
 	name = "\improper PC-20 \"Lance\" light laser cannon"
 	id = "micro_laser_heavy"
 	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 1000, MAT_COPPER = 1000, "diamond" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 1000, "diamond" = 2000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/microheavy
 
 /datum/design/item/mecha/weapon/grenade_launcher/micro
@@ -191,5 +191,5 @@
 	desc = "A portable medical system used to treat external injuries from afar."
 	id = "mech_medigun"
 	req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 5, TECH_BIO = 6)
-	materials = list(DEFAULT_WALL_MATERIAL = 8000, MAT_COPPER = 4000, "gold" = 2000, "silver" = 1750, "diamond" = 1500)
+	materials = list(DEFAULT_WALL_MATERIAL = 8000, "gold" = 2000, "silver" = 1750, "diamond" = 1500, "phoron" = 4000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/medigun
\ No newline at end of file
diff --git a/code/modules/power/tesla/telsa_construction.dm b/code/modules/power/tesla/telsa_construction.dm
index 252e29b330b..5cb11b9fe67 100644
--- a/code/modules/power/tesla/telsa_construction.dm
+++ b/code/modules/power/tesla/telsa_construction.dm
@@ -23,6 +23,7 @@
 	name = T_BOARD("grounding rod")
 	build_path = /obj/machinery/power/grounding_rod
 	board_type = new /datum/frame/frame_types/machine
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 	req_components = list()
 
 /datum/category_item/autolathe/engineering/grounding_rod
diff --git a/code/modules/research/designs/bio_devices_vr.dm b/code/modules/research/designs/bio_devices_vr.dm
index 996aab3c6dc..253249b6176 100644
--- a/code/modules/research/designs/bio_devices_vr.dm
+++ b/code/modules/research/designs/bio_devices_vr.dm
@@ -2,7 +2,7 @@
 	name = "nanite implant framework"
 	id = "nif"
 	req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 8000, MAT_COPPER = 2000, "uranium" = 5000, "diamond" = 5000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 8000, "uranium" = 6000, "diamond" = 6000)
 	build_path = /obj/item/device/nif
 	sort_string = "JVAAA"
 
@@ -10,7 +10,7 @@
 	name = "bioadaptive NIF"
 	id = "bioadapnif"
 	req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5, TECH_BIO = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 15000, MAT_COPPER = 2000, "uranium" = 10000, "diamond" = 10000)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 15000, "uranium" = 10000, "diamond" = 10000)
 	build_path = /obj/item/device/nif/bioadap
 	sort_string = "JVAAB"
 
@@ -18,6 +18,6 @@
 	name = "adv. NIF repair tool"
 	id = "anrt"
 	req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 3000, MAT_COPPER = 4000, "uranium" = 2000, "diamond" = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 3000, "uranium" = 2000, "diamond" = 2000)
 	build_path = /obj/item/device/nifrepairer
 	sort_string = "JVABA"
\ No newline at end of file
diff --git a/code/modules/research/designs/circuits/circuits_vr.dm b/code/modules/research/designs/circuits/circuits_vr.dm
index 98d9c860bda..6d4b9b9d263 100644
--- a/code/modules/research/designs/circuits/circuits_vr.dm
+++ b/code/modules/research/designs/circuits/circuits_vr.dm
@@ -168,3 +168,17 @@
 	req_tech = list(TECH_DATA = 3, TECH_BIO = 4, TECH_ENGINEERING = 2)
 	build_path = /obj/item/weapon/circuitboard/machine/vitals_monitor
 	sort_string = "HAAF"
+
+/datum/design/circuit/pointdefense
+	name = "point defense battery"
+	id = "pointdefense"
+	req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 3, TECH_COMBAT = 4)
+	build_path = /obj/item/weapon/circuitboard/pointdefense
+	sort_string = "OAABA"
+
+/datum/design/circuit/pointdefense_control
+	name = "point defense control"
+	id = "pointdefense_control"
+	req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_COMBAT = 2)
+	build_path = /obj/item/weapon/circuitboard/pointdefense_control
+	sort_string = "OAABB"
diff --git a/code/modules/research/designs/implants_vr.dm b/code/modules/research/designs/implants_vr.dm
index 937d93e563b..7a27266e83a 100644
--- a/code/modules/research/designs/implants_vr.dm
+++ b/code/modules/research/designs/implants_vr.dm
@@ -10,7 +10,7 @@
 	name = "Size control implant"
 	id = "implant_size"
 	req_tech = list(TECH_MATERIAL = 3, TECH_BIO = 4, TECH_DATA = 4, TECH_ENGINEERING = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 2000, MAT_COPPER = 2000, "silver" = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 4000)
 	build_path = /obj/item/weapon/implanter/sizecontrol
 	sort_string = "MFAVB"
 
diff --git a/code/modules/research/designs/medical_vr.dm b/code/modules/research/designs/medical_vr.dm
index 32f37560418..7a0b0aa5375 100644
--- a/code/modules/research/designs/medical_vr.dm
+++ b/code/modules/research/designs/medical_vr.dm
@@ -17,7 +17,7 @@
 	name = "SleeveMate 3700"
 	id = "sleevemate"
 	req_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 2, TECH_BIO = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 4000, MAT_COPPER = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 4000)
 	build_path = /obj/item/device/sleevemate
 	sort_string = "KCAVA"
 
@@ -26,7 +26,7 @@
 	desc = "This prototype hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
 	id = "protohypospray"
 	req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_POWER = 2, TECH_BIO = 4, TECH_ILLEGAL = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 1500, MAT_COPPER = 500, "silver" = 2000, "gold" = 1500, "uranium" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 1500, "silver" = 2000, "gold" = 1500, "uranium" = 1000)
 	build_path = /obj/item/weapon/reagent_containers/hypospray/science
 	sort_string = "KCAVB"
 
@@ -39,7 +39,7 @@
 	name = "cell-loaded medigun"
 	id = "cell_medigun"
 	req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 3, TECH_BIO = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 8000, "plastic" = 8000, "glass" = 5000, MAT_COPPER = 500, "silver" = 750, "gold" = 750, "uranium" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 8000, "plastic" = 8000, "glass" = 5000, "silver" = 1000, "gold" = 1000, "uranium" = 1000)
 	build_path = /obj/item/weapon/gun/projectile/cell_loaded/medical
 	sort_string = "KVAAA"
 
@@ -95,7 +95,7 @@
 	name = "TOXIN"
 	id = "ml3m_cell_toxin"
 	req_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 3, TECH_BIO = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500)
 	build_path = /obj/item/ammo_casing/microbattery/medical/toxin
 	sort_string = "KVCBA"
 
@@ -103,7 +103,7 @@
 	name = "OMNI"
 	id = "ml3m_cell_omni"
 	req_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 3, TECH_BIO = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500)
 	build_path = /obj/item/ammo_casing/microbattery/medical/omni
 	sort_string = "KVCBB"
 
@@ -111,7 +111,7 @@
 	name = "ANTIRAD"
 	id = "ml3m_cell_antirad"
 	req_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 3, TECH_BIO = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500)
 	build_path = /obj/item/ammo_casing/microbattery/medical/antirad
 	sort_string = "KVCBC"
 
@@ -121,7 +121,7 @@
 	name = "BRUTE-II"
 	id = "ml3m_cell_brute2"
 	req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 500, "gold" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "gold" = 1000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/brute2
 	sort_string = "KVCCA"
 
@@ -129,7 +129,7 @@
 	name = "BURN-II"
 	id = "ml3m_cell_burn2"
 	req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 500, "gold" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "gold" = 1000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/burn2
 	sort_string = "KVCCB"
 
@@ -137,7 +137,7 @@
 	name = "STABILIZE-II"
 	id = "ml3m_cell_stabilize2"
 	req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 500, "silver" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "silver" = 1000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/stabilize2
 	sort_string = "KVCCC"
 
@@ -145,7 +145,7 @@
 	name = "OMNI-II"
 	id = "ml3m_cell_omni2"
 	req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 2, TECH_BIO = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 500, "uranium" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "uranium" = 1000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/omni2
 	sort_string = "KVCCD"
 
@@ -155,7 +155,7 @@
 	name = "TOXIN-II"
 	id = "ml3m_cell_toxin2"
 	req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 3, TECH_POWER = 3, TECH_BIO = 6)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 500, "uranium" = 1000, "silver" = 1000, "diamond" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "uranium" = 1000, "silver" = 1000, "diamond" = 500)
 	build_path = /obj/item/ammo_casing/microbattery/medical/toxin2
 	sort_string = "KVCDA"
 
@@ -163,7 +163,7 @@
 	name = "HASTE"
 	id = "ml3m_cell_haste"
 	req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 3, TECH_POWER = 3, TECH_BIO = 6)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 500, "gold" = 1000, "silver" = 1000, "diamond" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "gold" = 1000, "silver" = 1000, "diamond" = 1000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/haste
 	sort_string = "KVCDB"
 
@@ -171,7 +171,7 @@
 	name = "RESIST"
 	id = "ml3m_cell_resist"
 	req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 3, TECH_POWER = 3, TECH_BIO = 6)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 500, "gold" = 1000, "uranium" = 1000, "diamond" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "gold" = 1000, "uranium" = 1000, "diamond" = 1000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/resist
 	sort_string = "KVCDC"
 
@@ -179,7 +179,7 @@
 	name = "CORPSE MEND"
 	id = "ml3m_cell_corpse_mend"
 	req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 3, TECH_POWER = 3, TECH_BIO = 6)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 1000, "phoron" = 3000, "diamond" = 2500)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "phoron" = 3000, "diamond" = 3000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/corpse_mend
 	sort_string = "KVCDD"
 
@@ -189,7 +189,7 @@
 	name = "BRUTE-III"
 	id = "ml3m_cell_brute3"
 	req_tech = list(TECH_MATERIAL = 7, TECH_MAGNET = 6, TECH_POWER = 5, TECH_BIO = 7, TECH_PRECURSOR = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 1000, "diamond" = 500, "verdantium" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "diamond" = 500, "verdantium" = 1000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/brute3
 	sort_string = "KVCEA"
 
@@ -197,7 +197,7 @@
 	name = "BURN-III"
 	id = "ml3m_cell_burn3"
 	req_tech = list(TECH_MATERIAL = 7, TECH_MAGNET = 6, TECH_POWER = 5, TECH_BIO = 7, TECH_PRECURSOR = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 1000, "diamond" = 500, "verdantium" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "diamond" = 500, "verdantium" = 1000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/burn3
 	sort_string = "KVCEB"
 
@@ -205,7 +205,7 @@
 	name = "TOXIN-III"
 	id = "ml3m_cell_toxin3"
 	req_tech = list(TECH_MATERIAL = 7, TECH_MAGNET = 6, TECH_POWER = 5, TECH_BIO = 7, TECH_ARCANE = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 1000, "diamond" = 500, "verdantium" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "diamond" = 500, "verdantium" = 1000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/toxin3
 	sort_string = "KVCEC"
 
@@ -213,7 +213,7 @@
 	name = "OMNI-III"
 	id = "ml3m_cell_omni3"
 	req_tech = list(TECH_MATERIAL = 7, TECH_MAGNET = 6, TECH_POWER = 5, TECH_BIO = 7, TECH_ARCANE = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 1000, "diamond" = 500, "verdantium" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "diamond" = 500, "verdantium" = 1000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/omni3
 	sort_string = "KVCED"
 
@@ -223,7 +223,7 @@
 	name = "SHRINK"
 	id = "ml3m_cell_shrink"
 	req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_BLUESPACE = 3, TECH_BIO = 5, TECH_ILLEGAL = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "uranium" = 2000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/shrink
 	sort_string = "KVCOA"
 
@@ -231,7 +231,7 @@
 	name = "GROW"
 	id = "ml3m_cell_grow"
 	req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_BLUESPACE = 3, TECH_BIO = 5, TECH_ILLEGAL = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "uranium" = 2000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/grow
 	sort_string = "KVCOB"
 
@@ -239,6 +239,6 @@
 	name = "NORMALSIZE"
 	id = "ml3m_cell_normalsize"
 	req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_BLUESPACE = 3, TECH_BIO = 5, TECH_ILLEGAL = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, MAT_COPPER = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "plastic" = 2500, "uranium" = 2000)
 	build_path = /obj/item/ammo_casing/microbattery/medical/normalsize
 	sort_string = "KVCOC"
\ No newline at end of file
diff --git a/code/modules/research/designs/misc_vr.dm b/code/modules/research/designs/misc_vr.dm
index bd0aff6942f..518a0d82012 100644
--- a/code/modules/research/designs/misc_vr.dm
+++ b/code/modules/research/designs/misc_vr.dm
@@ -18,7 +18,7 @@
 	name = "Size gun"
 	id = "sizegun"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 3000, MAT_GLASS = 2000, MAT_COPPER = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 3000, MAT_GLASS = 2000)
 	build_path = /obj/item/weapon/gun/energy/sizegun
 	sort_string = "TAVBA"
 
@@ -26,7 +26,7 @@
 	name = "Body Snatcher"
 	id = "bodysnatcher"
 	req_tech = list(TECH_MAGNET = 3, TECH_BIO = 3, TECH_ILLEGAL = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 4000, MAT_GLASS = 4000, MAT_COPPER = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, MAT_GLASS = 4000, MAT_URANIUM = 2000)
 	build_path = /obj/item/device/bodysnatcher
 	sort_string = "TBVAA"
 
@@ -34,7 +34,7 @@
 	name = "Inducer (Scientific)"
 	id = "inducersci"
 	req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 5, TECH_POWER = 6)
-	materials = list(DEFAULT_WALL_MATERIAL = 7000, MAT_GLASS = 2000, MAT_COPPER = 2000, MAT_URANIUM = 3000, MAT_PHORON = 4000)
+	materials = list(DEFAULT_WALL_MATERIAL = 8000, MAT_GLASS = 2000, MAT_URANIUM = 4000, MAT_PHORON = 4000)
 	build_path = /obj/item/weapon/inducer/sci
 	sort_string = "TCVAA"
 
@@ -42,6 +42,14 @@
 	name = "Inducer (Industrial)"
 	id = "inducerind"
 	req_tech = list(TECH_BLUESPACE = 5, TECH_MATERIAL = 7, TECH_POWER = 7)
-	materials = list(DEFAULT_WALL_MATERIAL = 2500, MAT_GLASS = 2000, MAT_COPPER = 2000, MAT_URANIUM = 1500, MAT_TITANIUM = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 3000, MAT_GLASS = 2000, MAT_URANIUM = 2000, MAT_TITANIUM = 2000)
 	build_path = /obj/item/weapon/inducer/unloaded
 	sort_string = "TCVAB"
+
+/datum/design/item/weapon/mining/mining_scanner
+	id = "mining_scanner"
+	req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 1)
+	materials = list(DEFAULT_WALL_MATERIAL = 1000,"glass" = 500)
+	build_path = /obj/item/weapon/mining_scanner/advanced
+	sort_string = "FBAAB" 
+
diff --git a/code/modules/research/designs/weapons_vr.dm b/code/modules/research/designs/weapons_vr.dm
index 312d556ec53..3ae157558a8 100644
--- a/code/modules/research/designs/weapons_vr.dm
+++ b/code/modules/research/designs/weapons_vr.dm
@@ -13,7 +13,7 @@
 	desc = "The 'Protector' is an advanced energy gun that cannot be fired in lethal mode on low security alert levels, but features DNA locking and a powerful stun."
 	id = "protector"
 	req_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3, TECH_MAGNET = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 2000, MAT_COPPER = 500, "silver" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 2000, "silver" = 1000)
 	build_path = /obj/item/weapon/gun/energy/gun/protector
 	sort_string = "MAAVA"
 
@@ -21,7 +21,7 @@
 	desc = "A 'Sickshot' is a 4-shot energy revolver that causes nausea and confusion."
 	id = "sickshot"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_MAGNET = 2)
-	materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 2000, MAT_COPPER = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 2000)
 	build_path = /obj/item/weapon/gun/energy/sickshot
 	sort_string = "MAAVB"
 
@@ -29,7 +29,7 @@
 	desc  = "The \"Varmint Catcher\" is an energy net projector designed to immobilize dangerous wildlife."
 	id = "netgun"
 	req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_MAGNET = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 3000, MAT_COPPER = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 3000)
 	build_path = /obj/item/weapon/gun/energy/netgun
 	sort_string = "MAAVC"
 
@@ -53,7 +53,7 @@
 	name = "Advanced anti-particle rifle"
 	id = "advparticle"
 	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 5, TECH_POWER = 3, TECH_MAGNET = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, MAT_COPPER = 250, "gold" = 1000, "uranium" = 750)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 1000, "gold" = 1000, "uranium" = 750)
 	build_path = /obj/item/weapon/gun/energy/particle/advanced
 	sort_string = "MAAUA"
 
@@ -61,7 +61,7 @@
 	name = "Anti-particle cannon"
 	id = "particlecannon"
 	req_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5, TECH_POWER = 4, TECH_MAGNET = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 1500, MAT_COPPER = 1000, "gold" = 2000, "uranium" = 1000, "diamond" = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 1500, "gold" = 2000, "uranium" = 1000, "diamond" = 2000)
 	build_path = /obj/item/weapon/gun/energy/particle/cannon
 	sort_string = "MAAUB"
 
@@ -82,7 +82,7 @@
 	name = "cell-loaded revolver"
 	id = "nsfw_prototype"
 	req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 4, TECH_COMBAT = 7)
-	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 6000, MAT_COPPER = 4000, "phoron" = 6000, "uranium" = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 6000, "phoron" = 8000, "uranium" = 4000)
 	build_path = /obj/item/weapon/gun/projectile/cell_loaded/combat/prototype
 	sort_string = "MAVAA"
 
@@ -102,7 +102,7 @@
 	name = "STUN"
 	id = "nsfw_cell_stun"
 	req_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 2, TECH_POWER = 3, TECH_COMBAT = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, MAT_COPPER = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000)
 	build_path = /obj/item/ammo_casing/microbattery/combat/stun
 	sort_string = "MAVCA"
 
@@ -110,7 +110,7 @@
 	name = "LETHAL"
 	id = "nsfw_cell_lethal"
 	req_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 3, TECH_POWER = 3, TECH_COMBAT = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, MAT_COPPER = 1000, "phoron" = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "phoron" = 3000)
 	build_path = /obj/item/ammo_casing/microbattery/combat/lethal
 	sort_string = "MAVCB"
 
@@ -118,7 +118,7 @@
 	name = "NET"
 	id = "nsfw_cell_net"
 	req_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 3, TECH_POWER = 3, TECH_COMBAT = 4)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, MAT_COPPER = 1000, "uranium" = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "uranium" = 3000)
 	build_path = /obj/item/ammo_casing/microbattery/combat/net
 	sort_string = "MAVCC"
 
@@ -126,7 +126,7 @@
 	name = "ION"
 	id = "nsfw_cell_ion"
 	req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3, TECH_POWER = 5, TECH_COMBAT = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, MAT_COPPER = 1000, "silver" = 3000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "silver" = 3000)
 	build_path = /obj/item/ammo_casing/microbattery/combat/ion
 	sort_string = "MAVCD"
 
@@ -134,7 +134,7 @@
 	name = "SCATTERSTUN"
 	id = "nsfw_cell_shotstun"
 	req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 3, TECH_POWER = 6, TECH_COMBAT = 6)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, MAT_COPPER = 2000, "silver" = 2000, "gold" = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "silver" = 2000, "gold" = 2000)
 	build_path = /obj/item/ammo_casing/microbattery/combat/shotstun
 	sort_string = "MAVCE"
 
@@ -142,7 +142,7 @@
 	name = "XRAY"
 	id = "nsfw_cell_xray"
 	req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 5, TECH_COMBAT = 7)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, MAT_COPPER = 2000, "silver" = 1000, "gold" = 1000, "uranium" = 1000, "phoron" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "silver" = 1000, "gold" = 1000, "uranium" = 1000, "phoron" = 1000)
 	build_path = /obj/item/ammo_casing/microbattery/combat/xray
 	sort_string = "MAVCF"
 
@@ -150,10 +150,19 @@
 	name = "STRIPPER"
 	id = "nsfw_cell_stripper"
 	req_tech = list(TECH_MATERIAL = 7, TECH_BIO = 4, TECH_POWER = 4, TECH_COMBAT = 4, TECH_ILLEGAL = 5)
-	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, MAT_COPPER = 2000, "uranium" = 2000, "phoron" = 2000, "diamond" = 500)
+	materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "uranium" = 2000, "phoron" = 2000, "diamond" = 500)
 	build_path = /obj/item/ammo_casing/microbattery/combat/stripper
 	sort_string = "MAVCG"
 
+/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"
+
 /*
 /datum/design/item/nsfw_cell/final
 	name = "FINAL OPTION"
diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm
index 3a7d3453572..580e189f6aa 100644
--- a/maps/offmap_vr/talon/talon_v2.dmm
+++ b/maps/offmap_vr/talon/talon_v2.dmm
@@ -1495,7 +1495,6 @@
 "dT" = (
 /obj/structure/table/standard,
 /obj/fiftyspawner/steel,
-/obj/fiftyspawner/copper,
 /obj/machinery/light/small{
 	dir = 1
 	},
diff --git a/maps/submaps/depreciated_vr/talon1.dmm b/maps/submaps/depreciated_vr/talon1.dmm
index b1112cb2a20..85b53c05466 100644
--- a/maps/submaps/depreciated_vr/talon1.dmm
+++ b/maps/submaps/depreciated_vr/talon1.dmm
@@ -2191,7 +2191,6 @@
 "mS" = (
 /obj/structure/table/standard,
 /obj/fiftyspawner/steel,
-/obj/fiftyspawner/copper,
 /turf/simulated/floor/tiled/eris/steel/gray_perforated,
 /area/space)
 "mT" = (
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 8e1dafb9276..714490354f1 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -14402,7 +14402,6 @@
 /obj/effect/floor_decal/corner/mauve/bordercorner2{
 	dir = 9
 	},
-/obj/fiftyspawner/copper,
 /turf/simulated/floor/tiled,
 /area/rnd/research)
 "axD" = (
@@ -15539,7 +15538,6 @@
 /obj/effect/floor_decal/corner/mauve/border{
 	dir = 1
 	},
-/obj/fiftyspawner/copper,
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/robotics)
 "azp" = (
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index 08e81965d35..07bddebf9df 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -5693,7 +5693,6 @@
 	},
 /obj/fiftyspawner/plastic,
 /obj/fiftyspawner/plastic,
-/obj/fiftyspawner/copper,
 /turf/simulated/floor/tiled,
 /area/engineering/workshop)
 "aoQ" = (
@@ -17150,7 +17149,6 @@
 /obj/structure/table/reinforced,
 /obj/fiftyspawner/rglass,
 /obj/fiftyspawner/rods,
-/obj/fiftyspawner/copper,
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/eva)
 "ekv" = (