From a0e33d9105fb61fab1b980e9b9986449b97344fd Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Fri, 16 Dec 2011 03:54:16 +0000 Subject: [PATCH] reverted meteor change. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2695 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/meteor/meteors.dm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index ba98b900154..a32ef7d61b4 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -6,19 +6,19 @@ /var/const/meteors_in_wave = 50 /var/const/meteors_in_small_wave = 10 -/proc/meteor_wave(var/number = meteors_in_wave) +/proc/meteor_wave() if(!ticker || wavesecret) return wavesecret = 1 - for(var/i = 0 to number) + for(var/i = 0 to meteors_in_wave) spawn(rand(10,100)) spawn_meteor() spawn(meteor_wave_delay) wavesecret = 0 -/proc/spawn_meteors(var/number = meteors_in_small_wave) - for(var/i = 0; i < number; i++) +/proc/spawn_meteors() + for(var/i = 0; i < meteors_in_small_wave; i++) spawn(0) spawn_meteor() @@ -67,9 +67,9 @@ var/obj/effect/meteor/M switch(rand(1, 100)) - if(1 to 20) + if(1 to 10) M = new /obj/effect/meteor/big( pickedstart ) - if(21 to 75) + if(11 to 75) M = new /obj/effect/meteor( pickedstart ) if(76 to 100) M = new /obj/effect/meteor/small( pickedstart ) @@ -137,12 +137,7 @@ if(!M.stat && !istype(M, /mob/living/silicon/ai)) //bad idea to shake an ai's view shake_camera(M, 3, 1) if (A) - if(isobj(A)) - del(A) - else - A.meteorhit(src) - src.hits-- - return + explosion(src.loc, 0, 1, 2, 3, 0) playsound(src.loc, 'meteorimpact.ogg', 40, 1) if (--src.hits <= 0) if(prob(15) && !istype(A, /obj/structure/grille))