From 8f9622cbe2d9e7a433c5220e99e0932b0623c9f5 Mon Sep 17 00:00:00 2001
From: Fermi <>
Date: Wed, 9 Oct 2019 18:01:09 +0100
Subject: [PATCH] Well lets try it

---
 code/modules/holiday/halloween/bartholomew.dm | 5 +++--
 code/modules/holiday/halloween/jacqueen.dm    | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm
index 2bb7c41693..3cac9a57fe 100644
--- a/code/modules/holiday/halloween/bartholomew.dm
+++ b/code/modules/holiday/halloween/bartholomew.dm
@@ -55,8 +55,9 @@
     var/length = LAZYLEN(items_list)
     if(length == 5)
         return TRUE
-    var/metalist = GLOB.maintenance_loot
+    //var/metalist = pickweight(GLOB.maintenance_loot)
     for(var/i = length, i <= 5, i+=1)
-        var/obj/item = pick(metalist)
+        var/obj/item = pickweight(GLOB.maintenance_loot)
+        message_admins("[item]")
         items_list += item
     return TRUE
diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm
index 25fd521503..2b09573826 100644
--- a/code/modules/holiday/halloween/jacqueen.dm
+++ b/code/modules/holiday/halloween/jacqueen.dm
@@ -78,9 +78,9 @@
 		sleep(20)
 		visible_message("<span class='spooky'><b>[src] continues,</b> says, \"Ah'm sure yae well stunned, but ah've got nae taem fer that. Ah'm after the candies around this station. If yae get mae enoof o the wee buggers, Ah'll give ye a treat, or if yae feeling bold, Ah ken trick ye instead.</span>\" giving [C] a wide grin.")
 		if(!progression["[C.real_name]"])
-			progression["[C.real_name]"] += JACQ_HELLO //TO MAKE SURE THAT THE LIST ENTRY EXISTS.
-		else
-			progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_HELLO
+			progression["[C.real_name]"] = NONE //TO MAKE SURE THAT THE LIST ENTRY EXISTS.
+
+		progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_HELLO
 
 	var/choices = list("Trick", "Treat", "How do I get candies?")
 	var/choice = input(C, "Trick or Treat?", "Trick or Treat?") in choices
@@ -141,7 +141,7 @@
 			var/choices = list()
 			//Figure out where the C is in the story
 			if(!progression["[C.real_name]"]) //I really don't want to get here withoot a hello, but just to be safe
-				progression["[C.real_name]"] += JACQ_HELLO
+				progression["[C.real_name]"] = NONE
 			if(!progression["[C.real_name]"] & JACQ_FAR)
 				if(progression["[C.real_name]"] & JACQ_CANDIES)
 					choices += "You really came all this way for candy?"