mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 03:27:05 +01:00
Renames QDEL_LIST to QDEL_LIST_CONTENTS (#20006)
* Renames QDEL_LIST to QDEL_LIST_CONTENTS * derp
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user