From aff7f808ece4b3fc5a4ac25a7aeefd6540bf476d Mon Sep 17 00:00:00 2001 From: Fermi <33956696+Thalpy@users.noreply.github.com> Date: Sun, 6 Oct 2019 00:36:57 +0100 Subject: [PATCH] oops --- code/modules/holiday/jacqueen.dm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/code/modules/holiday/jacqueen.dm b/code/modules/holiday/jacqueen.dm index d1883df0d2..2f7343e7d8 100644 --- a/code/modules/holiday/jacqueen.dm +++ b/code/modules/holiday/jacqueen.dm @@ -1,3 +1,16 @@ +/datum/round_event_control/jacqueline + name = "Jacqueline the Pumpqueen" + holidayID = "Jacqueline" + typepath = /datum/round_event/jacq + weight = -1 //forces it to be called, regardless of weight + max_occurrences = 1 + earliest_start = 0 MINUTES + +/datum/round_event/jaqc/start() + ..() + for(var/mob/living/simple_animal/parrot/Poly/Poly in GLOB.mob_living_list) + new /mob/living/jacq(Poly.loc)//She poofs on init, so it doesn't matter, so long as poly exists. + //Whacha doing in here like? Yae wan tae ruin ta magicks? /mob/living/jacq name = "Jacqueline the Pumpqueen" @@ -11,6 +24,8 @@ var/tricked = list() //Those who have been tricked var/progression = list() //Keep track of where people are in the story. +/mob/living/jacq/Initialize() + poof() /mob/living/jacq/Destroy() //I.e invincible visible_message("[src] cackles, \"You'll nae get rid a me that easily!\"") @@ -18,7 +33,6 @@ var/mob/living/jacq/Jacq = new src.type(loc) Jacq.tricked = tricked Jacq.progression = progression - Jacq.poof() ..() /mob/living/jacq/death() //What is alive may never die