Fix non-icon merge conflicts

code/modules/power/apc.dm

@@ -498,14 +498,14 @@
 			user.visible_message(\
 				"\red [user.name] cut the cables and dismantled the power terminal.",\
 				"You cut the cables and dismantle the power terminal.")
-			del(terminal)
+			qdel(terminal)
 	else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack))
 		user << "You trying to insert the power control board into the frame..."
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		if(do_after(user, 10))
 			has_electronics = 1
 			user << "You place the power control board inside the frame."
-			del(W)
+			qdel(W)
 	else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack))
 		user << "\red You cannot put the board inside, the frame is damaged."
 		return
@@ -530,7 +530,7 @@
 					"\red [src] has been cut from the wall by [user.name] with the weldingtool.",\
 					"You cut the APC frame from the wall.",\
 					"\red You hear welding.")
-			del(src)
+			qdel(src)
 			return
 	else if (istype(W, /obj/item/mounted/frame/apc_frame) && opened && emagged)
 		emagged = 0
@@ -539,7 +539,7 @@
 		user.visible_message(\
 			"\red [user.name] has replaced the damaged APC frontal panel with a new one.",\
 			"You replace the damaged APC frontal panel with a new one.")
-		del(W)
+		qdel(W)
 		update_icon()
 	else if (istype(W, /obj/item/mounted/frame/apc_frame) && opened && ((stat & BROKEN) || malfhack))
 		if (has_electronics)
@@ -550,7 +550,7 @@
 			user.visible_message(\
 				"\red [user.name] has replaced the damaged APC frame with new one.",\
 				"You replace the damaged APC frame with new one.")
-			del(W)
+			qdel(W)
 			stat &= ~BROKEN
 			malfai = null
 			malfhack = 0
@@ -1000,7 +1000,7 @@
 	malf.mind.transfer_to(src.occupant)
 	src.occupant.eyeobj.name = "[src.occupant.name] (AI Eye)"
 	if(malf.parent)
-		del(malf)
+		qdel(malf)
 	src.occupant.verbs += /mob/living/silicon/ai/proc/corereturn
 	src.occupant.verbs += /datum/game_mode/malfunction/proc/takeover
 	src.occupant.cancel_camera()
@@ -1016,7 +1016,7 @@
 		src.occupant.mind.transfer_to(src.occupant.parent)
 		src.occupant.parent.adjustOxyLoss(src.occupant.getOxyLoss())
 		src.occupant.parent.cancel_camera()
-		del(src.occupant)
+		qdel(src.occupant)
 		if (seclevel2num(get_security_level()) == SEC_LEVEL_DELTA)
 			for(var/obj/item/weapon/pinpointer/point in world)
 				for(var/datum/mind/AI_mind in ticker.mode.malf_ai)

code/modules/power/cable.dm

@@ -86,18 +86,9 @@
 
 
 /obj/structure/cable/Destroy()						// called when a cable is deleted
-	if(!defer_powernet_rebuild)					// set if network will be rebuilt manually
-		if(powernet)
-			powernet.cut_cable(src)				// update the powernets
+	if(powernet)
+		powernet.cut_cable(src)				// update the powernets
 	cable_list -= src
-/*	if(istype(attached))
-		attached.set_light(0)
-		attached.icon_state = "powersink0"
-		attached.mode = 0
-		processing_objects.Remove(attached)
-		attached.anchored = 0
-		attached.attached = null
-	attached = null*/
 	return ..()													// then go ahead and delete the cable
 
 /obj/structure/cable/hide(var/i)
@@ -145,7 +136,7 @@
 
 		investigate_log("was cut by [key_name(usr, usr.client)] in [user.loc.loc]","wires")
 
-		del(src)
+		qdel(src)
 		return
 
 
@@ -318,7 +309,7 @@
 		if(ismob(loc))
 			var/mob/M = loc
 			M.unEquip(src)
-		del(src)
+		qdel(src)
 	else
 		amount -= used
 		update_icon()
@@ -380,7 +371,7 @@
 		if (C.shock(user, 50))
 			if (prob(50)) //fail
 				new/obj/item/stack/cable_coil(C.loc, 1, C.cable_color)
-				del(C)
+				qdel(C)
 		//src.laying = 1
 		//last = C
 
@@ -440,7 +431,7 @@
 			if (NC.shock(user, 50))
 				if (prob(50)) //fail
 					new/obj/item/stack/cable_coil(NC.loc, 1, NC.cable_color)
-					del(NC)
+					qdel(NC)
 
 			return
 	else if(C.d1 == 0)		// exisiting cable doesn't point at our position, so see if it's a stub
@@ -479,7 +470,7 @@
 		if (C.shock(user, 50))
 			if (prob(50)) //fail
 				new/obj/item/stack/cable_coil(C.loc, 2, C.cable_color)
-				del(C)
+				qdel(C)
 
 		return
 

code/modules/power/engine.dm

@@ -33,6 +33,6 @@
 /turf/simulated/floor/engine/blob_act()
 	if (prob(25))
 		ChangeTurf(/turf/space)
-		del(src)
+		qdel(src)
 		return
 	return

code/modules/power/lighting.dm

@@ -53,7 +53,7 @@
 			user.visible_message("[user.name] deconstructs [src].", \
 				"You deconstruct [src].", "You hear a noise.")
 			playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1)
-			del(src)
+			qdel(src)
 		if (src.stage == 2)
 			usr << "You have to remove the wires first."
 			return
@@ -111,7 +111,7 @@
 
 			newlight.dir = src.dir
 			src.transfer_fingerprints_to(newlight)
-			del(src)
+			qdel(src)
 			return
 	..()
 
@@ -315,7 +315,7 @@
 				update()
 
 				user.drop_item()	//drop the item to update overlays and such
-				del(L)
+				qdel(L)
 
 				if(on && rigged)
 
@@ -370,7 +370,7 @@
 			newlight.fingerprints = src.fingerprints
 			newlight.fingerprintshidden = src.fingerprintshidden
 			newlight.fingerprintslast = src.fingerprintslast
-			del(src)
+			qdel(src)
 			return
 
 		user << "You stick \the [W] into the light socket!"

code/modules/power/port_gen.dm

@@ -188,7 +188,7 @@ display round(lastgen) and plasmatank amount
 
 	if (heat > 300)
 		overheat()
-		del(src)
+		qdel(src)
 	return
 
 /obj/machinery/power/port_gen/pacman/handleInactive()

code/modules/power/power.dm

@@ -83,7 +83,7 @@
 
 /proc/makepowernets()
 	for(var/datum/powernet/PN in powernets)
-		del(PN)
+		qdel(PN)
 	powernets.Cut()
 
 	for(var/obj/structure/cable/PC in cable_list)
@@ -373,7 +373,7 @@
 			Cable.powernet = net1
 			net1.cables += Cable
 
-	del(net2)
+	qdel(net2)
 	return net1
 
 

code/modules/power/singularity/containment_field.dm

@@ -52,7 +52,7 @@
 	if(hasShocked)
 		return 0
 	if(!FG1 || !FG2)
-		del(src)
+		qdel(src)
 		return 0
 	if(iscarbon(user))
 		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread

code/modules/power/singularity/field_generator.dm

@@ -326,7 +326,7 @@ field_generator power level display
 	for (var/obj/machinery/containment_field/F in fields)
 		if (isnull(F))
 			continue
-		del(F)
+		qdel(F)
 	fields = list()
 	for(var/obj/machinery/field_generator/FG in connected_gens)
 		if (isnull(FG))

code/modules/power/singularity/narsie.dm

@@ -139,13 +139,9 @@
 
 /obj/singularity/narsie/wizard/eat()
 	set background = BACKGROUND_ENABLED
-//	if(defer_powernet_rebuild != 2)
-//		defer_powernet_rebuild = 1
 	for(var/atom/X in orange(consume_range,src))
 		if(isturf(X) || istype(X, /atom/movable))
 			consume(X)
-//	if(defer_powernet_rebuild != 2)
-//		defer_powernet_rebuild = 0
 	return
 
 

code/modules/power/smes.dm

@@ -204,7 +204,7 @@
 				"<span class='alert'>[user.name] cuts the cables and dismantles the power terminal.</span>",\
 				"You cut the cables and dismantle the power terminal.")
 			charging = 0 //stop inputting, since we have don't have a terminal anymore
-			del(terminal)
+			qdel(terminal)
 			return
 
 	//crowbarring it !
@@ -436,7 +436,7 @@
 			smoke.attach(src)
 			smoke.start()
 			explosion(src.loc, -1, 0, 1, 3, 0)
-			del(src)
+			qdel(src)
 			return
 		if(prob(15)) //Power drain
 			world << "\red SMES power drain in [src.loc.loc]"