From 3dd2c8088228adade60c3c8de15e1d4c23cb35eb Mon Sep 17 00:00:00 2001
From: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date: Mon, 29 Apr 2019 05:44:17 -0400
Subject: [PATCH] for now

---
 code/modules/power/cable.dm               | 18 ++++++++----------
 code/modules/power/singularity/emitter.dm |  1 +
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index ca0497714a3..5cf1d5efbe3 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -224,18 +224,14 @@ By design, d1 is the smallest direction and d2 is the highest
 //explosion handling
 /obj/structure/cable/ex_act(severity)
 	switch(severity)
-		if(1.0)
+		if(1)
 			qdel(src) // qdel
-		if(2.0)
+		if(2)
 			if(prob(50))
-				new/obj/item/stack/cable_coil(get_turf(src), src.d1 ? 2 : 1, paramcolor = color)
-				qdel(src) // qdel
-
-		if(3.0)
+				deconstruct()
+		if(3)
 			if(prob(25))
-				new/obj/item/stack/cable_coil(get_turf(src), src.d1 ? 2 : 1, paramcolor = color)
-				qdel(src) // qdel
-	return
+				deconstruct()
 
 obj/structure/cable/proc/cable_color(var/colorC)
 	if(colorC)
@@ -459,7 +455,9 @@ obj/structure/cable/proc/cable_color(var/colorC)
 		loc = null
 	powernet.remove_cable(src) //remove the cut cable from its powernet
 
-	addtimer(CALLBACK(O, .proc/auto_propogate_cut_cable, O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables
+	// queue it to rebuild
+	SSmachines.deferred_powernet_rebuilds += O
+//	addtimer(CALLBACK(O, .proc/auto_propogate_cut_cable, O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables
 
 	// Disconnect machines connected to nodes
 	if(d1 == 0) // if we cut a node (O-X) cable
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 9261667ee16..9ba302ab19b 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -38,6 +38,7 @@
 	if(state == 2 && anchored)
 		connect_to_network()
 	sparks = new
+	sparks.attach(src)
 	sparks.set_up(5, 1, src)
 	if(frequency)
 		set_frequency(frequency)