Applying upstream fixes.

2019-06-17 00:27:07 +02:00
parent b782226900
commit b2d82bd1f1
5 changed files with 12 additions and 8 deletions
@@ -150,8 +150,8 @@
 		var/obj/singularity/energy_ball/orbitingball = orbiting.parent
 		orbitingball.orbiting_balls -= src
 		orbitingball.dissipate_strength = orbitingball.orbiting_balls.len
-	..()
-	if (!loc && !QDELETED(src))
+	. = ..()
+	if (!QDELETED(src))
 		qdel(src)