Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE

Makes all Destroy() procs return properly
2026-07-22 05:25:15 +01:00 · 2015-09-01 15:54:18 +03:00
parent 6464aafa7c 1f5510eb12
commit bfbe4e997e
169 changed files with 217 additions and 214 deletions
@@ -44,7 +44,7 @@ Pipelines + Other Objects -> Pipe network
 	if(pipe_vision_img)
 		qdel(pipe_vision_img)

-	..()
+	return ..()

 //this is called just after the air controller sets up turfs
 /obj/machinery/atmospherics/proc/atmosinit()
@@ -35,7 +35,7 @@ Acts like a normal vent, but has an input AND output.
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src, frequency)
-	..()
+	return ..()

 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume
 	name = "large dual-port air vent"
@@ -25,7 +25,7 @@ Passive gate is similar to the regular pump except:
 /obj/machinery/atmospherics/components/binary/passive_gate/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()

 /obj/machinery/atmospherics/components/binary/passive_gate/update_icon_nopipes()
 	if(!on)
@@ -29,7 +29,7 @@ Thus, the two variables affect pump operation are set in New():
 /obj/machinery/atmospherics/components/binary/pump/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()

 /obj/machinery/atmospherics/components/binary/pump/on
 	on = 1
@@ -29,7 +29,7 @@ Thus, the two variables affect pump operation are set in New():
 /obj/machinery/atmospherics/components/binary/volume_pump/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()

 /obj/machinery/atmospherics/components/binary/volume_pump/on
 	on = 1
@@ -90,7 +90,7 @@ Pipenet stuff; housekeeping
 			N.disconnect(src)
 			nodes["n[I]"] = null
 			nullifyPipenet(parents["p[I]"])
-	..()
+	return ..()

 /obj/machinery/atmospherics/components/atmosinit(var/list/node_connects)
 	for(var/I = 1; I <= device_type; I++)
@@ -47,7 +47,7 @@ Filter types:
 /obj/machinery/atmospherics/components/trinary/filter/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()

 /obj/machinery/atmospherics/components/trinary/filter/update_icon()
 	overlays.Cut()
@@ -44,7 +44,7 @@
 	if(beaker)
 		beaker.loc = get_step(loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube
 	beaker = null
-	..()
+	return ..()
 /obj/machinery/atmospherics/components/unary/cryo_cell/process_atmos()
 	..()
 	var/datum/gas_mixture/air_contents = airs[AIR1]
@@ -19,7 +19,7 @@
 /obj/machinery/atmospherics/components/unary/outlet_injector/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()

 /obj/machinery/atmospherics/components/unary/outlet_injector/on
 	on = 1
@@ -19,7 +19,7 @@
 /obj/machinery/atmospherics/components/unary/portables_connector/Destroy()
 	if(connected_device)
 		connected_device.disconnect()
-	..()
+	return ..()

 /obj/machinery/atmospherics/components/unary/portables_connector/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/wrench))
@@ -59,7 +59,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()

 /obj/machinery/atmospherics/components/unary/vent_pump/high_volume
 	name = "large air vent"
@@ -305,7 +305,7 @@
 	if(initial_loc)
 		initial_loc.air_vent_info -= id_tag
 		initial_loc.air_vent_names -= id_tag
-	..()
+	return ..()


 /obj/machinery/atmospherics/components/unary/vent_pump/can_crawl_through()
@@ -51,7 +51,7 @@
 	if(initial_loc)
 		initial_loc.air_scrub_info -= id_tag
 		initial_loc.air_scrub_names -= id_tag
-	..()
+	return ..()
 /obj/machinery/atmospherics/components/unary/vent_scrubber/auto_use_power()
 	if(!powered(power_channel))
 		return 0
@@ -18,7 +18,7 @@
 		P.parent = null
 	for(var/obj/machinery/atmospherics/components/C in other_atmosmch)
 		C.nullifyPipenet(src)
-	..()
+	return ..()

 /datum/pipeline/process()
 	if(update)
@@ -73,7 +73,7 @@
 		node3 = null
 		A.build_network()
 	releaseAirToTurf()
-	..()
+	return ..()

 /obj/machinery/atmospherics/pipe/manifold/disconnect(obj/machinery/atmospherics/reference)
 	if(reference == node1)
@@ -77,7 +77,7 @@
 		node4 = null
 		A.build_network()
 	releaseAirToTurf()
-	..()
+	return ..()

 /obj/machinery/atmospherics/pipe/manifold4w/disconnect(obj/machinery/atmospherics/reference)
 	if(reference == node1)
@@ -56,7 +56,7 @@
 			var/obj/item/pipe_meter/PM = new (T)
 			meter.transfer_fingerprints_to(PM)
 			qdel(meter)
-	..()
+	return ..()

 /obj/machinery/atmospherics/pipe/proc/update_node_icon()
 	//Used for pipe painting. Overriden in the children.
@@ -77,7 +77,7 @@ The regular pipe you see everywhere, including bent ones.
 		node2 = null
 		A.build_network()
 	releaseAirToTurf()
-	..()
+	return ..()

 /obj/machinery/atmospherics/pipe/simple/disconnect(obj/machinery/atmospherics/reference)
 	if(reference == node1)
@@ -30,6 +30,7 @@
 /datum/action/Destroy()
 	if(owner)
 		Remove(owner)
+	return ..()

 /datum/action/proc/Grant(mob/living/T)
 	if(owner)
@@ -15,7 +15,7 @@

 /obj/screen/Destroy()
 	master = null
-	..()
+	return ..()


 /obj/screen/text
@@ -121,10 +121,13 @@ var/datum/subsystem/garbage_collector/SSgarbage
 				PlaceInPool(A,0)
 			if (QDEL_HINT_FINDREFERENCE)//qdel will, if TESTING is enabled, display all references to this object, then queue the object for deletion.
 				#ifdef TESTING
-				A.find_references(remove_from_queue = FALSE)
-				#endif
+				A.to_be_queued = TRUE
+				A.find_references()
+				#else
 				SSgarbage.Queue(A)
+				#endif
 			else
+				testing("WARNING: \ref[A] \[[A.type]] is not returning a qdel hint. It is being placed in the queue.")
 				SSgarbage.Queue(A)

 // Returns 1 if the object has been queued for deletion.
@@ -147,8 +150,9 @@ var/datum/subsystem/garbage_collector/SSgarbage
 #ifdef TESTING
 /client/var/running_find_references
 /datum/var/running_find_references
+/datum/var/to_be_queued = FALSE

-/datum/verb/find_references(remove_from_queue = TRUE as num)
+/datum/verb/find_references()
 	set category = "Debug"
 	set name = "Find References"
 	set background = 1
@@ -166,7 +170,7 @@ var/datum/subsystem/garbage_collector/SSgarbage
 			running_find_references = null
 			return
 	// Remove this object from the list of things to be auto-deleted.
-	if(remove_from_queue && SSgarbage && ("\ref[src]" in SSgarbage.queue))
+	if(SSgarbage && ("\ref[src]" in SSgarbage.queue))
 		SSgarbage.queue -= "\ref[src]"
 	if(usr && usr.client)
 		usr.client.running_find_references = type
@@ -192,6 +196,10 @@ var/datum/subsystem/garbage_collector/SSgarbage
 		usr.client.running_find_references = null
 	running_find_references = null

+	if(to_be_queued == TRUE)
+		to_be_queued = FALSE
+		SSgarbage.Queue(src)
+
 /client/verb/purge_all_destroyed_objects()
 	set category = "Debug"
 	if(SSgarbage)
@@ -210,5 +218,6 @@ var/datum/subsystem/garbage_collector/SSgarbage

 	qdel(src)
 	if(!running_find_references)
-		find_references(remove_from_queue = FALSE)
+		to_be_queued = TRUE		//find_references removes the object from the queue;
+		find_references()		//this ensures the object will be queued again once find_references has completed
 #endif
@@ -43,6 +43,7 @@ var/datum/subsystem/timer/SStimer

 /datum/timedevent/Destroy()
 	SStimer.processing -= src
+	return ..()

 /proc/addtimer(thingToCall, procToCall, wait, argList = list())
 	if (!SStimer) //can't run timers before the mc has been created
@@ -88,7 +88,7 @@
 	// Eject contents if deleted somehow
 	for(var/atom/movable/AM in src)
 		AM.loc = get_turf(src)
-	..()
+	return ..()

 /obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction)
 	if (!src.canmove || reappearing || !direction) return
@@ -17,7 +17,7 @@
 		qdel(spell)
 	linked_spells = null
 	starting_spells = null
-	..()
+	return ..()

 /obj/effect/proc_holder/spell/targeted/trigger/cast(list/targets)
 	playMagSound()
@@ -117,7 +117,7 @@
 	if(contents)
 		for(var/mob/M in contents)
 			M.loc = src.loc
-	..()
+	return ..()


 /mob/living/simple_animal/hostile/blob/blobspore/update_icons()
@@ -39,7 +39,7 @@
 		overmind.blob_core = null
 	overmind = null
 	SSobj.processing.Remove(src)
-	..()
+	return ..()

 /obj/effect/blob/core/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	return
@@ -17,7 +17,7 @@
 		if(spore.factory == src)
 			spore.factory = null
 	spores = null
-	..()
+	return ..()

 /obj/effect/blob/factory/PulseAnimation(activate = 0)
 	if(activate)
@@ -25,7 +25,7 @@
 /obj/effect/blob/node/Destroy()
 	blob_nodes -= src
 	SSobj.processing.Remove(src)
-	..()
+	return ..()

 /obj/effect/blob/node/Life()
 	pulseLoop(5)
@@ -47,7 +47,7 @@
 		qdel(ghostimage)
 		ghostimage = null;
 		updateallghostimages()
-	..()
+	return ..()

 /mob/camera/blob/Login()
 	..()
@@ -28,7 +28,7 @@
 	blobs -= src
 	if(isturf(loc)) //Necessary because Expand() is retarded and spawns a blob and then deletes it
 		playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
-	..()
+	return ..()


 /obj/effect/blob/CanPass(atom/movable/mover, turf/target, height=0)
@@ -454,3 +454,4 @@ var/list/slot2type = list("head" = /obj/item/clothing/head/changeling, "wear_mas

 /datum/changelingprofile/Destroy()
 	qdel(dna)
+	return ..()
@@ -109,7 +109,7 @@
 /obj/machinery/dominator/Destroy()
 	if(operating != -1)
 		set_broken()
-	..()
+	return ..()

 /obj/machinery/dominator/emp_act(severity)
 	healthcheck(100)
@@ -121,7 +121,7 @@

 /obj/effect/meteor/Destroy()
 	walk(src,0) //this cancels the walk_towards() proc
-	..()
+	return ..()

 /obj/effect/meteor/New()
 	..()
@@ -14,7 +14,7 @@

 /obj/item/weapon/pinpointer/Destroy()
 	active = 0
-	..()
+	return ..()

 /obj/item/weapon/pinpointer/attack_self()
 	if(!active)
@@ -204,7 +204,7 @@ var/global/list/multiverse = list()

 /obj/item/weapon/multisword/Destroy()
 	multiverse.Remove(src)
-	..()
+	return ..()

 /obj/item/weapon/multisword/attack_self(mob/user)
 	if(user.mind.special_role == "apprentice")
@@ -24,7 +24,7 @@
 	if(Beacon)
 		qdel(Beacon)
 	Beacon = null
-	..()
+	return ..()

 // update the invisibility and icon
 /obj/machinery/bluespace_beacon/hide(intact)
@@ -95,7 +95,7 @@
 /obj/machinery/door/airlock/Destroy()
 	if(frequency && radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()

 /obj/machinery/airlock_sensor
 	icon = 'icons/obj/airlock_machines.dmi'
@@ -168,4 +168,4 @@
 /obj/machinery/airlock_sensor/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()
@@ -65,7 +65,7 @@ var/list/announcement_systems = list()

 /obj/machinery/announcement_system/Destroy()
 	announcement_systems -= src //"OH GOD WHY ARE THERE 100,000 LISTED ANNOUNCEMENT SYSTEMS?!!"
-	..()
+	return ..()

 /obj/machinery/announcement_system/power_change()
 	..()
@@ -81,7 +81,7 @@
 	SSair.atmos_machinery -= src
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()

 /////////////////////////////////////////////////////////////
 // GENERAL AIR CONTROL (a.k.a atmos computer)
@@ -180,7 +180,7 @@
 /obj/machinery/computer/general_air_control/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src, frequency)
-	..()
+	return ..()

 /obj/machinery/computer/general_air_control/proc/set_frequency(new_frequency)
 	radio_controller.remove_object(src, frequency)
@@ -21,7 +21,7 @@
 /obj/machinery/meter/Destroy()
 	SSair.atmos_machinery -= src
 	src.target = null
-	..()
+	return ..()

 /obj/machinery/meter/initialize()
 	if (!target)
@@ -30,7 +30,7 @@
 /obj/machinery/portable_atmospherics/Destroy()
 	qdel(air_contents)
 	SSair.atmos_machinery -= src
-	..()
+	return ..()

 /obj/machinery/portable_atmospherics/update_icon()
 	return null
@@ -15,7 +15,7 @@

 /obj/machinery/zvent/Destroy()
 	SSair.atmos_machinery -= src
-	..()
+	return ..()

 /obj/machinery/zvent/process_atmos()

@@ -113,7 +113,7 @@
 /obj/machinery/bot/Destroy()
 	qdel(Radio)
 	qdel(botcard)
-	..()
+	return ..()


 /obj/machinery/bot/proc/explode()
@@ -56,7 +56,7 @@
 			bug.current = null
 		bug = null
 	cameranet.removeCamera(src) //Will handle removal from the camera network and the chunks, so we don't need to worry about that
-	..()
+	return ..()

 /obj/machinery/camera/emp_act(severity)
 	if(!isEmpProof())
@@ -135,7 +135,7 @@
 //This could all be done better, but it works for now.
 /obj/machinery/computer/HolodeckControl/Destroy()
 	emergencyShutdown()
-	..()
+	return ..()


 /obj/machinery/computer/HolodeckControl/emp_act(severity)
@@ -20,7 +20,7 @@
 /obj/machinery/computer/atmos_alert/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src, receive_frequency)
-	..()
+	return ..()

 /obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal)
 	if(!signal || signal.encryption) return
@@ -610,5 +610,5 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
 /obj/machinery/computer/communications/Destroy()
 	shuttle_caller_list -= src
 	SSshuttle.autoEvac()
-	..()
+	return ..()

@@ -126,7 +126,7 @@
 	if(T)
 		if(istype(T, /turf/simulated/floor))
 			T.blocks_air = 0
-	..()
+	return ..()

 /obj/machinery/computer/supplycomp
 	name = "supply shuttle console"
@@ -19,7 +19,7 @@
 	if(radio_controller)
 		radio_controller.remove_object(src,air_frequency)
 	air_connection = null
-	..()
+	return ..()

 /obj/machinery/door/airlock/alarmlock/initialize()
 	..()
@@ -24,7 +24,7 @@
 	if(health == 0)
 		playsound(src, "shatter", 70, 1)
 	electronics = null
-	..()
+	return ..()



@@ -15,7 +15,7 @@ var/list/doppler_arrays = list()

 /obj/machinery/doppler_array/Destroy()
 	doppler_arrays -= src
-	..()
+	return ..()

 /obj/machinery/doppler_array/process()
 	return PROCESS_KILL
@@ -16,7 +16,7 @@

 /obj/machinery/droneDispenser/Destroy()
 	SSmachine.processing -= src
-	..()
+	return ..()

 /obj/machinery/droneDispenser/preloaded
 	metal = 5000
@@ -118,7 +118,7 @@
 	for(var/obj/machinery/doorButtons/access_button/A in world)
 		if(A.controller == src)
 			A.controller = null
-	..()
+	return ..()

 /obj/machinery/doorButtons/airlock_controller/Topic(href, href_list)
 	if(..())
@@ -77,7 +77,7 @@
 /obj/machinery/embedded_controller/radio/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()

 /obj/machinery/embedded_controller/radio/initialize()
 	set_frequency(frequency)
@@ -237,7 +237,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 /obj/machinery/hologram/holopad/Destroy()
 	for (var/mob/living/silicon/ai/master in masters)
 		clear_holo(master)
-	..()
+	return ..()

 /*
 Holographic project of everything else.
@@ -128,7 +128,7 @@ Class Procs:
 	SSmachine.processing -= src
 	if(occupant)
 		dropContents()
-	..()
+	return ..()

 /obj/machinery/proc/locate_machinery()
 	return
@@ -45,7 +45,7 @@
 /obj/machinery/magnetic_module/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src, freq)
-	..()
+	. = ..()
 	center = null

 // update the invisibility and icon
@@ -244,7 +244,7 @@
 /obj/machinery/magnetic_controller/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src, frequency)
-	..()
+	. = ..()
 	magnets = null
 	rpath = null

@@ -36,7 +36,7 @@
 /obj/machinery/navbeacon/Destroy()
 	navbeacons &= src //Remove from beacon list, if in one.
 	deliverybeacons &= src
-	..()
+	return ..()

 // set the transponder codes assoc list from codes_txt
 /obj/machinery/navbeacon/proc/set_codes()
@@ -214,7 +214,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
 	allCasters -= src
 	viewing_channel = null
 	photo = null
-	..()
+	return ..()

 /obj/machinery/newscaster/update_icon()
 	if(!ispowered || isbroken)
@@ -144,7 +144,7 @@
 	//deletes its own cover with it
 	qdel(cover)
 	cover = null
-	..()
+	return ..()


 /obj/machinery/porta_turret/attack_ai(mob/user)
@@ -19,7 +19,7 @@
 	opacity = 0
 	density = 0
 	air_update_turf(1)
-	..()
+	return ..()

 /obj/machinery/shield/Move()
 	var/turf/T = loc
@@ -141,7 +141,7 @@
 	for(var/obj/machinery/shield/shield_tile in deployed_shields)
 		qdel(shield_tile)
 	deployed_shields = null
-	..()
+	return ..()


 /obj/machinery/shieldgen/proc/shields_up()
@@ -500,7 +500,7 @@
 	src.cleanup(2)
 	src.cleanup(4)
 	src.cleanup(8)
-	..()
+	return ..()

 /obj/machinery/shieldwallgen/bullet_act(obj/item/projectile/Proj)
 	storedpower -= Proj.damage
@@ -51,7 +51,7 @@
 /obj/machinery/status_display/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()

 // timed process

@@ -179,7 +179,7 @@
 /obj/machinery/power/singularity_beacon/Destroy()
 	if(active)
 		Deactivate()
-	..()
+	return ..()

 //stealth direct power usage
 /obj/machinery/power/singularity_beacon/process()
@@ -110,7 +110,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 	// In case message_delay is left on 1, otherwise it won't reset the list and people can't say the same thing twice anymore.
 	if(message_delay)
 		message_delay = 0
-	..()
+	return ..()



@@ -55,7 +55,7 @@
 	if(Compiler)
 		Compiler.GC()
 		Compiler = null
-	..()
+	return ..()

 /obj/machinery/telecomms/server/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
 	if(signal.data["message"])
@@ -158,7 +158,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
 	for(var/obj/machinery/telecomms/comm in telecomms_list)
 		comm.links -= src
 	links = list()
-	..()
+	return ..()

 // Used in auto linking
 /obj/machinery/telecomms/proc/add_link(obj/machinery/telecomms/T)
@@ -25,7 +25,7 @@
 	if (power_station)
 		power_station.teleporter_console = null
 		power_station = null
-	..()
+	return ..()

 /obj/machinery/computer/teleporter/proc/link_power_station()
 	if(power_station)
@@ -269,7 +269,7 @@
 	if (power_station)
 		power_station.teleporter_hub = null
 		power_station = null
-	..()
+	return ..()

 /obj/machinery/teleport/hub/RefreshParts()
 	var/A = 0
@@ -391,7 +391,7 @@
 	if (teleporter_console)
 		teleporter_console.power_station = null
 		teleporter_console = null
-	..()
+	return ..()

 /obj/machinery/teleport/station/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/device/multitool) && !panel_open)
@@ -84,7 +84,7 @@
 	wires = null
 	qdel(coin)
 	coin = null
-	..()
+	return ..()

 /obj/machinery/vending/snack/Destroy()
 	for(var/obj/item/weapon/reagent_containers/food/snacks/S in contents)
@@ -30,7 +30,7 @@
 /obj/mecha/combat/marauder/Destroy()
 	qdel(smoke_system)
 	smoke_system = null
-	..()
+	return ..()

 /obj/mecha/combat/marauder/relaymove(mob/user,direction)
 	if(zoom)
@@ -286,7 +286,7 @@

 /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()

 /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/detach()
 	SSobj.processing.Remove(src)
@@ -378,7 +378,7 @@

 /obj/item/mecha_parts/mecha_equipment/generator/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()

 /obj/item/mecha_parts/mecha_equipment/generator/proc/generator_init()
 	fuel = new /obj/item/stack/sheet/mineral/plasma(src)
@@ -24,11 +24,6 @@
 	. = ..()
 	unbuckle_mob()

-/obj/Del()
-	. = ..()
-	unbuckle_mob()
-
-
 //procs that handle the actual buckling and unbuckling
 /obj/proc/buckle_mob(mob/living/M)
 	if(!can_buckle || !istype(M) || (M.loc != loc) || M.buckled || (buckle_requires_restraints && !M.restrained()))
@@ -186,7 +186,7 @@
 	for (var/obj/structure/alien/weeds/W in range(1,T))
 		W.updateWeedOverlays()
 	linked_node = null
-	..()
+	return ..()

 /obj/structure/alien/weeds/proc/Life()
 	set background = BACKGROUND_ENABLED
@@ -17,7 +17,7 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()

 /obj/effect/bump_teleporter/Destroy()
 	BUMP_TELEPORTERS -= src
-	..()
+	return ..()

 /obj/effect/bump_teleporter/Bumped(atom/user)
 	if(!ismob(user))
@@ -17,7 +17,7 @@
 	for(var/datum/disease/D in viruses)
 		D.cure(0)
 	viruses = null
-	..()
+	return ..()

 /obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(list/directions)
 	spawn (0)
@@ -15,7 +15,7 @@
 	for(var/datum/disease/D in viruses)
 		D.cure(0)
 	viruses = null
-	..()
+	return ..()

 /obj/effect/decal/cleanable/blood/New()
 	..()
@@ -114,7 +114,7 @@
 	for(var/datum/disease/D in viruses)
 		D.cure(0)
 	viruses = null
-	..()
+	return ..()

 /obj/effect/decal/cleanable/tomato_smudge
 	name = "tomato smudge"
@@ -59,7 +59,7 @@
 	for(var/datum/disease/D in viruses)
 		D.cure(0)
 	viruses = null
-	..()
+	return ..()

 /obj/effect/decal/cleanable/oil/streak
 	random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5")
@@ -56,4 +56,4 @@
 		gang.territory -= territory.type
 		gang.territory_new -= territory.type
 		gang.territory_lost |= list(territory.type = territory.name)
-	..()
+	return ..()
@@ -194,7 +194,7 @@
 /obj/structure/foamedmetal/Destroy()
 	density = 0
 	air_update_turf(1)
-	..()
+	return ..()


 /obj/structure/foamedmetal/Move()
@@ -36,7 +36,7 @@

 /obj/effect/effect/smoke/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()

 /obj/effect/effect/smoke/proc/kill_smoke()
 	SSobj.processing.Remove(src)
@@ -192,8 +192,7 @@

 /datum/effect/effect/system/smoke_spread/chem/Destroy()
 	chemholder = null
-	..()
-	return QDEL_HINT_PUTINPOOL
+	return ..()

 /datum/effect/effect/system/smoke_spread/chem/set_up(datum/reagents/carry = null, n = 5, c = 0, loca, direct, silent = 0)
 	if(n > 20)
@@ -255,4 +255,4 @@
 	src.visible_message("<span class='warning'>\The [src] splits open.</span>")
 	for(var/atom/movable/A in contents)
 		A.loc = src.loc
-	..()
+	return ..()
@@ -1064,7 +1064,7 @@ var/global/list/obj/item/device/pda/PDAs = list()

 /obj/item/device/pda/Destroy()
 	PDAs -= src
-	..()
+	return ..()

 /obj/item/device/pda/clown/Crossed(AM as mob|obj) //Clown PDA is slippery.
 	if (istype(AM, /mob/living/carbon))
@@ -32,7 +32,7 @@
 /obj/item/radio/integrated/signal/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src, frequency)
-	..()
+	return ..()

 /obj/item/radio/integrated/signal/initialize()
 	if (src.frequency < 1200 || src.frequency > 1600)
@@ -56,7 +56,7 @@
 	bugged_cameras = list()
 	if(tracking)
 		tracking = null
-	..()
+	return ..()


 /obj/item/device/camera_bug/interact(mob/user = usr)
@@ -148,4 +148,4 @@

 /obj/effect/dummy/chameleon/Destroy()
 	master.disrupt(0)
-	..()
+	return ..()
@@ -291,7 +291,7 @@ obj/item/device/flashlight/lamp/bananalamp

 /obj/item/device/flashlight/emp/Destroy()
 		SSobj.processing.Remove(src)
-		..()
+		return ..()

 /obj/item/device/flashlight/emp/process()
 		charge_tick++
@@ -14,7 +14,7 @@
 /obj/item/device/instrument/Destroy()
 	qdel(song)
 	song = null
-	..()
+	return ..()

 /obj/item/device/instrument/initialize()
 	song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
@@ -31,7 +31,7 @@

 /obj/item/device/multitool/ai_detect/Destroy()
 	SSobj.processing -= src
-	..()
+	return ..()

 /obj/item/device/multitool/ai_detect/process()
 	if(track_delay > world.time)
@@ -18,7 +18,7 @@
 	//Will stop people throwing friend pAIs into the singularity so they can respawn
 	if(!isnull(pai))
 		pai.death(0)
-	..()
+	return ..()

 /obj/item/device/paicard/attack_self(mob/user)
 	if (!in_range(src, user))
@@ -20,7 +20,7 @@
 /obj/item/device/electropack/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src, frequency)
-	..()
+	return ..()

 /obj/item/device/electropack/attack_hand(mob/user)
 	if(iscarbon(user))
@@ -20,7 +20,7 @@
 	qdel(keyslot2)
 	keyslot = null
 	keyslot2 = null
-	..()
+	return ..()

 /obj/item/device/radio/headset/talk_into(mob/living/M, message, channel, list/spans)
 	if (!listening)
@@ -16,7 +16,7 @@

 /obj/item/device/radio/intercom/Destroy()
 	SSobj.processing -= src
-	..()
+	return ..()

 /obj/item/device/radio/intercom/attack_ai(mob/user)
 	src.add_fingerprint(user)
@@ -25,7 +25,7 @@ var/list/world_uplinks = list()

 /obj/item/device/uplink/Destroy()
 	world_uplinks-=src
-	..()
+	return ..()

 //Let's build a menu!
 /obj/item/device/uplink/proc/generate_menu()
@@ -11,7 +11,7 @@
 	removeOverlays()
 	if(pinnedLoc)
 		pinnedLoc.nullPinnedTarget()
-	..()
+	return ..()

 /obj/item/target/proc/nullPinnedLoc()
 	pinnedLoc = null
@@ -27,7 +27,7 @@
 /obj/item/stack/Destroy()
 	if (usr && usr.machine==src)
 		usr << browse(null, "window=stack")
-	..()
+	return ..()

 /obj/item/stack/examine(mob/user)
 	..()
@@ -22,7 +22,7 @@

 /obj/item/weapon/chrono_eraser/Destroy()
 	dropped()
-	..()
+	return ..()

 /obj/item/weapon/chrono_eraser/ui_action_click()
 	var/mob/living/carbon/user = src.loc
@@ -74,7 +74,7 @@
 		TED = null
 	if(field)
 		field_disconnect(field)
-	..()
+	return ..()

 /obj/item/weapon/gun/energy/chrono_gun/proc/field_connect(obj/effect/chrono_field/F)
 	var/mob/living/user = src.loc
@@ -181,7 +181,7 @@
 /obj/effect/chrono_field/Destroy()
 	if(gun && gun.field_check(src))
 		gun.field_disconnect(src)
-	..()
+	return ..()

 /obj/effect/chrono_field/update_icon()
 	var/ttk_frame = 1 - (tickstokill / initial(tickstokill))
@@ -193,9 +193,8 @@
 	if(on)
 		var/M = get(paddles, /mob)
 		remove_paddles(M)
-	..()
+	. = ..()
 	update_icon()
-	return

 /obj/item/weapon/defibrillator/proc/deductcharge(chrgdeductamt)
 	if(bcell)
@@ -28,7 +28,7 @@
 		qdel(igniter)
 	if(ptank)
 		qdel(ptank)
-	..()
+	return ..()


 /obj/item/weapon/flamethrower/process()
@@ -14,7 +14,7 @@

 /obj/item/weapon/grenade/smokebomb/Destroy()
 	qdel(smoke)
-	..()
+	return ..()

 /obj/item/weapon/grenade/smokebomb/prime()
 	update_mob()
@@ -69,7 +69,7 @@
 /obj/item/weapon/implant/Destroy()
 	if(imp_in)
 		removed(imp_in)
-	..()
+	return ..()


 /obj/item/weapon/implant/proc/get_data()
@@ -22,7 +22,7 @@

 /obj/item/weapon/twohanded/singularityhammer/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()


 /obj/item/weapon/twohanded/singularityhammer/process()
--- a/Show More
+++ b/Show More