From ecfc9889119e4ebaefb6ea6e9530299b12942ff4 Mon Sep 17 00:00:00 2001
From: Fermi <>
Date: Sat, 12 Oct 2019 09:15:32 +0100
Subject: [PATCH] Okay!

---
 code/modules/events/holiday/halloween.dm      | 4 ++++
 code/modules/holiday/halloween/bartholomew.dm | 8 --------
 code/modules/holiday/halloween/jacqueen.dm    | 1 +
 code/modules/holiday/holidays.dm              | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm
index 9b72020047..da6b63849f 100644
--- a/code/modules/events/holiday/halloween.dm
+++ b/code/modules/events/holiday/halloween.dm
@@ -19,6 +19,10 @@
 		new /mob/living/simple_animal/parrot/Poly/ghost(Poly.loc)
 		qdel(Poly)
 
+	for(var/obj/effect/landmark/barthpot/bp in GLOB.landmarks_list)
+		new /obj/item/barthpot(bp.loc)
+		new /mob/living/simple_animal/jacq(bp.loc)
+
 /datum/round_event/spooky/announce(fake)
 	priority_announce(pick("RATTLE ME BONES!","THE RIDE NEVER ENDS!", "A SKELETON POPS OUT!", "SPOOKY SCARY SKELETONS!", "CREWMEMBERS BEWARE, YOU'RE IN FOR A SCARE!") , "THE CALL IS COMING FROM INSIDE THE HOUSE")
 
diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm
index c36fb41e3c..fc5e10bcd8 100644
--- a/code/modules/holiday/halloween/bartholomew.dm
+++ b/code/modules/holiday/halloween/bartholomew.dm
@@ -1,13 +1,5 @@
 /obj/effect/landmark/barthpot
     name = "barthpot"
-    var/created = FALSE
-
-/obj/effect/landmark/barthpot/Initialize()
-    if(!created) //I dunno why they spawn twice but, this is to prevent that.
-        new /obj/item/barthpot(loc)
-        new /mob/living/simple_animal/jacq(loc)
-        created = TRUE
-    ..()
 
 /obj/item/barthpot
     name = "Bartholomew"
diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm
index 1ec3530492..b86ad12b67 100644
--- a/code/modules/holiday/halloween/jacqueen.dm
+++ b/code/modules/holiday/halloween/jacqueen.dm
@@ -400,6 +400,7 @@
 	name = "Magic candy"
 	icon = 'icons/obj/halloween_items.dmi'
 	icon_state = "jacq_candy"
+	desc = "A candy with strange magic within. Be careful, as the magic isn't always helpful."
 
 /obj/item/reagent_containers/food/snacks/special_candy/Initialize()
 	.=..()
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index 7d1e25235d..16b6f3126f 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -322,7 +322,7 @@
 
 /datum/holiday/halloween
 	name = HALLOWEEN
-	begin_day = 28
+	begin_day = 27
 	begin_month = OCTOBER
 	end_day = 2
 	end_month = NOVEMBER