Merge branch 'master' into upstream-merge-32161

code/datums/datum.dm

@@ -13,7 +13,7 @@
 // Default implementation of clean-up code.
 // This should be overridden to remove all references pointing to the object being destroyed.
 // Return the appropriate QDEL_HINT; in most cases this is QDEL_HINT_QUEUE.
-/datum/proc/Destroy(force=FALSE)
+/datum/proc/Destroy(force=FALSE, ...)
 	tag = null
 	var/list/timers = active_timers
 	active_timers = null
@@ -25,14 +25,12 @@
 	var/list/dc = datum_components
 	if(dc)
 		var/all_components = dc[/datum/component]
-		if(islist(all_components))
+		if(length(all_components))
 			for(var/I in all_components)
 				var/datum/component/C = I
-				C._RemoveNoSignal()
-				qdel(C)
+				qdel(C, FALSE, TRUE)
 		else
 			var/datum/component/C = all_components
-			C._RemoveNoSignal()
-			qdel(C)
+			qdel(C, FALSE, TRUE)
 		dc.Cut()
 	return QDEL_HINT_QUEUE