some modules things

code/modules/power/singularity/emitter.dm

@@ -168,6 +168,8 @@
 				investigate_log("lost power and turned <font color='red'>off</font>","singulo")
 				log_game("Emitter lost power in ([x],[y],[z])")
 			return
+		if(!check_delay())
+			return FALSE
 		fire_beam()
 
 /obj/machinery/power/emitter/proc/check_delay()
@@ -175,9 +177,16 @@
 		return TRUE
 	return FALSE
 
-/obj/machinery/power/emitter/proc/fire_beam()
+/obj/machinery/power/emitter/proc/fire_beam_pulse()
 	if(!check_delay())
 		return FALSE
+	if(state != 2)
+		return FALSE
+	if(avail(active_power_usage))
+		add_load(active_power_usage)
+		fire_beam()
+
+/obj/machinery/power/emitter/proc/fire_beam()
 	src.last_shot = world.time
 	if(src.shot_number < 3)
 		src.fire_delay = 20

code/modules/power/singularity/narsie.dm

@@ -63,8 +63,10 @@
 
 
 /obj/singularity/narsie/Bump(atom/A)
-	forceMove(get_turf(A))
-	A.narsie_act()
+	var/turf/T = get_turf(A)
+	if(T == loc)
+		T = get_step(A, A.dir) //please don't slam into a window like a bird, nar-sie
+	forceMove(T)
 
 
 /obj/singularity/narsie/mezzer()