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.
This commit is contained in:
Bloop
2023-12-29 21:54:07 -05:00
committed by GitHub
parent c2ddf15ef5
commit f34174414d
60 changed files with 63 additions and 63 deletions

View File

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

View File

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

View File

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

View File

@@ -394,7 +394,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)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -39,7 +39,7 @@
GLOB.directory[ckey] = src
#endif
/datum/client_interface/Destroy(force, ...)
/datum/client_interface/Destroy(force)
GLOB.directory -= ckey
return ..()

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -134,7 +134,7 @@
maximum_progression
)
/datum/traitor_objective/Destroy(force, ...)
/datum/traitor_objective/Destroy(force)
handler = null
return ..()

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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