Turns Jacq into her own event

This commit is contained in:
Thalpy
2019-10-13 22:33:46 +01:00
parent 356a1279f1
commit ac2aba50a6
3 changed files with 29 additions and 3 deletions
-3
View File
@@ -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")
@@ -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?
+10
View File
@@ -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