diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 73da15f474a..cebb57110b4 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -46,14 +46,15 @@
 
 
 	New()
-		..()
-		modules += new /obj/item/weapon/melee/baton/loaded(src)
-		modules += new /obj/item/weapon/extinguisher(src)
-		modules += new /obj/item/weapon/wrench(src)
-		modules += new /obj/item/weapon/crowbar(src)
-		modules += new /obj/item/device/healthanalyzer(src)
-		emag = new /obj/item/weapon/melee/energy/sword(src)
-
+		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/device/flash(src)
+		src.modules += new /obj/item/weapon/melee/baton(src)
+		src.modules += new /obj/item/weapon/extinguisher(src)
+		src.modules += new /obj/item/weapon/wrench(src)
+		src.modules += new /obj/item/weapon/crowbar(src)
+		src.modules += new /obj/item/device/healthanalyzer(src)
+		src.emag = new /obj/item/weapon/melee/energy/sword(src)
+		return
 
 
 /obj/item/weapon/robot_module/medical
@@ -83,20 +84,21 @@
 
 
 	New()
-		..()
-		modules += new /obj/item/borg/sight/meson(src)
-		emag = new /obj/item/borg/stun(src)
-		modules += new /obj/item/weapon/rcd/borg(src)
-		modules += new /obj/item/weapon/extinguisher(src)
-		modules += new /obj/item/weapon/weldingtool/largetank(src)
-		modules += new /obj/item/weapon/screwdriver(src)
-		modules += new /obj/item/weapon/wrench(src)
-		modules += new /obj/item/weapon/crowbar(src)
-		modules += new /obj/item/weapon/wirecutters(src)
-		modules += new /obj/item/device/multitool(src)
-		modules += new /obj/item/device/t_scanner(src)
-		modules += new /obj/item/device/analyzer(src)
-		modules += new /obj/item/taperoll/engineering(src)
+		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/borg/sight/meson(src)
+		src.emag = new /obj/item/borg/stun(src)
+		src.modules += new /obj/item/weapon/rcd/borg(src)
+		src.modules += new /obj/item/weapon/extinguisher(src)
+//		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/weapon/weldingtool/largetank(src)
+		src.modules += new /obj/item/weapon/screwdriver(src)
+		src.modules += new /obj/item/weapon/wrench(src)
+		src.modules += new /obj/item/weapon/crowbar(src)
+		src.modules += new /obj/item/weapon/wirecutters(src)
+		src.modules += new /obj/item/device/multitool(src)
+		src.modules += new /obj/item/device/t_scanner(src)
+		src.modules += new /obj/item/device/analyzer(src)
+		src.modules += new /obj/item/taperoll/engineering(src)
 
 		var/obj/item/stack/sheet/metal/cyborg/M = new /obj/item/stack/sheet/metal/cyborg(src)
 		M.amount = 50
@@ -134,14 +136,14 @@
 
 
 	New()
-		..()
-		modules += new /obj/item/borg/sight/hud/sec(src)
-		modules += new /obj/item/weapon/handcuffs/cyborg(src)
-		modules += new /obj/item/weapon/melee/baton/loaded(src)
-		modules += new /obj/item/weapon/gun/energy/taser/cyborg(src)
-		modules += new /obj/item/taperoll/police(src)
-		emag = new /obj/item/weapon/gun/energy/laser/cyborg(src)
-
+		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/borg/sight/hud/sec(src)
+		src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
+		src.modules += new /obj/item/weapon/melee/baton(src)
+		src.modules += new /obj/item/weapon/gun/energy/taser/cyborg(src)
+		src.modules += new /obj/item/taperoll/police(src)
+		src.emag = new /obj/item/weapon/gun/energy/laser/cyborg(src)
+		return
 
 
 /obj/item/weapon/robot_module/janitor
@@ -149,7 +151,7 @@
 
 
 	New()
-		..()
+		src.modules += new /obj/item/device/flashlight(src)
 		src.modules += new /obj/item/weapon/soap/nanotrasen(src)
 		src.modules += new /obj/item/weapon/storage/bag/trash(src)
 		src.modules += new /obj/item/weapon/mop(src)
@@ -167,7 +169,7 @@
 
 
 	New()
-		..()
+		src.modules += new /obj/item/device/flashlight(src)
 		src.modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
 		src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
 		src.modules += new /obj/item/weapon/pen/robopen(src)
@@ -200,15 +202,14 @@
 
 
 	New()
-		..()
-		modules += new /obj/item/borg/sight/meson(src)
-		emag = new /obj/item/borg/stun(src)
-		modules += new /obj/item/weapon/storage/bag/ore(src)
-		modules += new /obj/item/weapon/pickaxe/borgdrill(src)
-		modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
-		modules += new /obj/item/weapon/wrench(src)
-		modules += new /obj/item/weapon/pickaxe/robotic(src)
-		modules += new /obj/item/device/depth_scanner(src)
+		src.modules += new /obj/item/device/flashlight(src)
+		src.modules += new /obj/item/borg/sight/meson(src)
+		src.emag = new /obj/item/borg/stun(src)
+		src.modules += new /obj/item/weapon/storage/bag/ore(src)
+		src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
+		src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
+//		src.modules += new /obj/item/weapon/shovel(src) Uneeded due to buffed drill
+		return
 
 /obj/item/weapon/robot_module/syndicate
 	name = "syndicate robot module"
@@ -265,8 +266,8 @@
 		)
 
 	New()
-		//TODO: Replace with shittier flashlight and work out why we can't remove the flash. ~Z
-		..()
+		//TODO: Replace with shittier flashlight ~Z
+		src.modules += new /obj/item/device/flashlight(src)
 		src.modules += new /obj/item/weapon/weldingtool(src)
 		src.modules += new /obj/item/weapon/screwdriver(src)
 		src.modules += new /obj/item/weapon/wrench(src)