diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index dec84ab9775..8843170e06b 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -1,19 +1,23 @@ -//cael - two events here +/* + * All meteor random events are in here + * Right now we have small and medium. Apocalyptic huge would be button mashing, at least for now + */ -//meteor storms are much heavier +//Meteor storms are much heavier /datum/event/meteor_wave startWhen = 10 endWhen = 30 /datum/event/meteor_wave/setup() - endWhen = rand(30, 60) + 10 //Goes from one minute to two minutes. Supposed to be a devastating event + endWhen = rand(45, 90) + 10 //More drawn out than the shower, but not too powerful. Supposed to be a devastating event /datum/event/meteor_wave/announce() command_alert("A meteor storm has been detected on collision course with the station. Seek shelter within the core of the station immediately.", "Meteor Alert") world << sound('sound/AI/meteors.ogg') +//Two to four waves. So 10 to 60. Note that it used to be (20, 50) per wave with two to three waves /datum/event/meteor_wave/tick() - meteor_wave(rand(25,50), max_size=2) //Large waves, panic is mandatory + meteor_wave(rand(10, 15), max_size = 2) //Large waves, panic is mandatory /datum/event/meteor_wave/end() command_alert("The station has cleared the meteor storm.", "Meteor Alert") @@ -29,9 +33,10 @@ /datum/event/meteor_shower/announce() command_alert("The station is about to be hit by a small-intensity meteor storm. Seek shelter within the core of the station immediately", "Meteor Alert") -//meteor showers are lighter and more common, +//Meteor showers are lighter and more common +//Usually a single wave, rarely two, so anywhere from 5 to 20 small meteors /datum/event/meteor_shower/tick() - meteor_wave(rand(10,25), max_size=1) //Much more clement + meteor_wave(rand(5, 10), max_size = 1) //Much more clement /datum/event/meteor_shower/end() command_alert("The station has cleared the meteor shower", "Meteor Alert") @@ -60,7 +65,7 @@ var/global/list/thing_storm_types = list( startWhen = 10 endWhen = 30 - var/storm_name=null + var/storm_name = null /datum/event/thing_storm/setup() endWhen = rand(30, 60) + 10 //From 30 seconds to one minute @@ -72,9 +77,10 @@ var/global/list/thing_storm_types = list( /datum/event/thing_storm/announce() command_alert("The station is about to be hit by a small-intensity meteor storm. Seek shelter within the core of the station immediately", "Meteor Alert") -//meteor showers are lighter and more common, +//Meteor showers are lighter and more common +//Since this isn't rocks of pure pain and explosion, we have more, anywhere from 10 to 40 items /datum/event/thing_storm/tick() - meteor_wave(rand(10,25), types=thing_storm_types[storm_name]) //Much more clement + meteor_wave(rand(10, 20), types = thing_storm_types[storm_name]) //Much more clement /datum/event/thing_storm/end() command_alert("The station has cleared the [storm_name].", "Meteor Alert")