Merge pull request #2213 from Fox-McCloud/destroy-fixes

Fixes a few Destroys

code/game/machinery/cloning.dm

@@ -66,7 +66,7 @@
 /obj/machinery/clonepod/Destroy()
 	if(connected)
 		connected.pods -= src
-	..()
+	return ..()
 
 /obj/machinery/clonepod/RefreshParts()
 	speed_coeff = 0

code/game/machinery/computer/cloning.dm

@@ -22,10 +22,10 @@
 /obj/machinery/computer/cloning/initialize()
 	..()
 	updatemodules()
-	
+
 /obj/machinery/computer/cloning/Destroy()
 	releasecloner()
-	..()
+	return ..()
 
 /obj/machinery/computer/cloning/process()
 	if(!scanner || !pods.len || !autoprocess)
@@ -39,8 +39,8 @@
 			for(var/datum/dna2/record/R in src.records)
 				if(!(pod.occupant || pod.mess))
 					if(pod.growclone(R))
-						records.Remove(R)		
-						
+						records.Remove(R)
+
 /obj/machinery/computer/cloning/proc/updatemodules()
 	src.scanner = findscanner()
 	releasecloner()
@@ -119,23 +119,23 @@
 		return
 	var/data[0]
 	data["menu"] = src.menu
-	data["scanner"] = src.scanner	
-	
+	data["scanner"] = src.scanner
+
 	var/canpodautoprocess = 0
 	if(pods.len)
 		data["numberofpods"] = src.pods.len
-		
+
 		var/list/tempods[0]
 		for (var/obj/machinery/clonepod/pod in pods)
 			if(pod.efficiency > 5)
 				canpodautoprocess = 1
-				
+
 			tempods.Add(list(list("pod" = "\ref[pod]", "name" = capitalize(pod.name), "biomass" = pod.biomass)))
 			data["pods"] = tempods
-	
+
 	data["loading"] = loading
 	data["autoprocess"] = autoprocess
-	
+
 	if(scanner && pods.len && ((scanner.scan_level > 2) || canpodautoprocess))
 		data["autoallowed"] = 1
 	else
@@ -257,11 +257,11 @@
 				src.active_record = src.diskette.buf
 
 				src.temp = "Load successful."
-				
+
 			if("eject")
 				if (!isnull(src.diskette))
 					src.diskette.loc = src.loc
-					src.diskette = null			
+					src.diskette = null
 
 	else if (href_list["save_disk"]) //Save to disk!
 		if ((isnull(src.diskette)) || (src.diskette.read_only) || (isnull(src.active_record)))
@@ -284,7 +284,7 @@
 
 	else if (href_list["refresh"])
 		nanomanager.update_uis(src)
-		
+
 	else if (href_list["selectpod"])
 		var/obj/machinery/clonepod/selected = locate(href_list["selectpod"])
 		if(istype(selected) && (selected in pods))
@@ -297,7 +297,7 @@
 			//Can't clone without someone to clone.  Or a pod.  Or if the pod is busy. Or full of gibs.
 			if(!pods.len)
 				temp = "<span class=\"bad\">Error: No cloning pod detected.</span>"
-			else 
+			else
 				var/obj/machinery/clonepod/pod = selected_pod
 				if (!selected_pod)
 					temp = "<span class=\"bad\">Error: No cloning pod selected.</span>"

code/game/machinery/requests_console.dm

@@ -79,7 +79,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 		req_console_supplies |= department
 	if (departmentType & RC_INFO)
 		req_console_information |= department
-	
+
 	set_light(1)
 
 /obj/machinery/requests_console/Destroy()
@@ -96,14 +96,14 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 			req_console_supplies -= department
 		if (departmentType & RC_INFO)
 			req_console_information -= department
-	..()
+	return ..()
 
 /obj/machinery/requests_console/attack_ghost(user as mob)
 	if(stat & NOPOWER)
 		return
-		
-	ui_interact(user)	
-	
+
+	ui_interact(user)
+
 /obj/machinery/requests_console/attack_hand(user as mob)
 	if(..(user))
 		return
@@ -138,7 +138,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 		ui.set_auto_update(1)
 
 /obj/machinery/requests_console/Topic(href, href_list)
-	if(..())	
+	if(..())
 		return 1
 	usr.set_machine(src)
 	add_fingerprint(usr)

code/game/mecha/equipment/tools/tools.dm

@@ -287,7 +287,7 @@
 
 	Destroy()
 		rcd_list -= src
-		..()
+		return ..()
 
 	action(atom/target)
 		if(istype(target, /turf/space/transit))//>implying these are ever made -Sieve

code/game/mecha/mech_bay.dm

@@ -5,13 +5,13 @@
 	var/obj/machinery/mech_bay_recharge_port/recharge_port
 	var/obj/machinery/computer/mech_bay_power_console/recharge_console
 	var/obj/mecha/recharging_mecha = null
-	
+
 /turf/simulated/floor/mech_bay_recharge_floor/airless
 	icon_state = "recharge_floor_asteroid"
 	oxygen = 0.01
 	nitrogen = 0.01
 	temperature = TCMB
-	
+
 /turf/simulated/floor/mech_bay_recharge_floor/Destroy()
 	if(recharge_console && recharge_console.recharge_floor == src)
 		recharge_console.recharge_floor = null
@@ -36,7 +36,7 @@
 		else if(!recharge_port)
 			mecha.occupant_message("<font color='red'>Power port not found. Terminating.</font>")
 	return
-	
+
 /turf/simulated/floor/mech_bay_recharge_floor/Exited(atom)
 	. = ..()
 	if(atom == recharging_mecha)
@@ -91,7 +91,7 @@
 	component_parts += new /obj/item/weapon/stock_parts/capacitor(null)
 	component_parts += new /obj/item/stack/cable_coil(null, 1)
 	RefreshParts()
-	
+
 	pr_recharger = new /datum/global_iterator/mech_bay_recharger(null,0)
 
 /obj/machinery/mech_bay_recharge_port/upgraded/New()
@@ -114,12 +114,12 @@
 		pr_recharger.max_charge = MC * 10
 	if(recharge_console)
 		recharge_console.voltage = MC * 10
-	
+
 /obj/machinery/mech_bay_recharge_port/Destroy()
 	recharge_console.recharge_port = null
 	recharge_floor.recharge_port = null
-	..()
-	
+	return ..()
+
 /obj/machinery/mech_bay_recharge_port/attackby(obj/item/I, mob/user, params)
 	if(default_deconstruction_screwdriver(user, "recharge_port-o", "recharge_port", I))
 		return
@@ -131,7 +131,7 @@
 		return
 
 	default_deconstruction_crowbar(I)
-	
+
 /obj/machinery/mech_bay_recharge_port/proc/start_charge(var/obj/mecha/recharging_mecha)
 	if(stat&(NOPOWER|BROKEN))
 		recharging_mecha.occupant_message("<font color='red'>Power port not responding. Terminating.</font>")
@@ -149,13 +149,13 @@
 		update_icon()
 	pr_recharger.stop()
 	return
-	
+
 /obj/machinery/mech_bay_recharge_port/proc/active()
 	if(pr_recharger.active())
 		return 1
 	else
 		return 0
-		
+
 
 /obj/machinery/mech_bay_recharge_port/power_change()
 	if(powered())
@@ -165,7 +165,7 @@
 			stat |= NOPOWER
 			pr_recharger.stop()
 	return
-	
+
 /obj/machinery/mech_bay_recharge_port/proc/set_voltage(new_voltage)
 	if(new_voltage && isnum(new_voltage))
 		pr_recharger.max_charge = new_voltage
@@ -177,7 +177,7 @@
 	delay = 20
 	var/max_charge = 50
 	check_for_null = 0 //since port.stop_charge() must be called. The checks are made in process()
-	
+
 /datum/global_iterator/mech_bay_recharger/process(var/obj/machinery/mech_bay_recharge_port/port, var/obj/mecha/mecha)
 	if(!port)
 		return 0
@@ -208,11 +208,11 @@
 	var/voltage = 50
 	var/turf/simulated/floor/mech_bay_recharge_floor/recharge_floor
 	var/obj/machinery/mech_bay_recharge_port/recharge_port
-	
+
 /obj/machinery/computer/mech_bay_power_console/Destroy()
 	recharge_port.recharge_console = null
 	recharge_floor.recharge_console = null
-	..()
+	return ..()
 
 /obj/machinery/computer/mech_bay_power_console/proc/mecha_in(var/obj/mecha/mecha)
 	if(stat&(NOPOWER|BROKEN))
@@ -251,7 +251,7 @@
 	..()
 	if(recharge_port)
 		recharge_port.stop_charge()
-		
+
 /obj/machinery/computer/mech_bay_power_console/update_icon()
 	if(!recharge_floor || !recharge_floor.recharging_mecha || !recharge_floor.recharging_mecha.cell || !(recharge_floor.recharging_mecha.cell.charge < recharge_floor.recharging_mecha.cell.maxcharge))
 		icon_screen = "recharge_comp"

code/game/objects/items/weapons/mop.dm

@@ -23,7 +23,7 @@
 
 /obj/item/weapon/mop/Destroy()
 	janitorial_equipment -= src
-	return..()
+	return ..()
 
 /obj/item/weapon/mop/proc/clean(turf/simulated/A)
 	if(reagents.has_reagent("water", 1) || reagents.has_reagent("cleaner", 1) || reagents.has_reagent("holywater", 1))

code/modules/projectiles/guns/energy/temperature.dm

@@ -29,7 +29,7 @@
 
 /obj/item/weapon/gun/energy/temperature/Destroy()
 	processing_objects.Remove(src)
-	..()
+	return ..()
 
 
 /obj/item/weapon/gun/energy/temperature/attack_self(mob/living/user as mob)