From d21f7f9a9be6125e487f0aa0d427661424a8ce54 Mon Sep 17 00:00:00 2001
From: Fermi <>
Date: Fri, 11 Oct 2019 15:26:39 +0100
Subject: [PATCH] Jacq fix

---
 code/modules/holiday/halloween/jacqueen.dm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm
index 1034aa663d..65dfce8cf0 100644
--- a/code/modules/holiday/halloween/jacqueen.dm
+++ b/code/modules/holiday/halloween/jacqueen.dm
@@ -28,8 +28,9 @@
 
 /mob/living/simple_animal/jacq/Life()
 	..()
-	if((last_poof+3 MINUTES) < world.realtime)
-		poof()
+	if(!ckey)
+		if((last_poof+3 MINUTES) < world.realtime)
+			poof()
 
 /mob/living/simple_animal/jacq/Destroy() //I.e invincible
 	visible_message("<b>[src]</b> cackles, <span class='spooky'>\"You'll nae get rid a me that easily!\"</span>")
@@ -45,15 +46,17 @@
 	poof()
 
 /mob/living/simple_animal/jacq/attack_hand(mob/living/carbon/human/M)
-	canmove = FALSE
-	chit_chat(M)
-	canmove = TRUE
+	if(!ckey)
+		canmove = FALSE
+		chit_chat(M)
+		canmove = TRUE
 	..()
 
 /mob/living/simple_animal/jacq/attack_paw(mob/living/carbon/monkey/M)
-	canmove = FALSE
-	chit_chat(M)
-	canmove = TRUE
+	if(!ckey)
+		canmove = FALSE
+		chit_chat(M)
+		canmove = TRUE
 	..()
 
 /mob/living/simple_animal/jacq/proc/poof()