diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index 12cb99a4663..49154c9dbb9 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -270,13 +270,8 @@
 	if (src.client)
 		src.client.screen -= src.contents
 		for(var/obj/I in src.contents)
-			if(!src.module)//Handles module-less borgs to prevent runtimes
-				if(!(istype(I,/obj/item/weapon/cell) || istype(I,/obj/item/device/radio)  || istype(I,/obj/machinery/camera) || istype(I,/obj/item/device/mmi)))
-					src.client.screen += I
-			else
-				if(I && I in src.module.modules)//If it's not a module, don't show it
-					src.client.screen += I
-//		src.client.screen += src.contents
+			if(I && !(istype(I,/obj/item/weapon/cell) || istype(I,/obj/item/device/radio)  || istype(I,/obj/machinery/camera) || istype(I,/obj/item/device/mmi)))
+				src.client.screen += I
 	if(src.module_state_1)
 		src.module_state_1:screen_loc = ui_inv1
 	if(src.module_state_2)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index cde0818d7a6..0830eb361d7 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -506,6 +506,7 @@
 					if(src.module && istype(src.module, /obj/item/weapon/robot_module/miner))
 						for(var/obj/item/weapon/pickaxe/borgdrill/D in src.module.modules)
 							del(D)
+						src.module.modules += new /obj/item/weapon/pickaxe/diamonddrill(src.module)
 						src.module.rebuild()
 					updateicon()
 				else
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 8a41706675b..6cf6d5d64cf 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -202,7 +202,7 @@
 	New()
 		..()
 		src.modules += new /obj/item/borg/sight/meson(src)
-		src.emag = new /obj/item/weapon/pickaxe/diamonddrill(src)
+		src.emag = new /obj/item/borg/stun(src)
 		src.modules += new /obj/item/weapon/storage/satchel(src)
 		src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
 		src.modules += new /obj/item/weapon/sheetsnatcher/borg(src)