From ac2aba50a632361b8cb0e99087d92bfa2694dc21 Mon Sep 17 00:00:00 2001
From: Thalpy <48600475+ThalpySci@users.noreply.github.com>
Date: Sun, 13 Oct 2019 22:33:46 +0100
Subject: [PATCH] Turns Jacq into her own event

---
 code/modules/events/holiday/halloween.dm   |  3 ---
 code/modules/holiday/halloween/jacqueen.dm | 19 +++++++++++++++++++
 code/modules/holiday/holidays.dm           | 10 ++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm
index da6b63849f..66495d833d 100644
--- a/code/modules/events/holiday/halloween.dm
+++ b/code/modules/events/holiday/halloween.dm
@@ -19,9 +19,6 @@
 		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/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm
index fed36a23e9..689c3dc2b8 100644
--- a/code/modules/holiday/halloween/jacqueen.dm
+++ b/code/modules/holiday/halloween/jacqueen.dm
@@ -7,6 +7,25 @@
 #define JACQ_EXPELL (1<<5)
 #define JACQ_DATE (1<<6)
 
+/////// EVENT
+/datum/round_event_control/jacqueen
+	name = "Jacqueline's visit"
+	holidayID = "jacqueen"
+	typepath = /datum/round_event/jacqueen
+	weight = -1							//forces it to be called, regardless of weight
+	max_occurrences = 1
+	earliest_start = 0 MINUTES
+
+/datum/round_event/jacqueen/start()
+	..()
+
+	for(var/mob/living/carbon/human/H in GLOB.carbon_list)
+		playsound(H, 'sound/spookoween/ahaha.ogg', 100, 0.25)
+
+	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)
+
 /////// MOBS
 
 //Whacha doing in here like? Yae wan tae ruin ta magicks?
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index 16b6f3126f..57a1f88703 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -333,6 +333,16 @@
 /datum/holiday/halloween/getStationPrefix()
 	return pick("Bone-Rattling","Mr. Bones' Own","2SPOOKY","Spooky","Scary","Skeletons")
 
+/datum/holiday/jacqueen //Subset of halloween
+	name = "jacqueen"
+	begin_day = 27
+	begin_month = OCTOBER
+	end_day = 2
+	end_month = NOVEMBER
+
+/datum/holiday/jacqueen/greet()
+	return "Jacqueline the great Pumpqueen has come to visit!"
+
 /datum/holiday/vegan
 	name = "Vegan Day"
 	begin_day = 1