diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index e8c4d78e9ba..7d361aa7e79 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -63,7 +63,10 @@
 	updateicon()
 
 /mob/living/silicon/robot/drone/init()
-	new/obj/item/device/camera/siliconcam/drone_camera(src)
+	laws = new /datum/ai_laws/drone()
+	connected_ai = null
+
+	aiCamera = new/obj/item/device/camera/siliconcam/drone_camera(src)
 	playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
 
 //Redefining some robot procs...
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 6344d04b174..58594d5a058 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -100,24 +100,7 @@
 		hands.icon_state = "standard"
 		icon_state = "secborg"
 		modtype = "Security"
-	else if(istype(src,/mob/living/silicon/robot/drone))
-		laws = new /datum/ai_laws/drone()
-		connected_ai = null
-	else
-		if(mmi.alien || alien)
-			laws = new /datum/ai_laws/alienmov()
-			connected_ai = select_active_alien_ai()
-			scrambledcodes = 1
-		else
-			make_laws()
-			connected_ai = select_active_ai_with_fewest_borgs()
-		if(connected_ai)
-			connected_ai.connected_robots += src
-			lawsync()
-			photosync()
-			lawupdate = 1
-		else
-			lawupdate = 0
+	init(alien)
 
 	radio = new /obj/item/device/radio/borg(src)
 	if(!scrambledcodes && !camera)
@@ -156,10 +139,24 @@
 	hud_list[IMPTRACK_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[NATIONS_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
-	init()
 
-/mob/living/silicon/robot/proc/init()
-	new/obj/item/device/camera/siliconcam/robot_camera(src)
+/mob/living/silicon/robot/proc/init(var/alien=0)
+	aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src)
+	if(mmi.alien || alien)
+		laws = new /datum/ai_laws/alienmov()
+		connected_ai = select_active_alien_ai()
+		scrambledcodes = 1
+	else
+		make_laws()
+		connected_ai = select_active_ai_with_fewest_borgs()
+	if(connected_ai)
+		connected_ai.connected_robots += src
+		lawsync()
+		photosync()
+		lawupdate = 1
+	else
+		lawupdate = 0
+
 	playsound(loc, 'sound/voice/liveagain.ogg', 75, 1)
 
 // setup the PDA and its name