From 4fd3b7c80b0a7e65444875aa9fd47d3cc16af046 Mon Sep 17 00:00:00 2001
From: Remie Richards <toiletbrush95@gmail.com>
Date: Sun, 5 Oct 2014 13:08:19 +0100
Subject: [PATCH] Pumpkin meteors

---
 code/game/gamemodes/meteor/meteors.dm    |  21 +++++++++++++++++++++
 code/modules/events/holiday/halloween.dm |   2 ++
 icons/obj/meteor_spooky.dmi              | Bin 0 -> 860 bytes
 3 files changed, 23 insertions(+)
 create mode 100644 icons/obj/meteor_spooky.dmi

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 0000000000000000000000000000000000000000..287d5b47bd0f72686e1737de311a3761bdf75901
GIT binary patch
literal 860
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1P60k4t_Kbr*m_|_$|S$(ds}{A
zZ~uML?B{BYuiN~8ovZwP+WhCP;9t8#ejZF&qc3!Ny3YUC&Oder9ZHmcHi_-q_JEx}
zlE?bBRx3=K0W^)VB*-tA!Qt7BG$1FZDkP%BCAB!YD6^m>Ge3`kp<+&OSV2+g_b<T(
zAHP1)^48TlcjkQXhERix#t$CpocGZ@$xx(oc87&=knv?>FNHaeCLNg+q7b}tfys6S
zYh(Y;Ze!KWD<qcmb{ntNFf<oEV)i5`tl(=gqcjgg(^+Y?p0l-K3=B*Go-U3d6?5L+
zxf#S{DAJO6$1UUz!~OrEYcIWY_N;b_;1{WnkDR$=^82hTfi$C+=X;A*=WP7J^NTU$
zJM)Tn>;ZS{e>PY@^^lg?E$>ij-|(uA;p$%ozbp0YZF)Kz9V<hYB|kbP`30hsf59$!
zhtT>f85h4~`mC83HUHC^C)Q8@>U+h^)Xdu4Sg!&M2L^@&^@gwewDOas7<@ZT?T-FR
zf8DvVSMca>MzCzd{2z0^8}{;=s9vkl_$m2~>4ykdoZ*4Kg5Jvj!w)N;1V3^<_=l%#
zDf5LHOb|Jh{wZa<?!4%qQtTT1Sop$ThKoXf!7>jF8Y1=vOiSK3#Ui#R<J6%`j2`S#
z!F%Mvk};MJC-XO}Ma{jQckSM4o@ucRmG)qX9YqfNF4uIMRQX>8dkN<6-k3k#h72Nz
zfZ?uO?{b%oVU;;Uz+T3NSG){=-2R)qu6*D8_sNd~f4^N+g*b1+%J6O}{dFC7z8~v1
zyuF%VDhqL4f_cN&bJvU`diPc-t=nPve*5$wld?0AfH*LfImeG(!R<?2=RDVGec!`M
zWI#z52ySdBJ<et*5MQue^XJsuU(jGPZTR=$zQfbiZxstRO#89#=d*u(?x)-!{;?2K
zkd5el@k}JWL;lsXh8fxA+xnC%V18{dim+l>nUNX)?SuNJ*k6C|K&&~yb`m29)ZhJQ
XJDj7SmA2c-5Twe})z4*}Q$iB}_&#m5

literal 0
HcmV?d00001