Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE

Makes all Destroy() procs return properly

code/game/objects/buckling.dm

@@ -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()))

code/game/objects/effects/aliens.dm

@@ -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

code/game/objects/effects/bump_teleporter.dm

@@ -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))

code/game/objects/effects/decals/Cleanable/aliens.dm

@@ -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)

code/game/objects/effects/decals/Cleanable/humans.dm

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

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -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"

code/game/objects/effects/decals/Cleanable/robots.dm

@@ -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")

code/game/objects/effects/decals/crayon.dm

@@ -56,4 +56,4 @@
 		gang.territory -= territory.type
 		gang.territory_new -= territory.type
 		gang.territory_lost |= list(territory.type = territory.name)
-	..()
+	return ..()

code/game/objects/effects/effect_system/effects_foam.dm

@@ -194,7 +194,7 @@
 /obj/structure/foamedmetal/Destroy()
 	density = 0
 	air_update_turf(1)
-	..()
+	return ..()
 
 
 /obj/structure/foamedmetal/Move()

code/game/objects/effects/effect_system/effects_smoke.dm

@@ -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)

code/game/objects/effects/spiders.dm

@@ -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 ..()

code/game/objects/items/devices/PDA/PDA.dm

@@ -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))

code/game/objects/items/devices/PDA/radio.dm

@@ -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)

code/game/objects/items/devices/camera_bug.dm

@@ -56,7 +56,7 @@
 	bugged_cameras = list()
 	if(tracking)
 		tracking = null
-	..()
+	return ..()
 
 
 /obj/item/device/camera_bug/interact(mob/user = usr)

code/game/objects/items/devices/chameleonproj.dm

@@ -148,4 +148,4 @@
 
 /obj/effect/dummy/chameleon/Destroy()
 	master.disrupt(0)
-	..()
+	return ..()

code/game/objects/items/devices/flashlight.dm

@@ -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++

code/game/objects/items/devices/instruments.dm

@@ -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

code/game/objects/items/devices/multitool.dm

@@ -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)

code/game/objects/items/devices/paicard.dm

@@ -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))

code/game/objects/items/devices/radio/electropack.dm

@@ -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))

code/game/objects/items/devices/radio/headset.dm

@@ -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)

code/game/objects/items/devices/radio/intercom.dm

@@ -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)

code/game/objects/items/devices/uplinks.dm

@@ -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()

code/game/objects/items/shooting_range.dm

@@ -11,7 +11,7 @@
 	removeOverlays()
 	if(pinnedLoc)
 		pinnedLoc.nullPinnedTarget()
-	..()
+	return ..()
 
 /obj/item/target/proc/nullPinnedLoc()
 	pinnedLoc = null

code/game/objects/items/stacks/stack.dm

@@ -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)
 	..()

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

@@ -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))

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

@@ -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)

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

@@ -28,7 +28,7 @@
 		qdel(igniter)
 	if(ptank)
 		qdel(ptank)
-	..()
+	return ..()
 
 
 /obj/item/weapon/flamethrower/process()

code/game/objects/items/weapons/grenades/smokebomb.dm

@@ -14,7 +14,7 @@
 
 /obj/item/weapon/grenade/smokebomb/Destroy()
 	qdel(smoke)
-	..()
+	return ..()
 
 /obj/item/weapon/grenade/smokebomb/prime()
 	update_mob()

code/game/objects/items/weapons/implants/implant.dm

@@ -69,7 +69,7 @@
 /obj/item/weapon/implant/Destroy()
 	if(imp_in)
 		removed(imp_in)
-	..()
+	return ..()
 
 
 /obj/item/weapon/implant/proc/get_data()

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

@@ -22,7 +22,7 @@
 
 /obj/item/weapon/twohanded/singularityhammer/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()
 
 
 /obj/item/weapon/twohanded/singularityhammer/process()

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

@@ -463,7 +463,7 @@
 	close_all()
 	qdel(boxes)
 	qdel(closer)
-	..()
+	return ..()
 
 
 /obj/item/weapon/storage/emp_act(severity)

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

@@ -37,7 +37,7 @@
 
 	SSobj.processing.Remove(src)
 
-	..()
+	return ..()
 
 /obj/item/weapon/tank/examine(mob/user)
 	var/obj/icon = src

code/game/objects/items/weapons/tanks/watertank.dm

@@ -66,8 +66,7 @@
 		remove_noz()
 		qdel(noz)
 		noz = null
-	..()
-	return
+	return ..()
 
 /obj/item/weapon/watertank/attack_hand(mob/user)
 	if(src.loc == user)

code/game/objects/objs.dm

@@ -16,7 +16,7 @@
 /obj/Destroy()
 	if(!istype(src, /obj/machinery))
 		SSobj.processing.Remove(src) // TODO: Have a processing bitflag to reduce on unnecessary loops through the processing lists
-	..()
+	return ..()
 
 /obj/assume_air(datum/gas_mixture/giver)
 	if(loc)

code/game/objects/structures.dm

@@ -18,7 +18,7 @@
 		UpdateAffectingLights()
 	if(smooth)
 		smooth_icon_neighbors(src)
-	..()
+	return ..()
 
 /obj/structure/mech_melee_attack(obj/mecha/M)
 	if(M.damtype == "brute")

code/game/objects/structures/mineral_doors.dm

@@ -29,7 +29,7 @@
 /obj/structure/mineral_door/Destroy()
 	density = 0
 	air_update_turf(1)
-	..()
+	return ..()
 
 /obj/structure/mineral_door/Move()
 	var/turf/T = loc

code/game/objects/structures/morgue.dm

@@ -30,7 +30,7 @@
 	if(connected)
 		qdel(connected)
 		connected = null
-	..()
+	return ..()
 
 /obj/structure/bodycontainer/on_log()
 	update_icon()
@@ -135,7 +135,7 @@ var/global/list/crematoriums = new/list()
 
 /obj/structure/bodycontainer/crematorium/Destroy()
 	crematoriums.Remove(src)
-	..()
+	return ..()
 
 /obj/structure/bodycontainer/crematorium/New()
 	connected = new/obj/structure/tray/c_tray(src)
@@ -214,7 +214,7 @@ var/global/list/crematoriums = new/list()
 		connected.connected = null
 		connected.update_icon()
 		connected = null
-	..()
+	return ..()
 
 /obj/structure/tray/attack_paw(mob/user)
 	return src.attack_hand(user)

code/game/objects/structures/musician.dm

@@ -22,7 +22,7 @@
 
 /datum/song/Destroy()
 	instrumentObj = null
-	..()
+	return ..()
 
 // note is a number from 1-7 for A-G
 // acc is either "b", "n", or "#"
@@ -322,7 +322,7 @@
 /obj/structure/piano/Destroy()
 	qdel(song)
 	song = null
-	..()
+	return ..()
 
 /obj/structure/piano/initialize()
 	song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded

code/game/objects/structures/statues.dm

@@ -14,7 +14,7 @@
 
 /obj/structure/statue/Destroy()
 	density = 0
-	..()
+	return ..()
 
 /obj/structure/statue/attackby(obj/item/weapon/W, mob/living/user, params)
 	add_fingerprint(user)

code/game/objects/structures/target_stake.dm

@@ -10,7 +10,7 @@
 /obj/structure/target_stake/Destroy()
 	if(pinned_target)
 		pinned_target.nullPinnedLoc()
-	..()
+	return ..()
 
 /obj/structure/target_stake/proc/nullPinnedTarget()
 	pinned_target = null

code/game/objects/structures/transit_tubes/station.dm

@@ -23,7 +23,7 @@
 
 /obj/structure/transit_tube/station/Destroy()
 	SSobj.processing -= src
-	..()
+	return ..()
 
 // Stations which will send the tube in the opposite direction after their stop.
 /obj/structure/transit_tube/station/reverse

code/game/objects/structures/transit_tubes/transit_tube_pod.dm

@@ -23,7 +23,7 @@
 	for(var/atom/movable/AM in contents)
 		AM.loc = loc
 
-	..()
+	return ..()
 
 /obj/structure/transit_tube_pod/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/crowbar))

code/game/objects/structures/windoor_assembly.dm

@@ -35,7 +35,7 @@
 /obj/structure/windoor_assembly/Destroy()
 	density = 0
 	air_update_turf(1)
-	..()
+	return ..()
 
 /obj/structure/windoor_assembly/Move()
 	var/turf/T = loc

code/game/objects/structures/window.dm

@@ -364,7 +364,7 @@
 	if(!disassembled)
 		playsound(src, "shatter", 70, 1)
 	update_nearby_icons()
-	..()
+	return ..()
 
 
 /obj/structure/window/Move()