diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index b9ed5c88c54..3ca592195fc 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -8,6 +8,8 @@ /var/list/meteorsC = list(/obj/effect/meteor/dust) //for space dust event +/var/list/meteorsSPOOKY = list(/obj/effect/meteor/pumpkin) + /proc/spawn_meteors(var/number = 10, var/list/meteortypes) for(var/i = 0; i < number; i++) spawn_meteor(meteortypes) @@ -132,6 +134,25 @@ heavy = 1 meteordrop = /obj/item/weapon/ore/uranium +/obj/effect/meteor/pumpkin + name = "PUMPKING" + desc = "THE PUMPKING'S COMING!" + icon = 'icons/obj/meteor_spooky.dmi' + icon_state = "pumpkin" + hits = 10 + heavy = 1 + meteordrop = /obj/item/clothing/head/hardhat/pumpkinhead + meteorsound = 'sound/hallucinations/im_here1.ogg' + dropamt = 1 + bound_width = 96 + bound_height = 96 + +/obj/effect/meteor/pumpkin/New() + ..() + if(prob(50)) + meteordrop = /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin + meteorsound = 'sound/hallucinations/im_here2.ogg' + /obj/effect/meteor/meaty name = "meaty ore" icon_state = "meateor" diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm index 64a72a6a6bf..93dce313019 100644 --- a/code/modules/events/holiday/halloween.dm +++ b/code/modules/events/holiday/halloween.dm @@ -16,5 +16,7 @@ for(var/mob/living/simple_animal/corgi/Ian/Ian in mob_list) Ian.place_on_head(new /obj/item/weapon/bedsheet(Ian)) + spawn_meteors(5, meteorsSPOOKY) + /datum/round_event/spooky/announce() 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") diff --git a/icons/obj/meteor_spooky.dmi b/icons/obj/meteor_spooky.dmi new file mode 100644 index 00000000000..287d5b47bd0 Binary files /dev/null and b/icons/obj/meteor_spooky.dmi differ