From fdb3324a4b522bdd2b2d0fba9fad743f13f1194f Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 12 Nov 2017 08:10:37 -0600
Subject: [PATCH] Update anomaly.dm

---
 code/modules/events/anomaly.dm | 36 ----------------------------------
 1 file changed, 36 deletions(-)

diff --git a/code/modules/events/anomaly.dm b/code/modules/events/anomaly.dm
index d27baf65a8..c866dcca0f 100644
--- a/code/modules/events/anomaly.dm
+++ b/code/modules/events/anomaly.dm
@@ -1,38 +1,3 @@
-<<<<<<< HEAD
-/datum/round_event_control/anomaly
-	name = "Anomaly: Energetic Flux"
-	typepath = /datum/round_event/anomaly
-
-	min_players = 1
-	max_occurrences = 0 //This one probably shouldn't occur! It'd work, but it wouldn't be very fun.
-	weight = 15
-
-/datum/round_event/anomaly
-	var/area/impact_area
-	var/obj/effect/anomaly/newAnomaly
-	announceWhen	= 1
-
-
-/datum/round_event/anomaly/setup(loop=0)
-	var/safety_loop = loop + 1
-	if(safety_loop > 50)
-		kill()
-		end()
-	impact_area = findEventArea()
-	if(!impact_area)
-		setup(safety_loop)
-	var/list/turf_test = get_area_turfs(impact_area)
-	if(!turf_test.len)
-		setup(safety_loop)
-
-/datum/round_event/anomaly/announce()
-	priority_announce("Localized energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert")
-
-/datum/round_event/anomaly/start()
-	var/turf/T = safepick(get_area_turfs(impact_area))
-	if(T)
-		newAnomaly = new /obj/effect/anomaly/flux(T)
-=======
 /datum/round_event_control/anomaly
 	name = "Anomaly: Energetic Flux"
 	typepath = /datum/round_event/anomaly
@@ -66,4 +31,3 @@
 	var/turf/T = safepick(get_area_turfs(impact_area))
 	if(T)
 		newAnomaly = new /obj/effect/anomaly/flux(T)
->>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559)