mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-26 17:11:52 +00:00
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:
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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 ..()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 ..()
|
||||
|
||||
|
||||
@@ -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 ..()
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
GLOB.directory[ckey] = src
|
||||
#endif
|
||||
|
||||
/datum/client_interface/Destroy(force, ...)
|
||||
/datum/client_interface/Destroy(force)
|
||||
GLOB.directory -= ckey
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -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 ..()
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user