Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE

Makes all Destroy() procs return properly
2026-07-15 01:54:52 +01:00 · 2015-09-01 15:54:18 +03:00
parent 6464aafa7c 1f5510eb12
commit bfbe4e997e
169 changed files with 217 additions and 214 deletions
@@ -212,4 +212,4 @@
 	if(previous)
 		previous.next = null
 		master.last = previous
-	..()
+	return ..()
@@ -11,8 +11,7 @@
 /obj/item/assembly/shock_kit/Destroy()
 	qdel(part1)
 	qdel(part2)
-	..()
-	return
+	return ..()

 /obj/item/assembly/shock_kit/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/wrench))
@@ -22,7 +22,7 @@
 /obj/item/device/assembly/signaler/Destroy()
 	if(radio_controller)
 		radio_controller.remove_object(src,frequency)
-	..()
+	return ..()

 /obj/item/device/assembly/signaler/activate()
 	if(cooldown > 0)	return 0
@@ -14,7 +14,7 @@

 /obj/item/clothing/head/helmet/space/chronos/Destroy()
 	dropped()
-	..()
+	return ..()


 /obj/item/clothing/suit/space/chronos
@@ -55,7 +55,7 @@

 /obj/item/clothing/suit/space/chronos/Destroy()
 	dropped()
-	..()
+	return ..()

 /obj/item/clothing/suit/space/chronos/emp_act(severity)
 	var/mob/living/carbon/human/user = src.loc
@@ -216,5 +216,5 @@
 			holder.remote_control = null
 		if(holder.client && (holder.client.eye == src))
 			holder.client.eye = holder
-	..()
+	return ..()

@@ -10,7 +10,7 @@

 /obj/item/clothing/suit/hooded/Destroy()
 	qdel(hood)
-	..()
+	return ..()

 /obj/item/clothing/suit/hooded/proc/MakeHood()
 	if(!hood)
@@ -101,13 +101,13 @@
 		helmet.suit = null
 		qdel(helmet)
 	qdel(jetpack)
-	..()
+	return ..()

 /obj/item/clothing/head/helmet/space/hardsuit/Destroy()
 	if(suit)
 		suit.helmet = null
 		qdel(suit)
-	..()
+	return ..()

 /obj/item/clothing/suit/space/hardsuit/proc/MakeHelmet()
 	if(!helmettype)
@@ -323,7 +323,7 @@
 	SetOpacity(0)
 	if(buckled_mob)
 		unbuckle_mob()
-	..()
+	return ..()

 /obj/effect/spacevine/proc/on_chem_effect(datum/reagent/R)
 	var/override = 0
@@ -423,7 +423,7 @@

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

 /obj/effect/spacevine_controller/proc/spawn_spacevine_piece(turf/location, obj/effect/spacevine/parent, list/muts)
 	var/obj/effect/spacevine/SV = new(location)
@@ -78,4 +78,4 @@
 			M.color = initial(M.color)
 		message += "...</span>"
 		M << message
-	..()
+	return ..()
@@ -107,6 +107,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
 /obj/effect/hallucination/simple/Destroy()
 	if(target.client) target.client.images.Remove(current_image)
 	active = 0
+	return ..()

 #define FAKE_FLOOD_EXPAND_TIME 30
 #define FAKE_FLOOD_MAX_RADIUS 7
@@ -160,7 +161,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
 	if(target.client) target.client.images.Remove(flood_images)
 	target = null
 	qdel(flood_images)
-	return
+	return ..()

 /obj/effect/hallucination/simple/xeno
 	image_icon = 'icons/mob/alien.dmi'
@@ -223,7 +223,7 @@
 	if(contents)
 		for(var/atom/movable/something in contents)
 			something.loc = get_turf(src)
-	..()
+	return ..()

 /obj/item/weapon/reagent_containers/food/snacks/attack_animal(mob/M)
 	if(isanimal(M))
@@ -305,7 +305,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow/Destroy()
 	if(istype(loc,/mob))
 		loc.AddLuminosity(round(-potency / 5,1))
-	..()
+	return ..()

 /obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow/pickup(mob/user)
 	src.SetLuminosity(0)
@@ -1208,7 +1208,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/Destroy()
 	if(istype(loc,/mob))
 		loc.AddLuminosity(round(-potency / 10,1))
-	..()
+	return ..()

 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/pickup(mob/user)
 	SetLuminosity(0)
@@ -69,7 +69,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 		qdel(ghostimage)
 		ghostimage = null
 		updateallghostimages()
-	..()
+	return ..()

 /mob/dead/CanPass(atom/movable/mover, turf/target, height=0)
 	return 1
@@ -147,7 +147,7 @@
 	if(brainmob)
 		qdel(brainmob)
 		brainmob = null
-	..()
+	return ..()

 /obj/item/device/mmi/examine(mob/user)
 	..()
@@ -13,7 +13,7 @@
 		if(stat!=DEAD)	//If not dead.
 			death(1)	//Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA
 		ghostize()		//Ghostize checks for key so nothing else is necessary.
-	..()
+	return ..()

 /mob/living/carbon/brain/update_canmove()
 	if(in_contents_of(/obj/mecha))	canmove = 1
@@ -112,7 +112,7 @@
 	if(brainmob)
 		qdel(brainmob)
 		brainmob = null
-	..()
+	return ..()

 /obj/item/organ/internal/brain/alien
 	name = "alien brain"
@@ -147,7 +147,7 @@ var/list/ai_list = list()
 	shuttle_caller_list -= src
 	SSshuttle.autoEvac()
 	qdel(eyeobj) // No AI, no Eye
-	..()
+	return ..()


 /mob/living/silicon/ai/verb/pick_icon()
@@ -38,7 +38,7 @@

 /mob/camera/aiEye/Destroy()
 	ai = null
-	..()
+	return ..()

 /atom/proc/move_camera_by_click()
 	if(istype(usr, /mob/living/silicon/ai))
@@ -26,7 +26,7 @@
 /obj/structure/Destroy()
 	if(ticker)
 		cameranet.updateVisibility(src)
-	..()
+	return ..()

 /obj/structure/New()
 	..()
@@ -38,7 +38,7 @@
 /obj/effect/Destroy()
 	if(ticker)
 		cameranet.updateVisibility(src)
-	..()
+	return ..()

 /obj/effect/New()
 	..()
@@ -94,6 +94,6 @@
 /obj/machinery/camera/Destroy()
 	cameranet.cameras -= src
 	cameranet.removeCamera(src)
-	..()
+	return ..()

 #undef BORG_CAMERA_BUFFER
@@ -80,7 +80,7 @@

 /mob/living/simple_animal/drone/Destroy()
 	qdel(access_card) //Otherwise it ends up on the floor!
-	..()
+	return ..()

 /mob/living/simple_animal/drone/Login()
 	..()
@@ -8,7 +8,7 @@
 	for(var/infection in viruses)
 		qdel(infection)
 	ghostize()
-	..()
+	return ..()

 /mob/proc/sac_act(obj/effect/rune/R, mob/victim)
 	return
@@ -44,7 +44,7 @@
 			assailant.client.screen -= hud
 		assailant = null
 	qdel(hud)
-	..()
+	return ..()

 //Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code.
 /obj/item/weapon/grab/proc/get_mob_if_throwable()
@@ -86,7 +86,7 @@ Contents:
 /obj/item/clothing/suit/space/space_ninja/Destroy()
 	if(affecting)
 		affecting << browse(null, "window=hack spideros")
-	..()
+	return ..()


 //Simply deletes all the attachments and self, killing all related procs.
@@ -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()
@@ -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)
@@ -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
@@ -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)
@@ -208,7 +208,7 @@
 	if(A)
 		on = 0
 //		A.update_lights()
-	..()
+	return ..()

 /obj/machinery/light/update_icon()

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

 /obj/machinery/power/Destroy()
 	disconnect_from_network()
-	..()
+	return ..()

 ///////////////////////////////
 // General procedures
@@ -26,6 +26,7 @@
 		M.powernet = null

 	SSmachine.powernets -= src
+	return ..()

 /datum/powernet/proc/is_empty()
 	return !cables.len && !nodes.len
@@ -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)
@@ -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)
@@ -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))
@@ -172,7 +172,7 @@ field_generator power level display

 /obj/machinery/field/generator/Destroy()
 	src.cleanup()
-	..()
+	return ..()



@@ -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"
@@ -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))
@@ -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
@@ -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()
 	..()
@@ -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)
@@ -40,7 +40,7 @@

 /obj/item/weapon/gun/energy/laser/captain/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()


 /obj/item/weapon/gun/energy/laser/captain/process()
@@ -122,7 +122,7 @@

 /obj/item/weapon/gun/energy/laser/bluetag/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()

 /obj/item/weapon/gun/energy/laser/bluetag/process()
 	charge_tick++
@@ -154,7 +154,7 @@

 /obj/item/weapon/gun/energy/laser/redtag/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()

 /obj/item/weapon/gun/energy/laser/redtag/process()
 	charge_tick++
@@ -64,7 +64,7 @@

 /obj/item/weapon/gun/energy/gun/nuclear/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()


 /obj/item/weapon/gun/energy/gun/nuclear/process()
@@ -61,7 +61,7 @@

 /obj/item/weapon/gun/energy/floragun/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()


 /obj/item/weapon/gun/energy/floragun/process()
@@ -97,7 +97,7 @@

 /obj/item/weapon/gun/energy/meteorgun/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()

 /obj/item/weapon/gun/energy/meteorgun/process()
 	charge_tick++
@@ -301,7 +301,7 @@

 /obj/item/weapon/gun/energy/printer/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()

 /obj/item/weapon/gun/energy/printer/process()
 	charge_tick++
@@ -38,7 +38,7 @@

 /obj/item/weapon/gun/energy/gun/advtaser/cyborg/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()

 /obj/item/weapon/gun/energy/gun/advtaser/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg
 	charge_tick++
@@ -78,7 +78,7 @@

 /obj/item/weapon/gun/energy/disabler/cyborg/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()

 /obj/item/weapon/gun/energy/disabler/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg
 	charge_tick++
@@ -56,7 +56,7 @@

 /obj/item/weapon/gun/magic/Destroy()
 	if(can_charge)	SSobj.processing.Remove(src)
-	..()
+	return ..()


 /obj/item/weapon/gun/magic/process()
@@ -54,7 +54,7 @@ var/const/PATCH = 4 //patches
 				break // Don't bother adding ourselves to other reagent ids, it is redundant.

 /datum/reagents/Destroy()
-	..()
+	. = ..()
 	SSobj.processing.Remove(src)
 	for(var/datum/reagent/R in reagent_list)
 		qdel(R)
@@ -27,7 +27,7 @@
 	var/overdosed = 0 // You fucked up and this is now triggering its overdose effects, purge that shit quick.

 /datum/reagent/Destroy() // This should only be called by the holder, so it's already handled clearing its references
-	..()
+	. = ..()
 	holder = null

 /datum/reagent/proc/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
@@ -43,7 +43,7 @@ Borg Hypospray

 /obj/item/weapon/reagent_containers/borghypo/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()


 /obj/item/weapon/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg
@@ -17,7 +17,7 @@
 /obj/structure/disposalholder/Destroy()
 	qdel(gas)
 	active = 0
-	..()
+	return ..()

 	// initialize a holder from the contents of a disposal unit
 /obj/structure/disposalholder/proc/init(obj/machinery/disposal/D)
@@ -194,13 +194,12 @@
 				AM.loc = T
 				AM.pipe_eject(0)
 			qdel(H)
-			..()
-			return
+			return ..()

 		// otherwise, do normal expel from turf
 		if(H)
 			expel(H, T, 0)
-	..()
+	return ..()

 // returns the direction of the next pipe object, given the entrance dir
 // by default, returns the bitmask of remaining directions
@@ -642,7 +641,7 @@
 		else if(istype(linked, /obj/machinery/disposal))
 			var/obj/machinery/disposal/D = linked
 			D.trunk = null
-	..()
+	return ..()

 /obj/structure/disposalpipe/trunk/proc/getlinked()
 	linked = null
@@ -783,7 +782,7 @@
 /obj/structure/disposaloutlet/Destroy()
 	if(trunk)
 		trunk.linked = null
-	..()
+	return ..()

 // expel the contents of the holder object, then delete it
 // called when the holder exits the outlet
@@ -49,7 +49,7 @@
 	eject()
 	if(trunk)
 		trunk.linked = null
-	..()
+	return ..()

 /obj/machinery/disposal/singularity_pull(S, current_size)
 	if(current_size >= STAGE_FIVE)
@@ -23,7 +23,7 @@
 	var/turf/T = get_turf(src)
 	for(var/atom/movable/AM in contents)
 		AM.loc = T
-	..()
+	return ..()

 /obj/structure/bigDelivery/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/device/destTagger))
@@ -96,8 +96,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()

 /obj/machinery/message_server/Destroy()
 	message_servers -= src
-	..()
-	return
+	return ..()

 /obj/machinery/message_server/proc/GenerateKey()
 	//Feel free to move to Helpers.
@@ -258,7 +257,7 @@ var/obj/machinery/blackbox_recorder/blackbox
 		BR.messages_admin = messages_admin
 		if(blackbox != BR)
 			blackbox = BR
-	..()
+	return ..()

 /obj/machinery/blackbox_recorder/proc/find_feedback_datum(variable)
 	for (var/datum/feedback_variable/FV in feedback)
@@ -26,7 +26,7 @@

 /obj/machinery/r_n_d/server/Destroy()
 	griefProtection()
-	..()
+	return ..()

 /obj/machinery/r_n_d/server/RefreshParts()
 	var/tot_rating = 0
@@ -54,7 +54,7 @@
 /obj/item/organ/internal/Destroy()
 	if(owner)
 		Remove(owner, 1)
-	..()
+	return ..()

 /obj/item/organ/internal/attack(mob/living/carbon/M, mob/user)
 	if(M == user && ishuman(user))
@@ -19,7 +19,7 @@ var/list/GPS_list = list()

 /obj/item/device/gps/Destroy()
 	GPS_list.Remove(src)
-	..()
+	return ..()

 /obj/item/device/gps/emp_act(severity)
 	emped = 1
@@ -127,7 +127,7 @@

 /obj/item/weapon/rcs/Destroy()
 	SSobj.processing.Remove(src)
-	..()
+	return ..()
 /obj/item/weapon/rcs/process()
 	if(rcharges > 10)
 		rcharges = 10
@@ -39,7 +39,7 @@
 	if(inserted_gps)
 		inserted_gps.loc = loc
 		inserted_gps = null
-	..()
+	return ..()

 /obj/machinery/computer/telescience/examine(mob/user)
 	..()