From 356a1279f177e8b4ee2a82ccbc089aa503e2518d Mon Sep 17 00:00:00 2001
From: Thalpy <48600475+ThalpySci@users.noreply.github.com>
Date: Sun, 13 Oct 2019 20:06:40 +0100
Subject: [PATCH] Adds vars for the ball.

---
 code/modules/holiday/halloween/bartholomew.dm | 4 ++++
 code/modules/holiday/halloween/jacqueen.dm    | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm
index fc5e10bcd8..e403ce4c91 100644
--- a/code/modules/holiday/halloween/bartholomew.dm
+++ b/code/modules/holiday/halloween/bartholomew.dm
@@ -8,6 +8,7 @@
     anchored = TRUE
     var/items_list = list()
     speech_span = "spooky"
+    var/active = TRUE
 
 /obj/item/barthpot/Destroy()
     var/obj/item/barthpot/n = new src(loc)
@@ -16,6 +17,9 @@
 
 
 /obj/item/barthpot/attackby(obj/item/I, mob/user, params)
+    if(!active)
+        say("Meow!")
+        return
     for(var/I2 in items_list)
         if(istype(I, I2))
             qdel(I)
diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm
index b86ad12b67..fed36a23e9 100644
--- a/code/modules/holiday/halloween/jacqueen.dm
+++ b/code/modules/holiday/halloween/jacqueen.dm
@@ -23,6 +23,7 @@
 	response_help  = "chats with"
 	var/last_poof
 	var/progression = list() //Keep track of where people are in the story.
+	var/active = TRUE //Turn this to false to keep normal mob behavour
 
 /mob/living/simple_animal/jacq/Initialize()
 	..()
@@ -48,6 +49,8 @@
 	poof()
 
 /mob/living/simple_animal/jacq/attack_hand(mob/living/carbon/human/M)
+	if(!active)
+		return ..()
 	if(!ckey)
 		canmove = FALSE
 		chit_chat(M)
@@ -55,6 +58,8 @@
 	..()
 
 /mob/living/simple_animal/jacq/attack_paw(mob/living/carbon/monkey/M)
+	if(!active)
+		return ..()
 	if(!ckey)
 		canmove = FALSE
 		chit_chat(M)