This commit is contained in:
Fermi
2019-10-12 09:15:32 +01:00
parent 7bce68bb11
commit ecfc988911
4 changed files with 6 additions and 9 deletions
+4
View File
@@ -19,6 +19,10 @@
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")
@@ -1,13 +1,5 @@
/obj/effect/landmark/barthpot
name = "barthpot"
var/created = FALSE
/obj/effect/landmark/barthpot/Initialize()
if(!created) //I dunno why they spawn twice but, this is to prevent that.
new /obj/item/barthpot(loc)
new /mob/living/simple_animal/jacq(loc)
created = TRUE
..()
/obj/item/barthpot
name = "Bartholomew"
@@ -400,6 +400,7 @@
name = "Magic candy"
icon = 'icons/obj/halloween_items.dmi'
icon_state = "jacq_candy"
desc = "A candy with strange magic within. Be careful, as the magic isn't always helpful."
/obj/item/reagent_containers/food/snacks/special_candy/Initialize()
.=..()
+1 -1
View File
@@ -322,7 +322,7 @@
/datum/holiday/halloween
name = HALLOWEEN
begin_day = 28
begin_day = 27
begin_month = OCTOBER
end_day = 2
end_month = NOVEMBER