Comments out wisdom cow, brain trauma events, add timer to meteor event, changes event weights (#1099)

* ebents

* weh

code/modules/events/brain_trauma.dm

@@ -2,6 +2,7 @@
 	name = "Spontaneous Brain Trauma"
 	typepath = /datum/round_event/brain_trauma
 	weight = 25
+	max_occurrences = 0 //SKYRAT EDIT ADDITION - EVENTS
 
 /datum/round_event/brain_trauma
 	fakeable = FALSE

code/modules/events/meteor_wave.dm

@@ -47,7 +47,8 @@
 			kill()
 
 /datum/round_event/meteor_wave/announce(fake)
-	priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/ai/meteors.ogg')
+	//priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/ai/meteors.ogg') //ORIGINAL
+	priority_announce("Meteors have been detected on collision course with the station. Estimated time until impact: [round((startWhen * SSevents.wait) / 10, 0.1)] seconds.", "Meteor Alert", 'sound/ai/meteors.ogg') //ORIGINAL
 
 /datum/round_event/meteor_wave/tick()
 	if(ISMULTIPLE(activeFor, 3))
@@ -56,7 +57,8 @@
 /datum/round_event_control/meteor_wave/threatening
 	name = "Meteor Wave: Threatening"
 	typepath = /datum/round_event/meteor_wave/threatening
-	weight = 5
+	//weight = 5 //ORIGINAL
+	weight = 2 //SKYRAT EDIT CHANGE - EVENTS
 	min_players = 20
 	max_occurrences = 3
 	earliest_start = 35 MINUTES
@@ -67,7 +69,8 @@
 /datum/round_event_control/meteor_wave/catastrophic
 	name = "Meteor Wave: Catastrophic"
 	typepath = /datum/round_event/meteor_wave/catastrophic
-	weight = 7
+	//weight = 7 //ORIGINAL
+	weight = 2 //SKYRAT EDIT CHANGE - EVENTS
 	min_players = 25
 	max_occurrences = 3
 	earliest_start = 45 MINUTES

code/modules/events/pirates.dm

@@ -1,7 +1,8 @@
 /datum/round_event_control/pirates
 	name = "Space Pirates"
 	typepath = /datum/round_event/pirates
-	weight = 8
+	//weight = 8 //ORIGINAL
+	weight = 2 //SKYRAT EDIT CHANGE - EVENTS
 	max_occurrences = 1
 	min_players = 10
 	earliest_start = 30 MINUTES

code/modules/events/wisdomcow.dm

@@ -1,7 +1,8 @@
 /datum/round_event_control/wisdomcow
 	name = "Wisdom cow"
 	typepath = /datum/round_event/wisdomcow
-	max_occurrences = 1
+	//max_occurrences = 1 //ORIGINAL
+	max_occurrences = 0 //SKYRAT EDIT CHANGE - EVENTS
 	weight = 20
 
 /datum/round_event/wisdomcow/announce(fake)

modular_skyrat/modules/events/code/modules/events/meteor_wave.dm

@@ -0,0 +1,3 @@
+/datum/round_event/meteor_wave/setup()
+	startWhen = rand(90, 180) // Apparently it is by 2 seconds, so 90 is actually 180 seconds, and 180 is 360 seconds. So this is 3-6 minutes
+	endWhen = startWhen + 60

modular_skyrat/modules/events/readme.md

@@ -0,0 +1,32 @@
+https://github.com/Skyrat-SS13/Skyrat-tg/pulls
+
+## Title: Events
+
+MODULE ID: EVENT
+
+### Description:
+
+Changes to the existing TG events, aswell our own events
+
+### TG Proc Changes:
+- OVERRIDE: modular_skyrat/modules/events/code/modules/events/meteor_wave.dm > /datum/round_event/meteor_wave/setup()
+- code/modules/events/meteor_wave.dm > /datum/round_event/meteor_wave/announce()
+
+### Defines:
+
+- code/modules/events/brain_trauma.dm > /datum/round_event_control/brain_trauma > max_occurences = 0
+- code/modules/events/wisdomcow.dm  > /datum/round_event_control/wisdomcow > max_occurences = 0
+- code/modules/events/pirates.dm > /datum/round_event_control/pirates > weight = 2
+- code/modules/events/meteor_wave.dm > /datum/round_event/meteor_wave/threatening > weight = 2
+- code/modules/events/meteor_wave.dm > /datum/round_event/meteor_wave/catastrophic > weight = 2
+
+### Master file additions
+
+- N/A
+
+### Included files that are not contained in this module:
+
+- N/A
+
+### Credits:
+Azarak

tgstation.dme

@@ -3407,6 +3407,7 @@
 #include "modular_skyrat\modules\emotes\code\dna_screams.dm"
 #include "modular_skyrat\modules\emotes\code\emotes.dm"
 #include "modular_skyrat\modules\emotes\code\silicon_emotes.dm"
+#include "modular_skyrat\modules\events\code\modules\events\meteor_wave.dm"
 #include "modular_skyrat\modules\gunpoint\code\datum\gunpoint\gunpoint.dm"
 #include "modular_skyrat\modules\gunpoint\code\datum\gunpoint\gunpoint_datum.dm"
 #include "modular_skyrat\modules\gunpoint\code\datum\gunpoint\gunpoint_radial.dm"