Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE

Makes all Destroy() procs return properly

code/modules/power/antimatter/control.dm

@@ -38,7 +38,7 @@
 /obj/machinery/power/am_control_unit/Destroy()//Perhaps damage and run stability checks rather than just del on the others
 	for(var/obj/machinery/am_shielding/AMS in linked_shielding)
 		qdel(AMS)
-	..()
+	return ..()
 
 
 /obj/machinery/power/am_control_unit/process()

code/modules/power/antimatter/shielding.dm

@@ -68,7 +68,7 @@
 	if(processing)	shutdown_core()
 	visible_message("<span class='danger'>The [src.name] melts!</span>")
 	//Might want to have it leave a mess on the floor but no sprites for now
-	..()
+	return ..()
 
 
 /obj/machinery/am_shielding/CanPass(atom/movable/mover, turf/target, height=0)

code/modules/power/cable.dm

@@ -90,7 +90,7 @@ By design, d1 is the smallest direction and d2 is the highest
 	if(powernet)
 		cut_cable_from_powernet()				// update the powernets
 	cable_list -= src							//remove it from global cable list
-	..()										// then go ahead and delete the cable
+	return ..()									// then go ahead and delete the cable
 
 /obj/structure/cable/Deconstruct()
 	var/turf/T = loc

code/modules/power/gravitygenerator.dm

@@ -58,7 +58,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
 	set_broken()
 	if(main_part)
 		qdel(main_part)
-	..()
+	return ..()
 
 //
 // Part generator which is mostly there for looks
@@ -126,7 +126,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
 	for(var/obj/machinery/gravity_generator/part/O in parts)
 		O.main_part = null
 		qdel(O)
-	..()
+	return ..()
 
 /obj/machinery/gravity_generator/main/proc/setup_parts()
 	var/turf/our_turf = get_turf(src)

code/modules/power/lighting.dm

@@ -208,7 +208,7 @@
 	if(A)
 		on = 0
 //		A.update_lights()
-	..()
+	return ..()
 
 /obj/machinery/light/update_icon()
 

code/modules/power/port_gen.dm

@@ -119,7 +119,7 @@ display round(lastgen) and plasmatank amount
 
 /obj/machinery/power/port_gen/pacman/Destroy()
 	DropFuel()
-	..()
+	return ..()
 
 /obj/machinery/power/port_gen/pacman/RefreshParts()
 	var/temp_rating = 0

code/modules/power/power.dm

@@ -17,7 +17,7 @@
 
 /obj/machinery/power/Destroy()
 	disconnect_from_network()
-	..()
+	return ..()
 
 ///////////////////////////////
 // General procedures

code/modules/power/powernet.dm

@@ -26,6 +26,7 @@
 		M.powernet = null
 
 	SSmachine.powernets -= src
+	return ..()
 
 /datum/powernet/proc/is_empty()
 	return !cables.len && !nodes.len

code/modules/power/singularity/collector.dm

@@ -22,7 +22,7 @@ var/global/list/rad_collectors = list()
 
 /obj/machinery/power/rad_collector/Destroy()
 	rad_collectors -= src
-	..()
+	return ..()
 
 /obj/machinery/power/rad_collector/process()
 	if(P)

code/modules/power/singularity/containment_field.dm

@@ -19,7 +19,7 @@
 		FG1.cleanup()
 	if(FG2 && !FG2.clean_up)
 		FG2.cleanup()
-	..()
+	return ..()
 
 /obj/machinery/field/containment/attack_hand(mob/user)
 	if(get_dist(src, user) > 1)

code/modules/power/singularity/emitter.dm

@@ -70,7 +70,7 @@
 		message_admins("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
 		log_game("Emitter deleted at ([x],[y],[z])")
 		investigate_log("<font color='red'>deleted</font> at ([x],[y],[z])","singulo")
-	..()
+	return ..()
 
 /obj/machinery/power/emitter/update_icon()
 	if (active && powernet && avail(active_power_usage))

code/modules/power/singularity/field_generator.dm

@@ -172,7 +172,7 @@ field_generator power level display
 
 /obj/machinery/field/generator/Destroy()
 	src.cleanup()
-	..()
+	return ..()
 
 
 

code/modules/power/singularity/particle_accelerator/particle_accelerator.dm

@@ -75,7 +75,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 	construction_state = 0
 	if(master)
 		master.part_scan()
-	..()
+	return ..()
 
 /obj/structure/particle_accelerator/end_cap
 	name = "Alpha Particle Generation Array"

code/modules/power/singularity/singularity.dm

@@ -42,7 +42,7 @@
 
 /obj/singularity/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()
 
 /obj/singularity/Move(atom/newloc, direct)
 	if(current_size >= STAGE_FIVE || check_turfs_in(direct))

code/modules/power/smes.dm

@@ -171,7 +171,7 @@
 		investigate_log("<font color='red'>deleted</font> at ([area.name])","singulo")
 	if(terminal)
 		disconnect_terminal()
-	..()
+	return ..()
 
 // create a terminal object pointing towards the SMES
 // wires will attach to this

code/modules/power/solar.dm

@@ -27,7 +27,7 @@
 
 /obj/machinery/power/solar/Destroy()
 	unset_control() //remove from control computer
-	..()
+	return ..()
 
 //set the control of the panel to a given computer if closer than SOLAR_MAX_DIST
 /obj/machinery/power/solar/proc/set_control(obj/machinery/power/solar_control/SC)
@@ -308,7 +308,7 @@
 		M.unset_control()
 	if(connected_tracker)
 		connected_tracker.unset_control()
-	..()
+	return ..()
 
 /obj/machinery/power/solar_control/disconnect_from_network()
 	..()

code/modules/power/tracker.dm

@@ -23,7 +23,7 @@
 
 /obj/machinery/power/tracker/Destroy()
 	unset_control() //remove from control computer
-	..()
+	return ..()
 
 //set the control of the tracker to a given computer if closer than SOLAR_MAX_DIST
 /obj/machinery/power/tracker/proc/set_control(obj/machinery/power/solar_control/SC)