From c2e689aec01dca14629d7612e97aa8365272a856 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 10 May 2020 12:33:56 -0700
Subject: [PATCH] i'm salty (#12181)

---
 code/datums/explosion.dm                      |  4 +++-
 code/modules/power/singularity/singularity.dm | 10 +++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/code/datums/explosion.dm b/code/datums/explosion.dm
index f763affcd1..dc32902e5e 100644
--- a/code/datums/explosion.dm
+++ b/code/datums/explosion.dm
@@ -76,7 +76,9 @@ GLOBAL_LIST_EMPTY(explosions)
 	//I would make this not ex_act the thing that triggered the explosion,
 	//but everything that explodes gives us their loc or a get_turf()
 	//and somethings expect us to ex_act them so they can qdel()
-	stoplag() //tldr, let the calling proc call qdel(src) before we explode
+	//stoplag() //tldr, let the calling proc call qdel(src) before we explode
+	// no - use sleep. stoplag() results in quirky things like explosions taking too long to process and hanging mid-air for no reason.
+	sleep(0)
 
 	EX_PREPROCESS_EXIT_CHECK
 
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 76eeeae205..025784e909 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -119,14 +119,13 @@
 
 
 /obj/singularity/Bump(atom/A)
+	set waitfor = FALSE
 	consume(A)
-	return
-
 
 /obj/singularity/Bumped(atom/movable/AM)
+	set waitfor = FALSE
 	consume(AM)
 
-
 /obj/singularity/process()
 	if(current_size >= STAGE_TWO)
 		move()
@@ -268,6 +267,7 @@
 
 
 /obj/singularity/proc/eat()
+	set waitfor = FALSE
 	for(var/tile in spiral_range_turfs(grav_pull, src))
 		var/turf/T = tile
 		if(!T || !isturf(loc))
@@ -284,8 +284,6 @@
 				else
 					consume(X)
 			CHECK_TICK
-	return
-
 
 /obj/singularity/proc/consume(atom/A)
 	var/gain = A.singularity_act(current_size, src)
@@ -295,8 +293,6 @@
 		name = "supermatter-charged [initial(name)]"
 		consumedSupermatter = 1
 		set_light(10)
-	return
-
 
 /obj/singularity/proc/move(force_move = 0)
 	if(!move_self)