-Added a new, and admin spawnable only, machine which can turn humans into Cyborgs. Probably can be used for Robot Uprising events. The human has to be lying down and alive to be Borged. When spawned a conveyor belt will spawn on the left and right side too.

-Reduced the duration of the flare. I think putting it in process() made it last longer.

-Added some null checks in camera chunks.

-Large NarSie now force calls the shuttle and displays a threatening warning message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4915 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/mob/living/silicon/ai/freelook/chunk.dm

@@ -75,6 +75,9 @@
 	for(var/camera in cameras)
 		var/obj/machinery/camera/c = camera
 
+		if(!c)
+			continue
+
 		if(!c.can_use())
 			continue
 
@@ -142,6 +145,9 @@
 
 	for(var/camera in cameras)
 		var/obj/machinery/camera/c = camera
+		if(!c)
+			continue
+
 		if(!c.can_use())
 			continue
 

code/modules/mob/living/silicon/robot/robot.dm

@@ -65,8 +65,6 @@
 	updatename("Default")
 	updateicon()
 
-	playsound(src, 'sound/voice/liveagain.ogg', 75, 1)
-
 	if(!cell)
 		cell = new /obj/item/weapon/cell(src)
 		cell.maxcharge = 7500
@@ -101,6 +99,9 @@
 			camera.status = 0
 	..()
 
+	playsound(loc, 'sound/voice/liveagain.ogg', 75, 1)
+
+
 //If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
 //Improved /N
 /mob/living/silicon/robot/Del()

code/modules/power/singularity/singularity.dm

@@ -473,9 +473,14 @@ var/global/list/uneatable = list(
 	pixel_y = -256
 	current_size = 12
 	move_self = 1 //Do we move on our own?
-	grav_pull = 13 //How many tiles out do we pull?
 	consume_range = 12 //How many tiles out do we eat
 
+/obj/machinery/singularity/narsie/large/New()
+	..()
+	world << "<font size='28' color='red'><b>NAR-SIE HAS RISEN</b></font>"
+	if(emergency_shuttle)
+		emergency_shuttle.incall(0.5) // Cannot recall
+
 /obj/machinery/singularity/narsie/process()
 	eat()
 	if(!target || prob(5))

code/modules/recycling/conveyor2.dm

@@ -20,8 +20,10 @@
 	id = "round_end_belt"
 
 	// create a conveyor
-/obj/machinery/conveyor/New()
-	..()
+/obj/machinery/conveyor/New(loc, newdir, on = 0)
+	..(loc)
+	if(newdir)
+		dir = newdir
 	switch(dir)
 		if(NORTH)
 			forwards = NORTH
@@ -47,6 +49,9 @@
 		if(SOUTHWEST)
 			forwards = WEST
 			backwards = NORTH
+	if(on)
+		operating = 1
+		setmove()
 
 /obj/machinery/conveyor/proc/setmove()
 	if(operating == 1)