diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm
index dbc0a53d07..2f446550f1 100644
--- a/code/modules/holiday/halloween/bartholomew.dm
+++ b/code/modules/holiday/halloween/bartholomew.dm
@@ -25,7 +25,7 @@
 
 /obj/item/barthpot/attackby(obj/item/I, mob/user, params)
     for(var/I2 in items_list)
-        if(I.type == I2)
+        if(istype(I, I2))
             qdel(I)
             new /obj/item/reagent_containers/food/snacks/special_candy(loc)
             to_chat(user, "<span class='notice'>You add the [I.name] to the pot and watch as it melts into the mixture, a candy crystalising in it's wake.</span>")
@@ -45,26 +45,103 @@
     if(LAZYLEN(items_list) < 5)
         generate_items()
     for(var/I2 in items_list)
+        if(!I2)
+            items_list -= I2
+            continue
         var/obj/item/I3 = new I2
         message += "a [I3.name], "
     message += "currently seem to have the most magic potential."
+    sleep(15)
     say("[message]")
 
 /obj/item/barthpot/proc/generate_items()
     var/length = LAZYLEN(items_list)
-    var/no_list = list(/obj/effect/spawner/lootdrop/glowstick,
-    /obj/effect/spawner/lootdrop/mre,
-    /obj/item/stack/cable_coil/random,
-    /obj/item/stack/cable_coil/random/five,
-    /obj/item/stack/rods/ten,
-    /obj/item/stack/rods/twentyfive,
-    /obj/item/stack/rods/fifty,
-    /obj/item/stack/sheet/metal/twenty)
+    var/rand_items = list(/obj/item/bodybag = 1,
+	/obj/item/clothing/glasses/meson = 2,
+	/obj/item/clothing/glasses/sunglasses = 1,
+	/obj/item/clothing/gloves/color/fyellow = 1,
+	/obj/item/clothing/head/hardhat = 1,
+	/obj/item/clothing/head/hardhat/red = 1,
+	/obj/item/clothing/head/that = 1,
+	/obj/item/clothing/head/ushanka = 1,
+	/obj/item/clothing/head/welding = 1,
+	/obj/item/clothing/mask/gas = 15,
+	/obj/item/clothing/suit/hazardvest = 1,
+	/obj/item/clothing/under/rank/vice = 1,
+	/obj/item/clothing/suit/hooded/flashsuit = 2,
+	/obj/item/clothing/accessory/medal/greytide	=	1,
+	/obj/item/assembly/prox_sensor = 4,
+	/obj/item/assembly/timer = 3,
+	/obj/item/flashlight = 4,
+	/obj/item/flashlight/pen = 1,
+	/obj/effect/spawner/lootdrop/glowstick = 4,
+	/obj/effect/spawner/lootdrop/mre = 3,
+	/obj/item/multitool = 2,
+	/obj/item/radio/off = 2,
+	/obj/item/t_scanner = 5,
+	/obj/item/airlock_painter = 1,
+	/obj/item/stack/cable_coil/ = 4,
+	/obj/item/stack/medical/bruise_pack = 1,
+	/obj/item/stack/rods = 3,
+	/obj/item/stack/sheet/cardboard = 2,
+	/obj/item/stack/sheet/metal = 1,
+	/obj/item/stack/sheet/mineral/plasma = 1,
+	/obj/item/stack/sheet/rglass = 1,
+	/obj/item/book/manual/wiki/engineering_construction = 1,
+	/obj/item/book/manual/wiki/engineering_hacking = 1,
+	/obj/item/clothing/head/cone = 1,
+	/obj/item/coin/silver = 1,
+	/obj/item/coin/twoheaded = 1,
+	/obj/item/poster/random_contraband = 1,
+	/obj/item/poster/random_official = 1,
+	/obj/item/crowbar = 1,
+	/obj/item/crowbar/red = 1,
+	/obj/item/extinguisher = 11,
+	/obj/item/hand_labeler = 1,
+	/obj/item/paper/crumpled = 1,
+	/obj/item/pen = 1,
+	/obj/item/reagent_containers/spray/pestspray = 1,
+	/obj/item/reagent_containers/rag = 3,
+	/obj/item/stock_parts/cell = 3,
+	/obj/item/storage/belt/utility = 2,
+	/obj/item/storage/box = 2,
+	/obj/item/storage/box/cups = 1,
+	/obj/item/storage/box/donkpockets = 1,
+	/obj/item/storage/box/lights/mixed = 3,
+	/obj/item/storage/box/hug/medical = 1,
+	/obj/item/storage/fancy/cigarettes/dromedaryco = 1,
+	/obj/item/storage/toolbox/mechanical = 1,
+	/obj/item/screwdriver = 3,
+	/obj/item/tank/internals/emergency_oxygen = 2,
+	/obj/item/vending_refill/cola = 1,
+	/obj/item/weldingtool = 3,
+	/obj/item/wirecutters = 1,
+	/obj/item/wrench = 4,
+	/obj/item/relic = 3,
+	/obj/item/weaponcrafting/receiver = 2,
+	/obj/item/clothing/head/cone = 2,
+	/obj/item/grenade/smokebomb = 2,
+	/obj/item/geiger_counter = 3,
+	/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1,
+	/obj/item/radio/headset = 1,
+	/obj/item/assembly/infra = 1,
+	/obj/item/assembly/igniter = 2,
+	/obj/item/assembly/signaler = 2,
+	/obj/item/assembly/mousetrap = 2,
+	/obj/item/reagent_containers/syringe = 2,
+	/obj/item/clothing/gloves = 8,
+	/obj/item/clothing/shoes/laceup = 1,
+	/obj/item/storage/secure/briefcase = 3,
+	/obj/item/storage/toolbox/artistic = 2,
+	/obj/item/toy/eightball = 1,
+	/obj/item/reagent_containers/pill/floorpill = 1,
+	/obj/item/reagent_containers/food/snacks/cannedpeaches/maint = 2,
+	/obj/item/clothing/shoes = 2)
     if(length == 5)
         return TRUE
     //var/metalist = pickweight(GLOB.maintenance_loot)
     for(var/i = length, i <= 5, i+=1)
-        var/obj/item = pickweight(GLOB.maintenance_loot)
+        var/obj/item = pickweight(rand_items)
         if(item in no_list)
             i-=1
             continue