Merge pull request #2117 from Citadel-Station-13/upstream-merge-29324

[MIRROR] DCS Continued
2017-08-01 23:55:14 -05:00
parent b3eaf226ac 29f8f8eb45
commit 0392f761d0
4 changed files with 190 additions and 28 deletions
@@ -247,7 +247,13 @@ SUBSYSTEM_DEF(garbage)
 		if (timer.spent)
 			continue
 		qdel(timer)
-	QDEL_LIST(datum_components)
+	var/list/dc = datum_components
+	for(var/I in dc)
+		var/datum/component/C = I
+		C._RemoveNoSignal()
+		qdel(C)
+	if(dc)
+		dc.Cut()
 	return QDEL_HINT_QUEUE

 /datum/var/gc_destroyed //Time when this object was destroyed.