diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 5883343b2ff..bff89a59df7 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -173,8 +173,10 @@
 		return 0
 	else
 		for(var/obj/item/weapon/pickaxe/drill/cyborg/D in R.module.modules)
+			R.module.modules -= D
 			qdel(D)
 		for(var/obj/item/weapon/shovel/S in R.module.modules)
+			R.module.modules -= S
 			qdel(S)
 		R.module.modules += new /obj/item/weapon/pickaxe/drill/cyborg/diamond(R.module)
 		R.module.rebuild()
@@ -195,6 +197,7 @@
 		return 0
 	else
 		for(var/obj/item/weapon/storage/bag/ore/cyborg/S in R.module.modules)
+			R.module.modules -= S
 			qdel(S)
 		R.module.modules += new /obj/item/weapon/storage/bag/ore/holding/cyborg(R.module)
 		R.module.rebuild()
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 5e5eefd28e1..d03f610475b 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -824,6 +824,9 @@
 	slot_flags = SLOT_BELT
 	var/cooldown = 0
 
+/obj/item/device/t_scanner/adv_mining_scanner/cyborg
+	flags = CONDUCT | NODROP
+
 /obj/item/device/t_scanner/adv_mining_scanner/scan()
 	if(!cooldown)
 		cooldown = 1
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index bdf525a056a..a34e61662b0 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -314,9 +314,11 @@
 		src.modules += new /obj/item/borg/sight/meson(src)
 		src.modules += new /obj/item/weapon/wrench(src)
 		src.modules += new /obj/item/weapon/screwdriver(src)
+		src.modules += new /obj/item/device/t_scanner/adv_mining_scanner/cyborg(src)
 		src.modules += new /obj/item/weapon/storage/bag/ore/cyborg(src)
 		src.modules += new /obj/item/weapon/pickaxe/drill/cyborg(src)
 		src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
+		src.modules += new /obj/item/weapon/gun/energy/kinetic_accelerator/cyborg(src)
 		src.emag = new /obj/item/borg/stun(src)
 		return
 
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 49e41f0a8af..b1c4e898078 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -240,6 +240,9 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	var/overheat_time = 16
 	var/recent_reload = 1
 
+/obj/item/weapon/gun/energy/kinetic_accelerator/cyborg
+	flags = NODROP
+
 /obj/item/weapon/gun/energy/kinetic_accelerator/Fire()
 	overheat = 1
 	spawn(overheat_time)
diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm
index 8ad8a24b3f8..61f86c16294 100644
--- a/code/modules/research/designs/mining_designs.dm
+++ b/code/modules/research/designs/mining_designs.dm
@@ -50,7 +50,7 @@
 	req_tech = list("materials" = 4, "plasmatech" = 3, "engineering" = 3, "combat" = 3, "magnets" = 3)
 	build_type = PROTOLATHE
 	materials = list("$metal" = 3000, "$glass" = 1000, "$plasma" = 2000, "$gold" = 500)
-	reliability = 79
+	reliability_base = 79
 	build_path = /obj/item/weapon/gun/energy/plasmacutter/adv
 	category = list("Mining Designs")
 
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index d4f576461c0..1a4dfd9c7d7 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ