Dev merge.

code/modules/power/singularity/act.dm

@@ -38,17 +38,19 @@
 	..()
 
 /obj/singularity_act()
-	ex_act(1)
-	if(src)
-		qdel(src)
-	return 2
+	if(simulated)
+		ex_act(1)
+		if(src)
+			qdel(src)
+		return 2
 
 /obj/singularity_pull(S, current_size)
-	if(anchored)
-		if(current_size >= STAGE_FIVE)
+	if(simulated)
+		if(anchored)
+			if(current_size >= STAGE_FIVE)
+				step_towards(src, S)
+		else
 			step_towards(src, S)
-	else
-		step_towards(src, S)
 
 /obj/effect/beam/singularity_pull()
 	return

code/modules/power/singularity/containment_field.dm

@@ -9,7 +9,7 @@
 	density = 0
 	unacidable = 1
 	use_power = 0
-	luminosity = 4
+	light_range = 4
 	var/obj/machinery/field_generator/FG1 = null
 	var/obj/machinery/field_generator/FG2 = null
 	var/hasShocked = 0 //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second.

code/modules/power/singularity/narsie.dm

@@ -31,8 +31,8 @@ var/global/list/narsie_list = list()
 	// Pixel stuff centers Narsie.
 	pixel_x = -236
 	pixel_y = -256
-	luminosity = 1
-	l_color = "#3e0000"
+	light_range = 1
+	light_color = "#3e0000"
 
 	current_size = 12
 	consume_range = 12 // How many tiles out do we eat.
@@ -144,7 +144,7 @@ var/global/list/narsie_list = list()
 		if(T.icon_state != "cult-narsie")
 			T.desc = "something that goes beyond your understanding went this way"
 			T.icon_state = "cult-narsie"
-			T.luminosity = 1
+			T.set_light(1)
 
 /obj/singularity/narsie/proc/narsiewall(var/turf/T)
 	T.desc = "An opening has been made on that wall, but who can say if what you seek truly lies on the other side?"
@@ -152,7 +152,7 @@ var/global/list/narsie_list = list()
 	T.icon_state = "cult-narsie"
 	T.opacity = 0
 	T.density = 0
-	luminosity = 1
+	set_light(1)
 
 /obj/singularity/narsie/large/consume(const/atom/A) //Has its own consume proc because it doesn't need energy and I don't want BoHs to explode it. --NEO
 //NEW BEHAVIOUR

code/modules/power/singularity/singularity.dm

@@ -8,7 +8,7 @@
 	anchored = 1
 	density = 1
 	layer = 6
-	luminosity = 6
+	light_range = 6
 	unacidable = 1 //Don't comment this out.
 
 	var/current_size = 1