diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index a8f0e6801e..11b61d0a1a 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -512,12 +512,25 @@
 		return
 
 	for(var/obj/machinery/power/emitter/E in world)
-		if(E.anchored)
-			E.active = 1
+		if(istype(get_area(E), /area/space))
+			E.anchored = TRUE
+			E.state = 2
+			E.connect_to_network()
+			E.active = TRUE
 
 	for(var/obj/machinery/field_generator/F in world)
-		if(F.anchored)
+		if(istype(get_area(F), /area/space))
 			F.Varedit_start = 1
+
+	for(var/obj/structure/particle_accelerator/PA in world)
+		PA.anchored = TRUE
+		PA.construction_state = 3
+		PA.update_icon()
+	for(var/obj/machinery/particle_accelerator/PA in world)
+		PA.anchored = TRUE
+		PA.construction_state = 3
+		PA.update_icon()
+
 	spawn(30)
 		for(var/obj/machinery/the_singularitygen/G in world)
 			if(G.anchored)
@@ -549,10 +562,6 @@
 			if(!Rad.active)
 				Rad.toggle_power()
 
-	for(var/obj/machinery/power/smes/SMES in world)
-		if(SMES.anchored)
-			SMES.input_attempt = 1
-
 /client/proc/setup_supermatter_engine()
 	set category = "Debug"
 	set name = "Setup supermatter"
diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm
index 6683b48377..95affc46f1 100644
--- a/code/modules/power/singularity/act.dm
+++ b/code/modules/power/singularity/act.dm
@@ -95,6 +95,9 @@
 /obj/item/projectile/beam/emitter/singularity_pull()
 	return
 
+/obj/effect/projectile/emitter/singularity_pull()
+	return
+
 /obj/item/weapon/storage/backpack/holding/singularity_act(S, current_size)
 	var/dist = max((current_size - 2), 1)
 	explosion(src.loc,(dist),(dist*2),(dist*4))
@@ -128,6 +131,9 @@
 /turf/space/singularity_act()
 	return
 
+/turf/simulated/open/singularity_act()
+	return
+
 /*******************
 * Nar-Sie Act/Pull *
 *******************/
diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index 288b456751..6c5d77fd1d 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -71,7 +71,8 @@
 	qdel(src)
 	return
 
-
+/obj/effect/accelerated_particle/singularity_act()
+	return
 
 /obj/effect/accelerated_particle/proc/toxmob(var/mob/living/M)
 	var/radiation = (energy*2)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 9309c6bd3c..46f7102f4c 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -47,7 +47,7 @@
 
 /obj/singularity/Destroy()
 	processing_objects -= src
-	..()
+	return ..()
 
 /obj/singularity/attack_hand(mob/user as mob)
 	consume(user)
@@ -169,7 +169,7 @@
 				pixel_y = -64
 				grav_pull = 8
 				consume_range = 2
-				dissipate_delay = 10
+				dissipate_delay = 4
 				dissipate_track = 0
 				dissipate_strength = 20
 				overlays = 0
@@ -267,19 +267,15 @@
 	return 1
 
 /obj/singularity/proc/eat()
-	for(var/atom/X in orange(grav_pull, src))
+	for(var/T in orange(grav_pull, src))
+		var/atom/X = T
+		if(!X.simulated)
+			continue
 		var/dist = get_dist(X, src)
-		var/obj/singularity/S = src
-		if(!istype(src))
-			return
 		if(dist > consume_range)
-			X.singularity_pull(S, current_size)
-		else if(dist <= consume_range)
+			X.singularity_pull(src, current_size)
+		else
 			consume(X)
-
-	//for (var/turf/T in trange(grav_pull, src)) //TODO: Create a similar trange for orange to prevent snowflake of self check.
-	//	consume(T)
-
 	return
 
 /obj/singularity/proc/consume(const/atom/A)
diff --git a/html/changelogs/Leshana-singulo.yml b/html/changelogs/Leshana-singulo.yml
new file mode 100644
index 0000000000..1037a52898
--- /dev/null
+++ b/html/changelogs/Leshana-singulo.yml
@@ -0,0 +1,5 @@
+author: Leshana
+delete-after: True
+changes: 
+  - tweak: "Fix singularity energy balance so it is stable under normal operation."
+  - bugfix: "Fix emitter beams and PA effects from being grav pulled or consumed."