Renames QDEL_LIST to QDEL_LIST_CONTENTS (#20006)

* Renames QDEL_LIST to QDEL_LIST_CONTENTS * derp
2026-08-24 04:27:35 +01:00 · 2022-12-29 14:28:40 +00:00
parent 6486a7e109
commit e91b6c94f7
72 changed files with 111 additions and 111 deletions
@@ -1,13 +1,13 @@
 #define QDEL_IN(item, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), item), time, TIMER_STOPPABLE)
 #define QDEL_IN_CLIENT_TIME(item, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), item), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME)
 #define QDEL_NULL(item) if(item) { qdel(item); item = null }
-#define QDEL_LIST(L) if(L) { for(var/I in L) qdel(I); L.Cut(); }
-#define QDEL_LIST_IN(L, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(______qdel_list_wrapper), L), time, TIMER_STOPPABLE)
+#define QDEL_LIST_CONTENTS(L) if(L) { for(var/I in L) qdel(I); L.Cut(); }
+#define QDEL_LIST_CONTENTS_IN(L, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(______qdel_list_wrapper), L), time, TIMER_STOPPABLE)
 #define QDEL_LIST_ASSOC(L) if(L) { for(var/I in L) { qdel(L[I]); qdel(I); } L.Cut(); }
 #define QDEL_LIST_ASSOC_VAL(L) if(L) { for(var/I in L) qdel(L[I]); L.Cut(); }

 /proc/______qdel_list_wrapper(list/L) //the underscores are to encourage people not to use this directly.
-	QDEL_LIST(L)
+	QDEL_LIST_CONTENTS(L)

 /**
 * # Signal qdel
@@ -72,18 +72,18 @@

 	QDEL_NULL(module_store_icon)

-	QDEL_LIST(static_inventory)
+	QDEL_LIST_CONTENTS(static_inventory)

 	inv_slots.Cut()
 	action_intent = null
 	zone_select = null
 	move_intent = null

-	QDEL_LIST(toggleable_inventory)
+	QDEL_LIST_CONTENTS(toggleable_inventory)

-	QDEL_LIST(hotkeybuttons)
+	QDEL_LIST_CONTENTS(hotkeybuttons)

-	QDEL_LIST(infodisplay)
+	QDEL_LIST_CONTENTS(infodisplay)

 	//clear mob refs to screen objects
 	mymob.throw_icon = null
@@ -270,6 +270,6 @@ SUBSYSTEM_DEF(shuttle)
 		var/obj/machinery/computer/camera_advanced/shuttle_docker/C = V
 		C.update_hidden_docking_ports(remove_images, add_images)

-	QDEL_LIST(remove_images)
+	QDEL_LIST_CONTENTS(remove_images)

 #undef CALL_SHUTTLE_REASON_LENGTH
@@ -48,7 +48,7 @@
 	finished = TRUE

 /datum/beam/proc/Reset()
-	QDEL_LIST(elements)
+	QDEL_LIST_CONTENTS(elements)

 /datum/beam/Destroy()
 	Reset()
@@ -24,7 +24,7 @@
 	holder.click_intercept = null
 	holder.show_popup_menus = TRUE
 	holder = null
-	QDEL_LIST(buttons)
+	QDEL_LIST_CONTENTS(buttons)
 	return ..()

 /**
@@ -47,7 +47,7 @@
 /datum/component/proximity_monitor/Destroy(force, silent)
 	hasprox_receiver = null
 	nested_receiver_locs.Cut()
-	QDEL_LIST(proximity_checkers)
+	QDEL_LIST_CONTENTS(proximity_checkers)
 	return ..()

 /datum/component/proximity_monitor/RegisterWithParent()
@@ -286,8 +286,8 @@

 /datum/component/proximity_monitor/advanced/Destroy(force, silent)
 	STOP_PROCESSING(SSfields, src)
-	QDEL_LIST(field_checkers)
-	QDEL_LIST(edge_checkers)
+	QDEL_LIST_CONTENTS(field_checkers)
+	QDEL_LIST_CONTENTS(edge_checkers)
 	return ..()

 /datum/component/proximity_monitor/advanced/create_prox_checkers()
@@ -1539,10 +1539,10 @@
 /**
 * Removes all antag datums from the src mind.
 *
- * Use this over doing `QDEL_LIST(antag_datums)`.
+ * Use this over doing `QDEL_LIST_CONTENTS(antag_datums)`.
 */
 /datum/mind/proc/remove_all_antag_datums()
-	// This is not `QDEL_LIST(antag_datums)`because it's possible for the `antag_datums` list to be set to null during deletion of an antag datum.
+	// This is not `QDEL_LIST_CONTENTS(antag_datums)`because it's possible for the `antag_datums` list to be set to null during deletion of an antag datum.
 	// Then `QDEL_LIST` would runtime because it would be doing `null.Cut()`.
 	for(var/datum/antagonist/A as anything in antag_datums)
 		qdel(A)
@@ -26,7 +26,7 @@
 	var/list/effects

 /obj/effect/proc_holder/spell/spacetime_dist/Destroy()
-	QDEL_LIST(effects)
+	QDEL_LIST_CONTENTS(effects)
 	return ..()

 /obj/effect/proc_holder/spell/spacetime_dist/create_new_targeting()
@@ -70,7 +70,7 @@

 /// Callback which cleans up our effects list after the duration expires.
 /obj/effect/proc_holder/spell/spacetime_dist/proc/clean_turfs()
-	QDEL_LIST(effects)
+	QDEL_LIST_CONTENTS(effects)
 	ready = TRUE

 /obj/effect/cross_action
@@ -20,7 +20,7 @@


 /obj/item/camera_assembly/Destroy()
-	QDEL_LIST(upgrades)
+	QDEL_LIST_CONTENTS(upgrades)
 	return ..()

 /obj/item/camera_assembly/examine(mob/user)
@@ -106,7 +106,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
 		UnregisterSignal(clonemind, COMSIG_MIND_TRANSER_TO)
 	QDEL_NULL(Radio)
 	QDEL_NULL(countdown)
-	QDEL_LIST(missing_organs)
+	QDEL_LIST_CONTENTS(missing_organs)
 	return ..()

 /obj/machinery/clonepod/RefreshParts()
@@ -497,7 +497,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
 		clonemind = null


-	QDEL_LIST(missing_organs)
+	QDEL_LIST_CONTENTS(missing_organs)
 	occupant.SetLoseBreath(0) // Stop friggin' dying, gosh damn
 	occupant.setOxyLoss(0)
 	for(var/datum/disease/critical/crit in occupant.viruses)
@@ -524,7 +524,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
 			message += "<i>Is this what dying is like? Yes it is.</i>"
 			to_chat(occupant, "<span class='warning'>[message]</span>")
 			SEND_SOUND(occupant, sound('sound/hallucinations/veryfar_noise.ogg', 0, 1, 50))
-		QDEL_LIST(missing_organs)
+		QDEL_LIST_CONTENTS(missing_organs)
 		clonemind = null
 		spawn(40)
 			qdel(occupant)
@@ -575,7 +575,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
 	malfunction(go_easy = TRUE)

 /obj/machinery/clonepod/proc/maim_clone(mob/living/carbon/human/H)
-	QDEL_LIST(missing_organs)
+	QDEL_LIST_CONTENTS(missing_organs)

 	H.setCloneLoss(CLONE_INITIAL_DAMAGE, FALSE)
 	H.setBrainLoss(BRAIN_INITIAL_DAMAGE)
@@ -51,7 +51,7 @@

 /obj/machinery/computer/security/Destroy()
 	qdel(cam_screen)
-	QDEL_LIST(cam_plane_masters)
+	QDEL_LIST_CONTENTS(cam_plane_masters)
 	qdel(cam_background)
 	return ..()

@@ -50,7 +50,7 @@
 	if(current_user)
 		current_user.unset_machine()
 	QDEL_NULL(eyeobj)
-	QDEL_LIST(actions)
+	QDEL_LIST_CONTENTS(actions)
 	return ..()

 /obj/machinery/computer/camera_advanced/on_unset_machine(mob/M)
@@ -454,8 +454,8 @@
 	lying_prev = 0

 /obj/machinery/disco/proc/dance_over()
-	QDEL_LIST(spotlights)
-	QDEL_LIST(sparkles)
+	QDEL_LIST_CONTENTS(spotlights)
+	QDEL_LIST_CONTENTS(sparkles)
 	for(var/mob/living/L in rangers)
 		if(!L || !L.client)
 			continue
@@ -309,7 +309,7 @@
 		deploy(direction, uptime)

 /obj/structure/dropwall_generator/Destroy()
-	QDEL_LIST(connected_shields)
+	QDEL_LIST_CONTENTS(connected_shields)
 	core_shield = null
 	return ..()

@@ -201,7 +201,7 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
 		return
 	switch(action)
 		if("delete_logs")
-			QDEL_LIST(logged_explosions)
+			QDEL_LIST_CONTENTS(logged_explosions)
 			to_chat(usr, "<span class='notice'>All logs deleted successfully.</span>")
 		if("delete_record")
 			var/index = text2num(params["index"])
@@ -142,7 +142,7 @@
 	var/locked = FALSE

 /obj/machinery/shieldgen/Destroy()
-	QDEL_LIST(deployed_shields)
+	QDEL_LIST_CONTENTS(deployed_shields)
 	deployed_shields = null
 	return ..()

@@ -172,7 +172,7 @@
 	active = FALSE
 	update_icon(UPDATE_ICON_STATE)

-	QDEL_LIST(deployed_shields)
+	QDEL_LIST_CONTENTS(deployed_shields)

 /obj/machinery/shieldgen/process()
 	if(malfunction && active)
@@ -411,7 +411,7 @@
 	STOP_PROCESSING(SSmachines, src)
 	for(var/direction in GLOB.cardinal)
 		var/list/L = active_shields["[direction]"]
-		QDEL_LIST(L) // Don't want to clean the assoc keys so no QDEL_LIST_ASSOC_VAL
+		QDEL_LIST_CONTENTS(L) // Don't want to clean the assoc keys so no QDEL_LIST_ASSOC_VAL

 /obj/machinery/shieldwallgen/proc/remove_active_shield(obj/machinery/shieldwall/SW, direction)
 	var/list/L = active_shields["[direction]"]
@@ -38,7 +38,7 @@
 		var/obj/O = target
 		if(istype(target, /obj/machinery/atmospherics/supermatter_crystal)) //No, you can't pick up the SM with this you moron, did you think you were clever?
 			var/obj/mecha/working/ripley/R = chassis
-			QDEL_LIST(R.cargo) //We don't want to drop cargo that just spam hits the SM, let's delete it
+			QDEL_LIST_CONTENTS(R.cargo) //We don't want to drop cargo that just spam hits the SM, let's delete it
 			occupant_message("<span class='userdanger'>You realise in horror what you have done as [chassis] starts warping around you!</span>")
 			chassis.occupant.dust()
 			target.Bumped(chassis)
@@ -463,7 +463,7 @@
 /obj/machinery/mecha_part_fabricator/upgraded/Initialize(mapload)
 	. = ..()
 	// Upgraded components
-	QDEL_LIST(component_parts)
+	QDEL_LIST_CONTENTS(component_parts)
 	component_parts = list()
 	component_parts += new /obj/item/circuitboard/mechfab(null)
 	component_parts += new /obj/item/stock_parts/matter_bin/super(null)
@@ -640,7 +640,7 @@
 	connected_port = null
 	QDEL_NULL(spark_system)
 	QDEL_NULL(smoke_system)
-	QDEL_LIST(trackers)
+	QDEL_LIST_CONTENTS(trackers)
 	remove_from_all_data_huds()
 	GLOB.mechas_list -= src //global mech list
 	return ..()
@@ -40,7 +40,7 @@

 /obj/structure/mecha_wreckage/Destroy()
 	QDEL_NULL(AI)
-	QDEL_LIST(crowbar_salvage)
+	QDEL_LIST_CONTENTS(crowbar_salvage)
 	return ..()

 /obj/structure/mecha_wreckage/examine(mob/user)
@@ -134,7 +134,7 @@
 	//Attach hydraulic clamp
 	var/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/HC = new
 	HC.attach(src)
-	QDEL_LIST(trackers) //Deletes the beacon so it can't be found easily
+	QDEL_LIST_CONTENTS(trackers) //Deletes the beacon so it can't be found easily

 	var/obj/item/mecha_parts/mecha_equipment/mining_scanner/scanner = new
 	scanner.attach(src)
@@ -172,7 +172,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
 	if(ismob(loc))
 		var/mob/m = loc
 		m.unEquip(src, 1)
-	QDEL_LIST(actions)
+	QDEL_LIST_CONTENTS(actions)
 	master = null
 	return ..()

@@ -34,7 +34,7 @@

 /obj/item/grenade/chem_grenade/Destroy()
 	QDEL_NULL(nadeassembly)
-	QDEL_LIST(beakers)
+	QDEL_LIST_CONTENTS(beakers)
 	return ..()

 /obj/item/grenade/chem_grenade/examine(mob/user)
@@ -19,7 +19,7 @@

 /obj/item/pneumatic_cannon/Destroy()
 	QDEL_NULL(tank)
-	QDEL_LIST(loadedItems)
+	QDEL_LIST_CONTENTS(loadedItems)
 	return ..()

 /obj/item/pneumatic_cannon/examine(mob/user)
@@ -267,7 +267,7 @@ LINEN BINS
 	var/obj/item/hidden = null

 /obj/structure/bedsheetbin/Destroy()
-	QDEL_LIST(sheets)
+	QDEL_LIST_CONTENTS(sheets)
 	if(hidden)
 		hidden.forceMove(get_turf(src))
 		hidden = null
@@ -24,8 +24,8 @@
 	update_icon(UPDATE_OVERLAYS)

 /obj/structure/dispenser/Destroy()
-	QDEL_LIST(stored_plasma_tanks)
-	QDEL_LIST(stored_oxygen_tanks)
+	QDEL_LIST_CONTENTS(stored_plasma_tanks)
+	QDEL_LIST_CONTENTS(stored_oxygen_tanks)
 	return ..()

 /obj/structure/dispenser/proc/initialize_tanks()
@@ -98,7 +98,7 @@
 		SSair.add_to_active(T)
 	SSair.remove_from_active(src)
 	visibilityChanged()
-	QDEL_LIST(blueprint_data)
+	QDEL_LIST_CONTENTS(blueprint_data)
 	initialized = FALSE
 	..()

@@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(antagonist_teams)
 /datum/team/Destroy(force = FALSE, ...)
 	for(var/datum/mind/member as anything in members)
 		remove_member(member)
-	QDEL_LIST(objectives)
+	QDEL_LIST_CONTENTS(objectives)
 	members.Cut()
 	GLOB.antagonist_teams -= src
 	return ..()
@@ -83,7 +83,7 @@
 /datum/antagonist/changeling/Destroy()
 	SSticker.mode.changelings -= owner
 	chosen_sting = null
-	QDEL_LIST(acquired_powers)
+	QDEL_LIST_CONTENTS(acquired_powers)
 	STOP_PROCESSING(SSobj, src)
 	return ..()

@@ -570,7 +570,7 @@
 	var/obj/item/implant/uplink/uplink_implant = locate() in M
 	uplink_implant?.hidden_uplink?.is_jammed = FALSE

-	QDEL_LIST(temp_objs)
+	QDEL_LIST_CONTENTS(temp_objs)

 	// Injuries due to questioning and souvenirs
 	injure_target(M)
@@ -57,7 +57,7 @@

 /datum/buildmode_mode/proc/deselect_region()
 	BM.holder.images -= preview
-	QDEL_LIST(preview)
+	QDEL_LIST_CONTENTS(preview)
 	cornerA = null
 	cornerB = null

@@ -26,8 +26,8 @@
 /datum/click_intercept/buildmode/Destroy()
 	close_switchstates()
 	QDEL_NULL(mode)
-	QDEL_LIST(modeswitch_buttons)
-	QDEL_LIST(dirswitch_buttons)
+	QDEL_LIST_CONTENTS(modeswitch_buttons)
+	QDEL_LIST_CONTENTS(dirswitch_buttons)
 	return ..()

 /datum/click_intercept/buildmode/create_buttons()
@@ -68,7 +68,7 @@
 	else
 		close_switchstates()
 		open_modeswitch()
-	
+
 /datum/click_intercept/buildmode/proc/open_modeswitch()
 	switch_state = BM_SWITCHSTATE_MODE
 	holder.screen += modeswitch_buttons
@@ -83,7 +83,7 @@
 	else
 		close_switchstates()
 		open_dirswitch()
-	
+
 /datum/click_intercept/buildmode/proc/open_dirswitch()
 	switch_state = BM_SWITCHSTATE_DIR
 	holder.screen += dirswitch_buttons
@@ -122,7 +122,7 @@
 			new/datum/click_intercept/buildmode(M.client)
 			message_admins("[key_name_admin(usr)] has entered build mode.")
 			log_admin("[key_name(usr)] has entered build mode.")
-	
+
 #undef BM_SWITCHSTATE_NONE
 #undef BM_SWITCHSTATE_MODE
 #undef BM_SWITCHSTATE_DIR
@@ -6,7 +6,7 @@


 /datum/buildmode_mode/link/proc/clear_lines()
-	QDEL_LIST(link_lines)
+	QDEL_LIST_CONTENTS(link_lines)

 /datum/buildmode_mode/link/proc/form_connection(atom/source, atom/dest, valid)
 	var/obj/effect/buildmode_line/L = new(BM.holder, source, dest, "[source.name] to [dest.name]")
@@ -706,7 +706,7 @@
 		sensor_mode = pick(SENSOR_OFF, SENSOR_LIVING, SENSOR_VITALS, SENSOR_COORDS)

 /obj/item/clothing/under/Destroy()
-	QDEL_LIST(accessories)
+	QDEL_LIST_CONTENTS(accessories)
 	return ..()


@@ -278,7 +278,7 @@
 				stack_trace("Part [part_path] went missing")
 			parts_returned += part
 			parts_used -= part
-	QDEL_LIST(parts_used)
+	QDEL_LIST_CONTENTS(parts_used)

 	return parts_returned

@@ -53,8 +53,8 @@

 /datum/money_account/Destroy(force)
 	//we don't need to worry about nanobank programs here because they auto GC themselves
-	QDEL_LIST(account_log)
-	QDEL_LIST(hidden_account_log)
+	QDEL_LIST_CONTENTS(account_log)
+	QDEL_LIST_CONTENTS(hidden_account_log)
 	if(!QDELETED(database_holder))
 		if(account_type == ACCOUNT_TYPE_PERSONAL)
 			database_holder.user_accounts -= src //remove reference to this account incase this was not deleted the "correct" way through an account db
@@ -419,7 +419,7 @@ do {\


 /obj/item/reagent_containers/food/snacks/customizable/Destroy()
-	QDEL_LIST(ingredients)
+	QDEL_LIST_CONTENTS(ingredients)
 	qdel(top_image)
 	return ..()

@@ -810,7 +810,7 @@
 /obj/machinery/smartfridge/drying_rack/Initialize(mapload)
 	. = ..()
 	// Remove components, this is wood duh
-	QDEL_LIST(component_parts)
+	QDEL_LIST_CONTENTS(component_parts)
 	component_parts = null
 	// Accepted items
 	accepted_items_typecache = typecacheof(list(
@@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(hallucinations, list(
 	if(!images)
 		return
 	target?.client?.images -= images
-	QDEL_LIST(images)
+	QDEL_LIST_CONTENTS(images)

 /**
  * Plays a sound to the target only.
@@ -55,8 +55,8 @@
 		B.beehome = null
 	bees.Cut()
 	bees = null
-	QDEL_LIST(honeycombs)
-	QDEL_LIST(honey_frames)
+	QDEL_LIST_CONTENTS(honeycombs)
+	QDEL_LIST_CONTENTS(honey_frames)
 	QDEL_NULL(queen_bee)
 	return ..()

@@ -45,7 +45,7 @@
 /obj/machinery/biogenerator/Destroy()
 	QDEL_NULL(container)
 	QDEL_NULL(files)
-	QDEL_LIST(stored_plants)
+	QDEL_LIST_CONTENTS(stored_plants)
 	return ..()

 /obj/machinery/biogenerator/ex_act(severity)
@@ -65,7 +65,7 @@
 	RefreshParts()

 /obj/machinery/seed_extractor/Destroy()
-	QDEL_LIST(piles)
+	QDEL_LIST_CONTENTS(piles)
 	return ..()

 /obj/machinery/seed_extractor/RefreshParts()
@@ -70,7 +70,7 @@
 			genes += new /datum/plant_gene/reagent(reag_id, reagents_add[reag_id])

 /obj/item/seeds/Destroy()
-	QDEL_LIST(genes)
+	QDEL_LIST_CONTENTS(genes)
 	return ..()

 /obj/item/seeds/proc/Copy()
@@ -29,7 +29,7 @@
 	var/adaptive_damage_bonus = 0

 /obj/item/twohanded/kinetic_crusher/Destroy()
-	QDEL_LIST(trophies)
+	QDEL_LIST_CONTENTS(trophies)
 	return ..()

 /obj/item/twohanded/kinetic_crusher/examine(mob/living/user)
@@ -76,7 +76,7 @@
 	speed_process = TRUE

 /obj/machinery/mineral/stacking_machine/Destroy()
-	QDEL_LIST(stack_list)
+	QDEL_LIST_CONTENTS(stack_list)
 	if(console)
 		console.machine = null
 	console = null
@@ -11,9 +11,9 @@
 	for(var/obj/item in get_all_slots())
 		unEquip(item)
 		qdel(item)
-	QDEL_LIST(internal_organs)
-	QDEL_LIST(stomach_contents)
-	QDEL_LIST(processing_patches)
+	QDEL_LIST_CONTENTS(internal_organs)
+	QDEL_LIST_CONTENTS(stomach_contents)
+	QDEL_LIST_CONTENTS(processing_patches)
 	GLOB.carbon_list -= src
 	return ..()

@@ -64,7 +64,7 @@
 /mob/living/carbon/human/Destroy()
 	. = ..()
 	SSmobs.cubemonkeys -= src
-	QDEL_LIST(bodyparts)
+	QDEL_LIST_CONTENTS(bodyparts)
 	splinted_limbs.Cut()
 	QDEL_NULL(physiology)
 	GLOB.human_list -= src
@@ -191,8 +191,8 @@
 	return species_language.get_random_name(gender)

 /datum/species/proc/create_organs(mob/living/carbon/human/H) //Handles creation of mob organs.
-	QDEL_LIST(H.internal_organs)
-	QDEL_LIST(H.bodyparts)
+	QDEL_LIST_CONTENTS(H.internal_organs)
+	QDEL_LIST_CONTENTS(H.bodyparts)

 	LAZYREINITLIST(H.bodyparts)
 	LAZYREINITLIST(H.bodyparts_by_name)
@@ -428,7 +428,7 @@

 		if(C.reagents)
 			C.reagents.clear_reagents()
-			QDEL_LIST(C.reagents.addiction_list)
+			QDEL_LIST_CONTENTS(C.reagents.addiction_list)
 			C.reagents.addiction_threshold_accumulated.Cut()
 		if(iscultist(src))
 			if(SSticker.mode.cult_risen)
@@ -436,7 +436,7 @@
 			if(SSticker.mode.cult_ascendant)
 				SSticker.mode.ascend(src)

-		QDEL_LIST(C.processing_patches)
+		QDEL_LIST_CONTENTS(C.processing_patches)

 // rejuvenate: Called by `revive` to get the mob into a revivable state
 // the admin "rejuvenate" command calls `revive`, not this proc.
@@ -77,12 +77,12 @@

 /obj/item/robot_module/Destroy()
 	// These can all contain actual objects, so we need to null them out.
-	QDEL_LIST(modules)
-	QDEL_LIST(basic_modules)
-	QDEL_LIST(emag_modules)
-	QDEL_LIST(malf_modules)
-	QDEL_LIST(storages)
-	QDEL_LIST(special_rechargables)
+	QDEL_LIST_CONTENTS(modules)
+	QDEL_LIST_CONTENTS(basic_modules)
+	QDEL_LIST_CONTENTS(emag_modules)
+	QDEL_LIST_CONTENTS(malf_modules)
+	QDEL_LIST_CONTENTS(storages)
+	QDEL_LIST_CONTENTS(special_rechargables)
 	return ..()


@@ -1039,7 +1039,7 @@ Pass a positive integer as an argument to override a bot's default speed.
 	clear_path_image()

 	var/list/path_images = hud_list[DIAG_PATH_HUD]
-	QDEL_LIST(path_images)
+	QDEL_LIST_CONTENTS(path_images)
 	if(newpath)
 		for(var/i in 1 to newpath.len)
 			var/turf/T = newpath[i]
@@ -7,8 +7,8 @@
 	if(mind && mind.current == src)
 		spellremove(src)
 	mobspellremove(src)
-	QDEL_LIST(viruses)
-	QDEL_LIST(actions)
+	QDEL_LIST_CONTENTS(viruses)
+	QDEL_LIST_CONTENTS(actions)
 	for(var/alert in alerts)
 		clear_alert(alert)
 	ghostize()
@@ -19,7 +19,7 @@
 	..()

 /obj/item/paper_bin/Destroy()
-	QDEL_LIST(papers)
+	QDEL_LIST_CONTENTS(papers)
 	return ..()

 /obj/item/paper_bin/burn()
@@ -517,7 +517,7 @@
 	SStgui.update_uis(src)

 /obj/machinery/photocopier/Destroy()
-	QDEL_LIST(saved_documents)
+	QDEL_LIST_CONTENTS(saved_documents)
 	return ..()

 /**
@@ -351,7 +351,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	current_app = null
 	scanmode = null
 	QDEL_NULL(held_pen)
-	QDEL_LIST(programs)
+	QDEL_LIST_CONTENTS(programs)
 	QDEL_NULL(cartridge)
 	return ..()

@@ -16,8 +16,8 @@
 	var/list/messenger_plugins = list()

 /obj/item/cartridge/Destroy()
-	QDEL_LIST(programs)
-	QDEL_LIST(messenger_plugins)
+	QDEL_LIST_CONTENTS(programs)
+	QDEL_LIST_CONTENTS(messenger_plugins)
 	return ..()

 /obj/item/cartridge/proc/update_programs(obj/item/pda/pda)
@@ -63,7 +63,7 @@
 	if(!miniball)
 		GLOB.poi_list -= src

-	QDEL_LIST(orbiting_balls)
+	QDEL_LIST_CONTENTS(orbiting_balls)
 	shocked_things.Cut()
 	return ..()

@@ -136,7 +136,7 @@
 	update_appearance(UPDATE_DESC|UPDATE_ICON)

 /obj/item/ammo_box/Destroy()
-	QDEL_LIST(stored_ammo)
+	QDEL_LIST_CONTENTS(stored_ammo)
 	stored_ammo = null
 	return ..()

@@ -20,7 +20,7 @@
 	. += "<span class='notice'>[rockets.len] / [max_rockets] rockets.</span>"

 /obj/item/gun/rocketlauncher/Destroy()
-	QDEL_LIST(rockets)
+	QDEL_LIST_CONTENTS(rockets)
 	rockets = null
 	return ..()

@@ -124,7 +124,7 @@
 	create_reagents(reservoir_volume)

 /obj/item/gun/syringe/rapidsyringe/Destroy()
-	QDEL_LIST(syringes)
+	QDEL_LIST_CONTENTS(syringes)

 	if(chambered)
 		if(chambered.BB)
@@ -37,7 +37,7 @@

 /obj/item/gun/throw/Destroy()
 	QDEL_NULL(to_launch)
-	QDEL_LIST(loaded_projectiles)
+	QDEL_LIST_CONTENTS(loaded_projectiles)
 	loaded_projectiles = null
 	return ..()

@@ -962,9 +962,9 @@

 /datum/reagents/Destroy()
 	. = ..()
-	QDEL_LIST(reagent_list)
+	QDEL_LIST_CONTENTS(reagent_list)
 	reagent_list = null
-	QDEL_LIST(addiction_list)
+	QDEL_LIST_CONTENTS(addiction_list)
 	addiction_list = null
 	if(my_atom && my_atom.reagents == src)
 		my_atom.reagents = null
@@ -348,7 +348,7 @@

 /obj/machinery/chem_dispenser/soda/Initialize(mapload)
 	. = ..()
-	QDEL_LIST(component_parts)
+	QDEL_LIST_CONTENTS(component_parts)
 	component_parts += new /obj/item/circuitboard/chem_dispenser/soda(null)
 	component_parts += new /obj/item/stock_parts/matter_bin(null)
 	component_parts += new /obj/item/stock_parts/matter_bin(null)
@@ -360,7 +360,7 @@

 /obj/machinery/chem_dispenser/soda/upgraded/Initialize(mapload)
 	. = ..()
-	QDEL_LIST(component_parts)
+	QDEL_LIST_CONTENTS(component_parts)
 	component_parts += new /obj/item/circuitboard/chem_dispenser/soda(null)
 	component_parts += new /obj/item/stock_parts/matter_bin/super(null)
 	component_parts += new /obj/item/stock_parts/matter_bin/super(null)
@@ -384,7 +384,7 @@

 /obj/machinery/chem_dispenser/beer/Initialize(mapload)
 	. = ..()
-	QDEL_LIST(component_parts)
+	QDEL_LIST_CONTENTS(component_parts)
 	component_parts += new /obj/item/circuitboard/chem_dispenser/beer(null)
 	component_parts += new /obj/item/stock_parts/matter_bin(null)
 	component_parts += new /obj/item/stock_parts/matter_bin(null)
@@ -396,7 +396,7 @@

 /obj/machinery/chem_dispenser/beer/upgraded/Initialize(mapload)
 	. = ..()
-	QDEL_LIST(component_parts)
+	QDEL_LIST_CONTENTS(component_parts)
 	component_parts += new /obj/item/circuitboard/chem_dispenser/beer(null)
 	component_parts += new /obj/item/stock_parts/matter_bin/super(null)
 	component_parts += new /obj/item/stock_parts/matter_bin/super(null)
@@ -550,7 +550,7 @@

 /obj/machinery/chem_master/condimaster/Initialize(mapload)
 	. = ..()
-	QDEL_LIST(component_parts)
+	QDEL_LIST_CONTENTS(component_parts)
 	component_parts += new /obj/item/circuitboard/chem_master/condi_master(null)
 	component_parts += new /obj/item/stock_parts/manipulator(null)
 	component_parts += new /obj/item/stack/sheet/glass(null)
@@ -68,8 +68,8 @@ GLOBAL_LIST_EMPTY(message_servers)

 /obj/machinery/message_server/Destroy()
 	GLOB.message_servers -= src
-	QDEL_LIST(pda_msgs)
-	QDEL_LIST(rc_msgs)
+	QDEL_LIST_CONTENTS(pda_msgs)
+	QDEL_LIST_CONTENTS(rc_msgs)
 	return ..()

 /obj/machinery/message_server/process()
@@ -147,7 +147,7 @@
 	if(current_user.client)
 		current_user.client.images -= the_eye.placed_images

-	QDEL_LIST(the_eye.placed_images)
+	QDEL_LIST_CONTENTS(the_eye.placed_images)

 	for(var/V in the_eye.placement_images)
 		var/image/I = V
@@ -28,7 +28,7 @@
 	set_occupied(FALSE)
 	if(parent)
 		parent.children -= src
-	QDEL_LIST(children)
+	QDEL_LIST_CONTENTS(children)
 	parent = null
 	. = ..()

@@ -255,7 +255,7 @@
 		connect_to_network()

 /obj/machinery/power/bluespace_tap/Destroy()
-	QDEL_LIST(fillers)
+	QDEL_LIST_CONTENTS(fillers)
 	return ..()

 /**
@@ -203,7 +203,7 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/m


 /obj/machinery/dna_vault/Destroy()
-	QDEL_LIST(fillers)
+	QDEL_LIST_CONTENTS(fillers)
 	return ..()

 /obj/machinery/dna_vault/attack_ghost(mob/user)
@@ -63,7 +63,7 @@
 	..()

 /datum/surgery_step/proxy/Destroy(force, ...)
-	QDEL_LIST(branches_init)
+	QDEL_LIST_CONTENTS(branches_init)
 	return ..()

 /datum/surgery_step/proxy/get_step_information(datum/surgery/surgery)
@@ -91,9 +91,9 @@
 		owner.bodyparts_by_name[limb_name] = null
 		owner.splinted_limbs -= src

-	QDEL_LIST(children)
+	QDEL_LIST_CONTENTS(children)

-	QDEL_LIST(embedded_objects)
+	QDEL_LIST_CONTENTS(embedded_objects)

 	QDEL_NULL(hidden)

@@ -44,7 +44,7 @@
 			failed_any_test = TRUE
 			test_logs[test.type] += test.fail_reasons

-	QDEL_LIST(tests)
+	QDEL_LIST_CONTENTS(tests)


 /datum/test_runner/proc/Run()