From 39f683ab8d98786054137b591a890dcb31a50558 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Fri, 27 Oct 2017 15:32:38 -0500
Subject: [PATCH] Update meteor_wave.dm

---
 code/modules/events/meteor_wave.dm | 71 ------------------------------
 1 file changed, 71 deletions(-)

diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm
index bdbfd2e6b6..7940eaeec8 100644
--- a/code/modules/events/meteor_wave.dm
+++ b/code/modules/events/meteor_wave.dm
@@ -1,73 +1,3 @@
-<<<<<<< HEAD
-// Normal strength
-
-/datum/round_event_control/meteor_wave
-	name = "Meteor Wave: Normal"
-	typepath = /datum/round_event/meteor_wave
-	weight = 4
-	min_players = 5
-	max_occurrences = 3
-
-/datum/round_event/meteor_wave
-	startWhen		= 6
-	endWhen			= 66
-	announceWhen	= 1
-	var/list/wave_type
-	var/wave_name = "normal"
-
-/datum/round_event/meteor_wave/New()
-	..()
-	if(!wave_type)
-		determine_wave_type()
-
-/datum/round_event/meteor_wave/proc/determine_wave_type()
-	if(!wave_name)
-		wave_name = pickweight(list(
-			"normal" = 50,
-			"threatening" = 40,
-			"catastrophic" = 10))
-	switch(wave_name)
-		if("normal")
-			wave_type = GLOB.meteors_normal
-		if("threatening")
-			wave_type = GLOB.meteors_threatening
-		if("catastrophic")
-			wave_type = GLOB.meteors_catastrophic
-		if("meaty")
-			wave_type = GLOB.meteorsB
-		if("space dust")
-			wave_type = GLOB.meteorsC
-		else
-			WARNING("Wave name of [wave_name] not recognised.")
-			kill()
-
-/datum/round_event/meteor_wave/announce()
-	priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/ai/meteors.ogg')
-
-/datum/round_event/meteor_wave/tick()
-	if(IsMultiple(activeFor, 3))
-		spawn_meteors(5, wave_type) //meteor list types defined in gamemode/meteor/meteors.dm
-
-/datum/round_event_control/meteor_wave/threatening
-	name = "Meteor Wave: Threatening"
-	typepath = /datum/round_event/meteor_wave/threatening
-	weight = 2
-	min_players = 5
-	max_occurrences = 3
-
-/datum/round_event/meteor_wave/threatening
-	wave_name = "threatening"
-
-/datum/round_event_control/meteor_wave/catastrophic
-	name = "Meteor Wave: Catastrophic"
-	typepath = /datum/round_event/meteor_wave/catastrophic
-	weight = 1
-	min_players = 5
-	max_occurrences = 3
-
-/datum/round_event/meteor_wave/catastrophic
-	wave_name = "catastrophic"
-=======
 // Normal strength
 
 /datum/round_event_control/meteor_wave
@@ -140,4 +70,3 @@
 
 /datum/round_event/meteor_wave/catastrophic
 	wave_name = "catastrophic"
->>>>>>> 00396d0... Halloween Tweaks (#32087)