From 530de5ed9672d7d094de078eac442f26efac865b Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Fri, 29 Dec 2023 22:43:37 -0500 Subject: [PATCH] Cleans up some extra args in Destroy() (#184) * Cleans up some extra args in Destroy() (#80642) ## About The Pull Request After https://github.com/tgstation/tgstation/pull/80628, these shouldn't be needed anymore right? ## Why It's Good For The Game Cleans up some vestigial code ## Changelog EDIT: Not player-facing. * Cleans up some extra args in Destroy() --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> Co-authored-by: NovaBot --- code/__HELPERS/heap.dm | 2 +- code/__HELPERS/paths/jps.dm | 2 +- code/__HELPERS/paths/path.dm | 2 +- code/_onclick/hud/radial.dm | 2 +- code/controllers/subsystem/spatial_gridmap.dm | 2 +- code/controllers/subsystem/statpanel.dm | 2 +- code/datums/ai/_ai_controller.dm | 2 +- code/datums/armor/_armor.dm | 2 +- code/datums/greyscale/_greyscale_config.dm | 2 +- code/datums/lazy_template.dm | 2 +- code/datums/memory/_memory.dm | 2 +- code/datums/mergers/_merger.dm | 2 +- code/datums/mocking/client.dm | 2 +- code/datums/mood.dm | 2 +- code/datums/quirks/_quirk_constant_data.dm | 2 +- code/datums/wounds/_wound_static_data.dm | 2 +- code/datums/wounds/scars/_scars.dm | 2 +- code/game/machinery/camera/trackable.dm | 2 +- .../game/machinery/computer/orders/order_items/order_datum.dm | 2 +- code/modules/admin/verbs/highlander_datum.dm | 2 +- code/modules/admin/verbs/lua/lua_editor.dm | 2 +- code/modules/admin/view_variables/color_matrix_editor.dm | 2 +- .../admin/view_variables/nobody_wants_to_learn_matrix_math.dm | 2 +- code/modules/antagonists/_common/antag_team.dm | 2 +- code/modules/antagonists/heretic/heretic_knowledge.dm | 2 +- code/modules/antagonists/heretic/influences.dm | 2 +- code/modules/antagonists/heretic/knowledge/rust_lore.dm | 2 +- .../knowledge/sacrifice_knowledge/sacrifice_knowledge.dm | 2 +- code/modules/antagonists/separatist/separatist.dm | 2 +- code/modules/antagonists/traitor/traitor_objective.dm | 2 +- code/modules/antagonists/traitor/uplink_handler.dm | 2 +- code/modules/basketball/controller.dm | 2 +- code/modules/capture_the_flag/ctf_controller.dm | 4 ++-- code/modules/cargo/order.dm | 4 ++-- code/modules/client/preferences.dm | 2 +- code/modules/escape_menu/escape_menu.dm | 2 +- code/modules/explorer_drone/manager.dm | 2 +- code/modules/explorer_drone/scanner_array.dm | 2 +- code/modules/fishing/fishing_minigame.dm | 2 +- code/modules/forensics/_forensics.dm | 2 +- code/modules/interview/interview_manager.dm | 2 +- code/modules/mafia/abilities/abilities.dm | 2 +- code/modules/mafia/controller.dm | 2 +- code/modules/mafia/roles/roles.dm | 2 +- code/modules/mapping/verify.dm | 2 +- code/modules/mining/equipment/monster_organs/monster_organ.dm | 2 +- code/modules/procedural_mapping/mapGenerator.dm | 2 +- code/modules/procedural_mapping/mapGeneratorModule.dm | 2 +- code/modules/requests/request_manager.dm | 2 +- code/modules/spells/spell_types/right_and_wrong.dm | 2 +- code/modules/spells/spell_types/tower_of_babel.dm | 2 +- code/modules/tgui_input/alert.dm | 2 +- code/modules/tgui_input/checkboxes.dm | 2 +- code/modules/tgui_input/list.dm | 2 +- code/modules/tgui_input/number.dm | 2 +- code/modules/tgui_input/text.dm | 2 +- code/modules/tooltip/tooltip.dm | 2 +- code/modules/tutorials/_tutorial.dm | 4 ++-- code/modules/tutorials/tutorials/drop.dm | 2 +- code/modules/tutorials/tutorials/switch_hands.dm | 2 +- 60 files changed, 63 insertions(+), 63 deletions(-) diff --git a/code/__HELPERS/heap.dm b/code/__HELPERS/heap.dm index 363fbbb80d6..eeabfa6a20b 100644 --- a/code/__HELPERS/heap.dm +++ b/code/__HELPERS/heap.dm @@ -10,7 +10,7 @@ L = new() cmp = compare -/datum/heap/Destroy(force, ...) +/datum/heap/Destroy(force) for(var/i in L) // because this is before the list helpers are loaded qdel(i) L = null diff --git a/code/__HELPERS/paths/jps.dm b/code/__HELPERS/paths/jps.dm index 6a86f6ebe62..2dc46dea1b7 100644 --- a/code/__HELPERS/paths/jps.dm +++ b/code/__HELPERS/paths/jps.dm @@ -38,7 +38,7 @@ f_value = number_tiles + heuristic // otherwise, no parent node means this is from a subscan lateral scan, so we just need the tile for now until we call [datum/jps/proc/update_parent] on it -/datum/jps_node/Destroy(force, ...) +/datum/jps_node/Destroy(force) previous_node = null return ..() diff --git a/code/__HELPERS/paths/path.dm b/code/__HELPERS/paths/path.dm index 14241ef8e70..28ef66aa45e 100644 --- a/code/__HELPERS/paths/path.dm +++ b/code/__HELPERS/paths/path.dm @@ -97,7 +97,7 @@ /// Datum that holds the canpass info of this pathing attempt. This is what CanAstarPass sees var/datum/can_pass_info/pass_info -/datum/pathfind/Destroy(force, ...) +/datum/pathfind/Destroy(force) . = ..() SSpathfinder.active_pathing -= src SSpathfinder.currentrun -= src diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index 7c6de3c1022..51220c48512 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -396,7 +396,7 @@ GLOBAL_LIST_EMPTY(radial_menus) /// If provided, will display an info button that will put this text in your chat var/info -/datum/radial_menu_choice/Destroy(force, ...) +/datum/radial_menu_choice/Destroy(force) . = ..() QDEL_NULL(image) diff --git a/code/controllers/subsystem/spatial_gridmap.dm b/code/controllers/subsystem/spatial_gridmap.dm index 64f7994a1fe..81ae29f6bad 100644 --- a/code/controllers/subsystem/spatial_gridmap.dm +++ b/code/controllers/subsystem/spatial_gridmap.dm @@ -44,7 +44,7 @@ client_contents = dummy_list atmos_contents = dummy_list -/datum/spatial_grid_cell/Destroy(force, ...) +/datum/spatial_grid_cell/Destroy(force) if(force)//the response to someone trying to qdel this is a right proper fuck you stack_trace("dont try to destroy spatial grid cells without a good reason. if you need to do it use force") return diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index b0d090208bb..d652df3a567 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -341,7 +341,7 @@ SUBSYSTEM_DEF(statpanels) . = ..() src.parent = parent -/datum/object_window_info/Destroy(force, ...) +/datum/object_window_info/Destroy(force) atoms_to_show = null atoms_to_images = null atoms_to_imagify = null diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm index 04dc7901c85..a13cc8b36fa 100644 --- a/code/datums/ai/_ai_controller.dm +++ b/code/datums/ai/_ai_controller.dm @@ -67,7 +67,7 @@ multiple modular subtrees with behaviors if(!isnull(new_pawn)) // unit tests need the ai_controller to exist in isolation due to list schenanigans i hate it here PossessPawn(new_pawn) -/datum/ai_controller/Destroy(force, ...) +/datum/ai_controller/Destroy(force) set_ai_status(AI_STATUS_OFF) UnpossessPawn(FALSE) set_movement_target(type, null) diff --git a/code/datums/armor/_armor.dm b/code/datums/armor/_armor.dm index bfd15af4189..616ad00c324 100644 --- a/code/datums/armor/_armor.dm +++ b/code/datums/armor/_armor.dm @@ -42,7 +42,7 @@ GLOBAL_LIST_INIT(armor_by_type, generate_armor_type_cache()) /// A version of armor that cannot be modified and will always return itself when attempted to be modified /datum/armor/immune -/datum/armor/Destroy(force, ...) +/datum/armor/Destroy(force) if(!force && tag) return QDEL_HINT_LETMELIVE diff --git a/code/datums/greyscale/_greyscale_config.dm b/code/datums/greyscale/_greyscale_config.dm index c59f4168a9d..c6973a5d983 100644 --- a/code/datums/greyscale/_greyscale_config.dm +++ b/code/datums/greyscale/_greyscale_config.dm @@ -66,7 +66,7 @@ if(!name) stack_trace("Greyscale config object [DebugName()] is missing a name, make sure `name` has been assigned a value.") -/datum/greyscale_config/Destroy(force, ...) +/datum/greyscale_config/Destroy(force) if(!force) return QDEL_HINT_LETMELIVE return ..() diff --git a/code/datums/lazy_template.dm b/code/datums/lazy_template.dm index e3006e13056..0a5e8e53314 100644 --- a/code/datums/lazy_template.dm +++ b/code/datums/lazy_template.dm @@ -18,7 +18,7 @@ reservations = list() ..() -/datum/lazy_template/Destroy(force, ...) +/datum/lazy_template/Destroy(force) if(!force) stack_trace("Something is trying to delete [type]") return QDEL_HINT_LETMELIVE diff --git a/code/datums/memory/_memory.dm b/code/datums/memory/_memory.dm index 57312774776..0656d32006a 100644 --- a/code/datums/memory/_memory.dm +++ b/code/datums/memory/_memory.dm @@ -71,7 +71,7 @@ // This happens after everything's all set, remember this for New overrides generate_memory_name() -/datum/memory/Destroy(force, ...) +/datum/memory/Destroy(force) memorizer_mind = null return ..() diff --git a/code/datums/mergers/_merger.dm b/code/datums/mergers/_merger.dm index 8014b6419fc..6816d415a89 100644 --- a/code/datums/mergers/_merger.dm +++ b/code/datums/mergers/_merger.dm @@ -28,7 +28,7 @@ src.attempt_merge_proc = attempt_merge_proc Refresh() -/datum/merger/Destroy(force, ...) +/datum/merger/Destroy(force) for(var/atom/thing as anything in members) RemoveMember(thing) return ..() diff --git a/code/datums/mocking/client.dm b/code/datums/mocking/client.dm index 418f5cfb8db..dc1db213f34 100644 --- a/code/datums/mocking/client.dm +++ b/code/datums/mocking/client.dm @@ -39,7 +39,7 @@ GLOB.directory[ckey] = src #endif -/datum/client_interface/Destroy(force, ...) +/datum/client_interface/Destroy(force) GLOB.directory -= ckey return ..() diff --git a/code/datums/mood.dm b/code/datums/mood.dm index 4a3c61ba756..d8e7a1bbf9b 100644 --- a/code/datums/mood.dm +++ b/code/datums/mood.dm @@ -67,7 +67,7 @@ mob_parent = null -/datum/mood/Destroy(force, ...) +/datum/mood/Destroy(force) STOP_PROCESSING(SSmood, src) QDEL_LIST_ASSOC_VAL(mood_events) return ..() diff --git a/code/datums/quirks/_quirk_constant_data.dm b/code/datums/quirks/_quirk_constant_data.dm index 977c52a6837..1984acecec0 100644 --- a/code/datums/quirks/_quirk_constant_data.dm +++ b/code/datums/quirks/_quirk_constant_data.dm @@ -58,7 +58,7 @@ GLOBAL_LIST_INIT_TYPED(all_quirk_constant_data, /datum/quirk_constant_data, gene /datum/quirk_constant_data/proc/is_customizable() return LAZYLEN(customization_options) > 0 -/datum/quirk_constant_data/Destroy(force, ...) +/datum/quirk_constant_data/Destroy(force) var/error_message = "[src], a singleton quirk constant data instance, was destroyed! This should not happen!" if (force) error_message += " NOTE: This Destroy() was called with force == TRUE. This instance will be deleted and replaced with a new one." diff --git a/code/datums/wounds/_wound_static_data.dm b/code/datums/wounds/_wound_static_data.dm index 7a59ea57413..f996bb258c7 100644 --- a/code/datums/wounds/_wound_static_data.dm +++ b/code/datums/wounds/_wound_static_data.dm @@ -185,7 +185,7 @@ return new wound_path_to_generate -/datum/wound_pregen_data/Destroy(force, ...) +/datum/wound_pregen_data/Destroy(force) var/error_message = "[src], a singleton wound pregen data instance, was destroyed! This should not happen!" if (force) error_message += " NOTE: This Destroy() was called with force == TRUE. This instance will be deleted and replaced with a new one." diff --git a/code/datums/wounds/scars/_scars.dm b/code/datums/wounds/scars/_scars.dm index e650899be29..2fdd92b82d0 100644 --- a/code/datums/wounds/scars/_scars.dm +++ b/code/datums/wounds/scars/_scars.dm @@ -30,7 +30,7 @@ /// If false, we will only check to see if a limb has ALL our biostates, instead of just any. var/check_any_biostates -/datum/scar/Destroy(force, ...) +/datum/scar/Destroy(force) if(limb) LAZYREMOVE(limb.scars, src) if(victim) diff --git a/code/game/machinery/camera/trackable.dm b/code/game/machinery/camera/trackable.dm index 8aedd1b80a8..884f38f750b 100644 --- a/code/game/machinery/camera/trackable.dm +++ b/code/game/machinery/camera/trackable.dm @@ -26,7 +26,7 @@ tracking_holder = source RegisterSignal(tracking_holder, COMSIG_MOB_RESET_PERSPECTIVE, PROC_REF(cancel_target_tracking)) -/datum/trackable/Destroy(force, ...) +/datum/trackable/Destroy(force) tracking_holder = null tracked_mob = null STOP_PROCESSING(SSprocessing, src) diff --git a/code/game/machinery/computer/orders/order_items/order_datum.dm b/code/game/machinery/computer/orders/order_items/order_datum.dm index e7bb3c35e56..13684fc742b 100644 --- a/code/game/machinery/computer/orders/order_items/order_datum.dm +++ b/code/game/machinery/computer/orders/order_items/order_datum.dm @@ -22,7 +22,7 @@ if(!desc) desc = initial(item_path.desc) -/datum/orderable_item/Destroy(force, ...) +/datum/orderable_item/Destroy(force) if(item_path) qdel(item_path) return ..() diff --git a/code/modules/admin/verbs/highlander_datum.dm b/code/modules/admin/verbs/highlander_datum.dm index b32ac2d962d..ad8f75bca82 100644 --- a/code/modules/admin/verbs/highlander_datum.dm +++ b/code/modules/admin/verbs/highlander_datum.dm @@ -38,7 +38,7 @@ GLOBAL_DATUM(highlander_controller, /datum/highlander_controller) robot.make_scottish() addtimer(CALLBACK(SSshuttle.emergency, TYPE_PROC_REF(/obj/docking_port/mobile/emergency, request), null, 1), 50) -/datum/highlander_controller/Destroy(force, ...) +/datum/highlander_controller/Destroy(force) . = ..() UnregisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED) diff --git a/code/modules/admin/verbs/lua/lua_editor.dm b/code/modules/admin/verbs/lua/lua_editor.dm index ea052509779..03f6e07cac0 100644 --- a/code/modules/admin/verbs/lua/lua_editor.dm +++ b/code/modules/admin/verbs/lua/lua_editor.dm @@ -29,7 +29,7 @@ ui.set_autoupdate(FALSE) ui.open() -/datum/lua_editor/Destroy(force, ...) +/datum/lua_editor/Destroy(force) . = ..() if(current_state) LAZYREMOVEASSOC(SSlua.editors, text_ref(current_state), src) diff --git a/code/modules/admin/view_variables/color_matrix_editor.dm b/code/modules/admin/view_variables/color_matrix_editor.dm index 7fde4c24590..ea1278901f3 100644 --- a/code/modules/admin/view_variables/color_matrix_editor.dm +++ b/code/modules/admin/view_variables/color_matrix_editor.dm @@ -27,7 +27,7 @@ proxy_view.color = current_color proxy_view.display_to(owner.mob) -/datum/color_matrix_editor/Destroy(force, ...) +/datum/color_matrix_editor/Destroy(force) QDEL_NULL(proxy_view) return ..() diff --git a/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm b/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm index 872bd27d627..fa5fde1f20e 100644 --- a/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm +++ b/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm @@ -15,7 +15,7 @@ src.target = target testing_matrix = matrix(target.transform) -/datum/nobody_wants_to_learn_matrix_math/Destroy(force, ...) +/datum/nobody_wants_to_learn_matrix_math/Destroy(force) QDEL_NULL(testing_matrix) return ..() diff --git a/code/modules/antagonists/_common/antag_team.dm b/code/modules/antagonists/_common/antag_team.dm index 902456d909b..29f94b040ec 100644 --- a/code/modules/antagonists/_common/antag_team.dm +++ b/code/modules/antagonists/_common/antag_team.dm @@ -26,7 +26,7 @@ GLOBAL_LIST_EMPTY(antagonist_teams) else add_member(starting_members) -/datum/team/Destroy(force, ...) +/datum/team/Destroy(force) GLOB.antagonist_teams -= src members = null objectives = null diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm index 1cbf98585a3..2e747342412 100644 --- a/code/modules/antagonists/heretic/heretic_knowledge.dm +++ b/code/modules/antagonists/heretic/heretic_knowledge.dm @@ -226,7 +226,7 @@ /// A list of weakrefs to all items we've created. var/list/datum/weakref/created_items -/datum/heretic_knowledge/limited_amount/Destroy(force, ...) +/datum/heretic_knowledge/limited_amount/Destroy(force) LAZYCLEARLIST(created_items) return ..() diff --git a/code/modules/antagonists/heretic/influences.dm b/code/modules/antagonists/heretic/influences.dm index a5946101715..b5b7dcc58c4 100644 --- a/code/modules/antagonists/heretic/influences.dm +++ b/code/modules/antagonists/heretic/influences.dm @@ -21,7 +21,7 @@ /// List of minds with the ability to see influences var/list/datum/mind/tracked_heretics = list() -/datum/reality_smash_tracker/Destroy(force, ...) +/datum/reality_smash_tracker/Destroy(force) if(GLOB.reality_smash_track == src) stack_trace("[type] was deleted. Heretics may no longer access any influences. Fix it, or call coder support.") message_admins("The [type] was deleted. Heretics may no longer access any influences. Fix it, or call coder support.") diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm index 3bf980eb466..6817dc9de44 100644 --- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm @@ -345,7 +345,7 @@ rusted_turfs += centre START_PROCESSING(SSprocessing, src) -/datum/rust_spread/Destroy(force, ...) +/datum/rust_spread/Destroy(force) centre = null edge_turfs.Cut() rusted_turfs.Cut() diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm index e2887d73757..b66ec468e71 100644 --- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm +++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm @@ -27,7 +27,7 @@ /// An assoc list of [ref] to [timers] - a list of all the timers of people in the shadow realm currently var/list/return_timers -/datum/heretic_knowledge/hunt_and_sacrifice/Destroy(force, ...) +/datum/heretic_knowledge/hunt_and_sacrifice/Destroy(force) heretic_mind = null LAZYCLEARLIST(target_blacklist) return ..() diff --git a/code/modules/antagonists/separatist/separatist.dm b/code/modules/antagonists/separatist/separatist.dm index 6830cba8aef..932a3d577e1 100644 --- a/code/modules/antagonists/separatist/separatist.dm +++ b/code/modules/antagonists/separatist/separatist.dm @@ -14,7 +14,7 @@ src.potential_recruits = potential_recruits src.department = department -/datum/team/nation/Destroy(force, ...) +/datum/team/nation/Destroy(force) department = null UnregisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED) . = ..() diff --git a/code/modules/antagonists/traitor/traitor_objective.dm b/code/modules/antagonists/traitor/traitor_objective.dm index 6fa5c0d8dbf..d60820c3fce 100644 --- a/code/modules/antagonists/traitor/traitor_objective.dm +++ b/code/modules/antagonists/traitor/traitor_objective.dm @@ -134,7 +134,7 @@ maximum_progression ) -/datum/traitor_objective/Destroy(force, ...) +/datum/traitor_objective/Destroy(force) handler = null return ..() diff --git a/code/modules/antagonists/traitor/uplink_handler.dm b/code/modules/antagonists/traitor/uplink_handler.dm index 5d164d8d3d9..aa26b360a75 100644 --- a/code/modules/antagonists/traitor/uplink_handler.dm +++ b/code/modules/antagonists/traitor/uplink_handler.dm @@ -59,7 +59,7 @@ . = ..() maximum_potential_objectives = CONFIG_GET(number/maximum_potential_objectives) -/datum/uplink_handler/Destroy(force, ...) +/datum/uplink_handler/Destroy(force) can_replace_objectives = null replace_objectives = null return ..() diff --git a/code/modules/basketball/controller.dm b/code/modules/basketball/controller.dm index 53726c57389..53e89d182a3 100644 --- a/code/modules/basketball/controller.dm +++ b/code/modules/basketball/controller.dm @@ -49,7 +49,7 @@ GLOBAL_VAR(basketball_game) GLOB.basketball_game = src map_deleter = new -/datum/basketball_controller/Destroy(force, ...) +/datum/basketball_controller/Destroy(force) . = ..() GLOB.basketball_game = null end_game() diff --git a/code/modules/capture_the_flag/ctf_controller.dm b/code/modules/capture_the_flag/ctf_controller.dm index a38937db301..b5df4981c9f 100644 --- a/code/modules/capture_the_flag/ctf_controller.dm +++ b/code/modules/capture_the_flag/ctf_controller.dm @@ -29,7 +29,7 @@ src.game_id = game_id GLOB.ctf_games[game_id] = src -/datum/ctf_controller/Destroy(force, ...) +/datum/ctf_controller/Destroy(force) GLOB.ctf_games[game_id] = null return ..() @@ -207,7 +207,7 @@ team_span = spawner.team_span ///If the team is destroyed all players in that team need their componenet removed. -/datum/ctf_team/Destroy(force, ...) +/datum/ctf_team/Destroy(force) for(var/player in team_members) var/datum/component/ctf_player/ctf_player = team_members[player] ctf_player.end_game() diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm index 309567d51e9..3f8ceb5ca02 100644 --- a/code/modules/cargo/order.dm +++ b/code/modules/cargo/order.dm @@ -85,7 +85,7 @@ src.manifest_can_fail = manifest_can_fail src.can_be_cancelled = can_be_cancelled -/datum/supply_order/Destroy(force, ...) +/datum/supply_order/Destroy(force) QDEL_NULL(applied_coupon) return ..() @@ -208,7 +208,7 @@ /// Custom type of order who's supply pack can be safely deleted /datum/supply_order/disposable -/datum/supply_order/disposable/Destroy(force, ...) +/datum/supply_order/disposable/Destroy(force) QDEL_NULL(pack) return ..() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index df522cfd681..0a4fd60b80c 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) /// If set to TRUE, will update character_profiles on the next ui_data tick. var/tainted_character_profiles = FALSE -/datum/preferences/Destroy(force, ...) +/datum/preferences/Destroy(force) QDEL_NULL(character_preview_view) QDEL_LIST(middleware) value_cache = null diff --git a/code/modules/escape_menu/escape_menu.dm b/code/modules/escape_menu/escape_menu.dm index 00f280008a5..c05f4057583 100644 --- a/code/modules/escape_menu/escape_menu.dm +++ b/code/modules/escape_menu/escape_menu.dm @@ -50,7 +50,7 @@ GLOBAL_LIST_EMPTY(escape_menus) if (!isnull(ckey)) GLOB.escape_menus[ckey] = src -/datum/escape_menu/Destroy(force, ...) +/datum/escape_menu/Destroy(force) QDEL_NULL(base_holder) QDEL_NULL(page_holder) diff --git a/code/modules/explorer_drone/manager.dm b/code/modules/explorer_drone/manager.dm index 9ca85ca4a20..00909d03abf 100644 --- a/code/modules/explorer_drone/manager.dm +++ b/code/modules/explorer_drone/manager.dm @@ -79,7 +79,7 @@ /datum/adventure_browser/ui_assets(mob/user) return list(get_asset_datum(/datum/asset/simple/adventure)) -/datum/adventure_browser/Destroy(force, ...) +/datum/adventure_browser/Destroy(force) . = ..() QDEL_NULL(temp_adventure) diff --git a/code/modules/explorer_drone/scanner_array.dm b/code/modules/explorer_drone/scanner_array.dm index 2cfc6cbf814..05f1d9a8b8f 100644 --- a/code/modules/explorer_drone/scanner_array.dm +++ b/code/modules/explorer_drone/scanner_array.dm @@ -71,7 +71,7 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions()) SEND_SIGNAL(src,COMSIG_EXOSCAN_INTERRUPTED) qdel(src) -/datum/exoscan/Destroy(force, ...) +/datum/exoscan/Destroy(force) . = ..() deltimer(scan_timer) diff --git a/code/modules/fishing/fishing_minigame.dm b/code/modules/fishing/fishing_minigame.dm index 7744bcc01be..81e8b3a6943 100644 --- a/code/modules/fishing/fishing_minigame.dm +++ b/code/modules/fishing/fishing_minigame.dm @@ -199,7 +199,7 @@ bait_height -= difficulty bait_pixel_height = round(MINIGAME_BAIT_HEIGHT * (bait_height/initial(bait_height)), 1) -/datum/fishing_challenge/Destroy(force, ...) +/datum/fishing_challenge/Destroy(force) if(!completed) complete(win = FALSE) if(fishing_line) diff --git a/code/modules/forensics/_forensics.dm b/code/modules/forensics/_forensics.dm index 5936ce4b5c4..75cbc55df28 100644 --- a/code/modules/forensics/_forensics.dm +++ b/code/modules/forensics/_forensics.dm @@ -66,7 +66,7 @@ src.fibers = LAZY_LISTS_OR(src.fibers, fibers) check_blood() -/datum/forensics/Destroy(force, ...) +/datum/forensics/Destroy(force) var/atom/parent_atom = parent.resolve() if (!isnull(parent_atom)) UnregisterSignal(parent_atom, list(COMSIG_COMPONENT_CLEAN_ACT)) diff --git a/code/modules/interview/interview_manager.dm b/code/modules/interview/interview_manager.dm index 4832e51f341..b5d39961b58 100644 --- a/code/modules/interview/interview_manager.dm +++ b/code/modules/interview/interview_manager.dm @@ -18,7 +18,7 @@ GLOBAL_DATUM_INIT(interviews, /datum/interview_manager, new) /// Ckeys which are currently in the cooldown system, they will be unable to create new interviews var/list/cooldown_ckeys = list() -/datum/interview_manager/Destroy(force, ...) +/datum/interview_manager/Destroy(force) QDEL_LIST(open_interviews) QDEL_LIST(interview_queue) QDEL_LIST(closed_interviews) diff --git a/code/modules/mafia/abilities/abilities.dm b/code/modules/mafia/abilities/abilities.dm index 3c8e643a427..deba0f670ff 100644 --- a/code/modules/mafia/abilities/abilities.dm +++ b/code/modules/mafia/abilities/abilities.dm @@ -24,7 +24,7 @@ RegisterSignal(game, action_priority, PROC_REF(perform_action_target)) RegisterSignal(game, COMSIG_MAFIA_NIGHT_END, PROC_REF(clean_action_refs)) -/datum/mafia_ability/Destroy(force, ...) +/datum/mafia_ability/Destroy(force) host_role = null target_role = null return ..() diff --git a/code/modules/mafia/controller.dm b/code/modules/mafia/controller.dm index 007e0b5e456..f6b46c3430d 100644 --- a/code/modules/mafia/controller.dm +++ b/code/modules/mafia/controller.dm @@ -104,7 +104,7 @@ GLOBAL_LIST_INIT(mafia_role_by_alignment, setup_mafia_role_by_alignment()) GLOB.mafia_game = src map_deleter = new -/datum/mafia_controller/Destroy(force, ...) +/datum/mafia_controller/Destroy(force) . = ..() end_game() player_role_lookup.Cut() diff --git a/code/modules/mafia/roles/roles.dm b/code/modules/mafia/roles/roles.dm index f301a8ac02a..ab1a1cc0e45 100644 --- a/code/modules/mafia/roles/roles.dm +++ b/code/modules/mafia/roles/roles.dm @@ -57,7 +57,7 @@ role_unique_actions += new abilities(game, src) role_unique_actions -= abilities -/datum/mafia_role/Destroy(force, ...) +/datum/mafia_role/Destroy(force) UnregisterSignal(body, COMSIG_MOB_SAY) QDEL_NULL(mafia_alert) QDEL_NULL(mafia_panel) diff --git a/code/modules/mapping/verify.dm b/code/modules/mapping/verify.dm index 60067bc5db7..c9347c7ecdb 100644 --- a/code/modules/mapping/verify.dm +++ b/code/modules/mapping/verify.dm @@ -16,7 +16,7 @@ GLOBAL_LIST_EMPTY(map_reports) original_path = map.original_path || "Untitled" GLOB.map_reports += src -/datum/map_report/Destroy(force, ...) +/datum/map_report/Destroy(force) GLOB.map_reports -= src return ..() diff --git a/code/modules/mining/equipment/monster_organs/monster_organ.dm b/code/modules/mining/equipment/monster_organs/monster_organ.dm index 699564c9ed7..61d795c764a 100644 --- a/code/modules/mining/equipment/monster_organs/monster_organ.dm +++ b/code/modules/mining/equipment/monster_organs/monster_organ.dm @@ -65,7 +65,7 @@ . = ..() decay_timer = addtimer(CALLBACK(src, PROC_REF(go_inert)), time_to_decay, TIMER_STOPPABLE) -/obj/item/organ/internal/monster_core/Destroy(force, silent) +/obj/item/organ/internal/monster_core/Destroy(force) deltimer(decay_timer) return ..() diff --git a/code/modules/procedural_mapping/mapGenerator.dm b/code/modules/procedural_mapping/mapGenerator.dm index 8408e1d97b7..420ac9c8d79 100644 --- a/code/modules/procedural_mapping/mapGenerator.dm +++ b/code/modules/procedural_mapping/mapGenerator.dm @@ -16,7 +16,7 @@ buildmode_name = copytext_char("[type]", 20) // / d a t u m / m a p g e n e r a t o r / = 20 characters. initialiseModules() -/datum/map_generator/Destroy(force, ...) +/datum/map_generator/Destroy(force) . = ..() QDEL_LIST(modules) diff --git a/code/modules/procedural_mapping/mapGeneratorModule.dm b/code/modules/procedural_mapping/mapGeneratorModule.dm index aa3f0f0e93c..7bf32d15195 100644 --- a/code/modules/procedural_mapping/mapGeneratorModule.dm +++ b/code/modules/procedural_mapping/mapGeneratorModule.dm @@ -8,7 +8,7 @@ var/clusterCheckFlags = CLUSTER_CHECK_SAME_ATOMS var/allowAtomsOnSpace = FALSE -/datum/map_generator_module/Destroy(force, ...) +/datum/map_generator_module/Destroy(force) mother = null return ..() diff --git a/code/modules/requests/request_manager.dm b/code/modules/requests/request_manager.dm index 41e46aa53c2..dd6d8d42a48 100644 --- a/code/modules/requests/request_manager.dm +++ b/code/modules/requests/request_manager.dm @@ -25,7 +25,7 @@ GLOBAL_DATUM_INIT(requests, /datum/request_manager, new) /// List where requests can be accessed by ID var/list/requests_by_id = list() -/datum/request_manager/Destroy(force, ...) +/datum/request_manager/Destroy(force) QDEL_LIST(requests) return ..() diff --git a/code/modules/spells/spell_types/right_and_wrong.dm b/code/modules/spells/spell_types/right_and_wrong.dm index 6168e94af55..27662943af0 100644 --- a/code/modules/spells/spell_types/right_and_wrong.dm +++ b/code/modules/spells/spell_types/right_and_wrong.dm @@ -265,7 +265,7 @@ GLOBAL_LIST_INIT(summoned_magic_objectives, list( /datum/summon_things_controller/New() RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(on_latejoin)) -/datum/summon_things_controller/Destroy(force, ...) +/datum/summon_things_controller/Destroy(force) . = ..() UnregisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED) diff --git a/code/modules/spells/spell_types/tower_of_babel.dm b/code/modules/spells/spell_types/tower_of_babel.dm index 3c652579b7f..618711a8d95 100644 --- a/code/modules/spells/spell_types/tower_of_babel.dm +++ b/code/modules/spells/spell_types/tower_of_babel.dm @@ -29,7 +29,7 @@ GLOBAL_DATUM(tower_of_babel, /datum/tower_of_babel) curse_of_babel(target) -/datum/tower_of_babel/Destroy(force, ...) +/datum/tower_of_babel/Destroy(force) . = ..() UnregisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED) diff --git a/code/modules/tgui_input/alert.dm b/code/modules/tgui_input/alert.dm index 0ea9c45d310..4749ef27872 100644 --- a/code/modules/tgui_input/alert.dm +++ b/code/modules/tgui_input/alert.dm @@ -77,7 +77,7 @@ start_time = world.time QDEL_IN(src, timeout) -/datum/tgui_alert/Destroy(force, ...) +/datum/tgui_alert/Destroy(force) SStgui.close_uis(src) state = null QDEL_NULL(buttons) diff --git a/code/modules/tgui_input/checkboxes.dm b/code/modules/tgui_input/checkboxes.dm index 9204e67ba36..53b264038dc 100644 --- a/code/modules/tgui_input/checkboxes.dm +++ b/code/modules/tgui_input/checkboxes.dm @@ -70,7 +70,7 @@ start_time = world.time QDEL_IN(src, timeout) -/datum/tgui_checkbox_input/Destroy(force, ...) +/datum/tgui_checkbox_input/Destroy(force) SStgui.close_uis(src) state = null QDEL_NULL(items) diff --git a/code/modules/tgui_input/list.dm b/code/modules/tgui_input/list.dm index 18525e6b10a..174f16fc7b5 100644 --- a/code/modules/tgui_input/list.dm +++ b/code/modules/tgui_input/list.dm @@ -94,7 +94,7 @@ start_time = world.time QDEL_IN(src, timeout) -/datum/tgui_list_input/Destroy(force, ...) +/datum/tgui_list_input/Destroy(force) SStgui.close_uis(src) state = null QDEL_NULL(items) diff --git a/code/modules/tgui_input/number.dm b/code/modules/tgui_input/number.dm index e0a3f1951e5..68998acb033 100644 --- a/code/modules/tgui_input/number.dm +++ b/code/modules/tgui_input/number.dm @@ -92,7 +92,7 @@ if(default > max_value) CRASH("Default value is greater than max value.") -/datum/tgui_input_number/Destroy(force, ...) +/datum/tgui_input_number/Destroy(force) SStgui.close_uis(src) state = null return ..() diff --git a/code/modules/tgui_input/text.dm b/code/modules/tgui_input/text.dm index f78ededab5d..f97e0326d58 100644 --- a/code/modules/tgui_input/text.dm +++ b/code/modules/tgui_input/text.dm @@ -90,7 +90,7 @@ start_time = world.time QDEL_IN(src, timeout) -/datum/tgui_input_text/Destroy(force, ...) +/datum/tgui_input_text/Destroy(force) SStgui.close_uis(src) state = null return ..() diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm index 49539920920..757fe67d81e 100644 --- a/code/modules/tooltip/tooltip.dm +++ b/code/modules/tooltip/tooltip.dm @@ -100,7 +100,7 @@ Notes: /datum/tooltip/proc/do_hide() winshow(owner, control, FALSE) -/datum/tooltip/Destroy(force, ...) +/datum/tooltip/Destroy(force) last_target = null return ..() diff --git a/code/modules/tutorials/_tutorial.dm b/code/modules/tutorials/_tutorial.dm index 3baa9ad148b..7819a9e2b85 100644 --- a/code/modules/tutorials/_tutorial.dm +++ b/code/modules/tutorials/_tutorial.dm @@ -16,7 +16,7 @@ RegisterSignal(user, COMSIG_QDELETING, PROC_REF(destroy_self)) RegisterSignal(user.client, COMSIG_QDELETING, PROC_REF(destroy_self)) -/datum/tutorial/Destroy(force, ...) +/datum/tutorial/Destroy(force) user.client?.screen -= instruction_screen QDEL_NULL(instruction_screen) @@ -163,7 +163,7 @@ ASSERT(ispath(tutorial_type, /datum/tutorial)) src.tutorial_type = tutorial_type -/datum/tutorial_manager/Destroy(force, ...) +/datum/tutorial_manager/Destroy(force) if (!force) stack_trace("Something is trying to destroy [type], which is a singleton") return QDEL_HINT_LETMELIVE diff --git a/code/modules/tutorials/tutorials/drop.dm b/code/modules/tutorials/tutorials/drop.dm index de692edab43..06980b28848 100644 --- a/code/modules/tutorials/tutorials/drop.dm +++ b/code/modules/tutorials/tutorials/drop.dm @@ -12,7 +12,7 @@ var/atom/movable/screen/drop_preview var/obj/last_held_item -/datum/tutorial/drop/Destroy(force, ...) +/datum/tutorial/drop/Destroy(force) last_held_item = null user.client?.screen -= drop_preview QDEL_NULL(drop_preview) diff --git a/code/modules/tutorials/tutorials/switch_hands.dm b/code/modules/tutorials/tutorials/switch_hands.dm index bf27a9e9d83..f1bcbbb3b71 100644 --- a/code/modules/tutorials/tutorials/switch_hands.dm +++ b/code/modules/tutorials/tutorials/switch_hands.dm @@ -19,7 +19,7 @@ hand_to_watch = (user.active_hand_index % user.held_items.len) + 1 -/datum/tutorial/switch_hands/Destroy(force, ...) +/datum/tutorial/switch_hands/Destroy(force) user.client?.screen -= hand_preview QDEL_NULL(hand_preview)