diff --git a/code/modules/garbage_collection/garbage_collector.dm b/code/modules/garbage_collection/garbage_collector.dm index 537244646ef..29db9198ae4 100644 --- a/code/modules/garbage_collection/garbage_collector.dm +++ b/code/modules/garbage_collection/garbage_collector.dm @@ -92,12 +92,13 @@ var/global/datum/controller/process/garbage_collector/garbageCollector if(isnull(D)) return - if(isnull(garbageCollector)) + if(!istype(D)) // A non-datum was passed into qdel - just delete it outright. + // warning("qdel() passed object of type [D.type]. qdel() can only handle /datum/ types.") del(D) return - if(!istype(D)) // A non-datum was passed into qdel - just delete it outright. - // warning("qdel() passed object of type [D.type]. qdel() can only handle /datum/ types.") + if(isnull(garbageCollector)) + D.Destroy() del(D) return