From a76ff4efe64c82058384911e7e4950baa1659cab Mon Sep 17 00:00:00 2001
From: Thalpy <48600475+ThalpySci@users.noreply.github.com>
Date: Sun, 27 Oct 2019 19:24:23 +0000
Subject: [PATCH] Alright

---
 code/modules/holiday/halloween/bartholomew.dm | 31 +++++++++----------
 code/modules/holiday/halloween/jacqueen.dm    |  4 +--
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm
index 09b775139d..a9532091fd 100644
--- a/code/modules/holiday/halloween/bartholomew.dm
+++ b/code/modules/holiday/halloween/bartholomew.dm
@@ -75,21 +75,20 @@
 	/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/mask/gas = 10,
 	/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/clothing/suit/hooded/flashsuit = 1,
 	/obj/item/assembly/prox_sensor = 4,
 	/obj/item/assembly/timer = 3,
-	/obj/item/flashlight = 4,
+	/obj/item/flashlight = 6,
 	/obj/item/flashlight/pen = 1,
 	/obj/item/flashlight/glowstick = 4,
 	/obj/item/multitool = 2,
 	/obj/item/radio = 2,
 	/obj/item/t_scanner = 5,
 	/obj/item/airlock_painter = 1,
-	/obj/item/stack/cable_coil/ = 4,
+	/obj/item/stack/cable_coil = 6,
 	/obj/item/stack/medical/bruise_pack = 1,
 	/obj/item/stack/rods = 3,
 	/obj/item/stack/sheet/cardboard = 2,
@@ -100,17 +99,17 @@
     /obj/item/coin = 1,
 	/obj/item/coin/silver = 1,
 	/obj/item/coin/twoheaded = 1,
-	/obj/item/crowbar = 1,
+	/obj/item/crowbar = 3,
 	/obj/item/crowbar/red = 1,
 	/obj/item/extinguisher = 3,
 	/obj/item/hand_labeler = 1,
-	/obj/item/paper = 1,
+	/obj/item/paper = 4,
 	/obj/item/pen = 3,
 	/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 = 4,
 	/obj/item/storage/box/cups = 1,
 	/obj/item/storage/box/donkpockets = 1,
 	/obj/item/storage/box/lights/mixed = 3,
@@ -121,27 +120,27 @@
 	/obj/item/tank/internals/emergency_oxygen = 2,
 	/obj/item/vending_refill/cola = 1,
 	/obj/item/weldingtool = 3,
-	/obj/item/wirecutters = 1,
+	/obj/item/wirecutters = 2,
 	/obj/item/wrench = 4,
 	/obj/item/relic = 3,
-	/obj/item/weaponcrafting/receiver = 2,
+	/obj/item/weaponcrafting/receiver = 1,
 	/obj/item/clothing/head/cone = 2,
-	/obj/item/grenade/smokebomb = 2,
+	/obj/item/grenade/smokebomb = 1,
 	/obj/item/geiger_counter = 3,
-	/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1,
+	/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 5,
 	/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/assembly/mousetrap = 5,
+	/obj/item/reagent_containers/syringe = 5,
 	/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 = 1,
+	/obj/item/reagent_containers/pill = 2,
 	/obj/item/reagent_containers/food/snacks/cannedpeaches/maint = 1,
-	/obj/item/clothing/shoes = 2)
+	/obj/item/clothing/shoes = 8)
     if(length >= 5)
         return TRUE
     //var/metalist = pickweight(GLOB.maintenance_loot)
diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm
index 1d9f93c034..d3879949bc 100644
--- a/code/modules/holiday/halloween/jacqueen.dm
+++ b/code/modules/holiday/halloween/jacqueen.dm
@@ -50,7 +50,7 @@
 
 /mob/living/simple_animal/jacq/Initialize()
 	..()
-	cached_z
+	cached_z = z
 	poof()
 
 /mob/living/simple_animal/jacq/Life()
@@ -107,7 +107,7 @@
 	for(var/obj/machinery/holopad/hp in world)
 		hp_list += hp
 
-	for(var/i = length, i <= 5, i+=1)
+	for(var/i = 0, i <= 5, i+=1)
 		var/obj/machinery/holopad/hp = pick(hp_list)
 		if(forceMove(pick(hp.loc)))
 			if(z == cached_z)