Oh, that kind of list

code/game/objects/items/devices/PDA/cart.dm

@@ -463,7 +463,7 @@
 		else
 			JaniData["user_loc"] = list("x" = 0, "y" = 0)
 		var/MopData[0]
-		for(var/obj/item/weapon/mop/M in world)
+		for(var/obj/item/weapon/mop/M in janitorial_equipment)
 			var/turf/ml = get_turf(M)
 			if(ml)
 				if(ml.z != cl.z)
@@ -476,7 +476,7 @@
 
 
 		var/BucketData[0]
-		for(var/obj/structure/mopbucket/B in world)
+		for(var/obj/structure/mopbucket/B in janitorial_equipment)
 			var/turf/bl = get_turf(B)
 			if(bl)
 				if(bl.z != cl.z)
@@ -488,7 +488,7 @@
 			BucketData[++BucketData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
 
 		var/CbotData[0]
-		for(var/obj/machinery/bot/cleanbot/B in world)
+		for(var/obj/machinery/bot/cleanbot/B in aibots)
 			var/turf/bl = get_turf(B)
 			if(bl)
 				if(bl.z != cl.z)
@@ -500,7 +500,7 @@
 		if(!CbotData.len)
 			CbotData[++CbotData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
 		var/CartData[0]
-		for(var/obj/structure/janitorialcart/B in janitorialcarts)
+		for(var/obj/structure/janitorialcart/B in janitorial_equipment)
 			var/turf/bl = get_turf(B)
 			if(bl)
 				if(bl.z != cl.z)

code/game/objects/items/weapons/mop.dm

@@ -19,7 +19,11 @@
 
 /obj/item/weapon/mop/New()
 	create_reagents(mopcap)
+	janitorial_equipment += src
 
+/obj/item/weapon/mop/Destroy()
+	janitorial_equipment -= src
+	return..()
 
 /obj/item/weapon/mop/proc/clean(turf/simulated/A)
 	if(reagents.has_reagent("water", 1) || reagents.has_reagent("cleaner", 1) || reagents.has_reagent("holywater", 1))

code/game/objects/structures/janicart.dm

@@ -232,11 +232,11 @@
 
 /obj/structure/janitorialcart/New()
 	create_reagents(100)
-	janitorialcarts += src
+	janitorial_equipment += src
 
 
 /obj/structure/janitorialcart/Destroy()
-	janitorialcarts -= src
+	janitorial_equipment -= src
 	return ..()
 
 /obj/structure/janitorialcart/proc/wet_mop(obj/item/weapon/mop, mob/user)

code/game/objects/structures/mop_bucket.dm

@@ -11,11 +11,16 @@
 	var/datum/reagents/R = new/datum/reagents(100)
 	reagents = R
 	R.my_atom = src
+	janitorial_equipment += src
 
 /obj/structure/mopbucket/full/New()
 	..()
 	reagents.add_reagent("water", 100)
 
+/obj/structure/mopbucket/Destroy()
+	janitorial_equipment -= src
+	return ..()
+
 /obj/structure/mopbucket/examine(mob/user)
 	if(..(user, 1))
 		usr << text("\icon[] [] contains [] units of water left!", src, src.name, src.reagents.total_volume)