From b19c078447e1ac729d55a3963a3ad872edc2000f Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Wed, 9 Oct 2019 12:09:41 +0100 Subject: [PATCH] Restructuring. --- code/modules/holiday/halloween/bartholomew.dm | 0 code/modules/holiday/{ => halloween}/halloween.dm | 0 code/modules/holiday/{ => halloween}/jacqueen.dm | 7 ++----- 3 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 code/modules/holiday/halloween/bartholomew.dm rename code/modules/holiday/{ => halloween}/halloween.dm (100%) rename code/modules/holiday/{ => halloween}/jacqueen.dm (96%) diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm new file mode 100644 index 0000000000..e69de29bb2 diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween/halloween.dm similarity index 100% rename from code/modules/holiday/halloween.dm rename to code/modules/holiday/halloween/halloween.dm diff --git a/code/modules/holiday/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm similarity index 96% rename from code/modules/holiday/jacqueen.dm rename to code/modules/holiday/halloween/jacqueen.dm index 9d4d1961eb..b6d50e8e58 100644 --- a/code/modules/holiday/jacqueen.dm +++ b/code/modules/holiday/halloween/jacqueen.dm @@ -6,10 +6,6 @@ #define JACQ_WITCH (1<<4) #define JACQ_EXPELL (1<<5) #define JACQ_DATE (1<<6) -//Tricks -#define JACQ_TRICKED (1<<0) -#define JACQ_LATERN (1<<1) -#define JACQ_DULLA (1<<2) ////ROUND EVENT @@ -24,7 +20,7 @@ /datum/round_event/jaqc/start() ..() for(var/mob/living/simple_animal/pet/dog/corgi/Ian/Ian in GLOB.mob_living_list) - new /mob/living/jacq(Poly.loc)//She poofs on init, so it doesn't matter, so long as Ian exists. + new /mob/living/jacq(Ian.loc)//She poofs on init, so it doesn't matter, so long as Ian exists. /////// MOBS @@ -280,6 +276,7 @@ key = C2.key message_admins("[C2]/[C2.key] has agreed to go on a date with [C] as Jacqueline.") log_game("HALLOWEEN: [C2]/[C2.key] has agreed to go on a date with [C] as Jacqueline") + to_chat(src, "You are Jacqueline the great pumpqueen, witch Extraordinaire! You’re a very Scottish lass with a kind heart, but also a little crazy. You also blew up the wizarding school and you’re suspended for a while, so you visited the station before heading home. On your head lies the prize pumpkin of your Mother’s pumpkin patch. You’re currently on a date with [C] and well, I didn’t think anyone would get this far. Please be good so I can do events like this in the future. ") return else candies =- C2