From f1f99fc26c27d04a19ad9c6ecc8f4e7095972082 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 1 Oct 2017 15:26:32 -0500
Subject: [PATCH] Update electrical_storm.dm

---
 code/modules/events/electrical_storm.dm | 39 -------------------------
 1 file changed, 39 deletions(-)

diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm
index bf6017a9a0..a10e42d754 100644
--- a/code/modules/events/electrical_storm.dm
+++ b/code/modules/events/electrical_storm.dm
@@ -1,41 +1,3 @@
-<<<<<<< HEAD
-/datum/round_event_control/electrical_storm
-	name = "Electrical Storm"
-	typepath = /datum/round_event/electrical_storm
-	earliest_start = 6000
-	min_players = 5
-	weight = 40
-	alertadmins = 0
-
-/datum/round_event/electrical_storm
-	var/lightsoutAmount	= 1
-	var/lightsoutRange	= 25
-	announceWhen	= 1
-
-/datum/round_event/electrical_storm/announce()
-	priority_announce("An electrical storm has been detected in your area, please repair potential electronic overloads.", "Electrical Storm Alert")
-
-
-/datum/round_event/electrical_storm/start()
-	var/list/epicentreList = list()
-
-	for(var/i=1, i <= lightsoutAmount, i++)
-		var/list/possibleEpicentres = list()
-		for(var/obj/effect/landmark/newEpicentre in GLOB.landmarks_list)
-			if(newEpicentre.name == "lightsout" && !(newEpicentre in epicentreList))
-				possibleEpicentres += newEpicentre
-		if(possibleEpicentres.len)
-			epicentreList += pick(possibleEpicentres)
-		else
-			break
-
-	if(!epicentreList.len)
-		return
-
-	for(var/obj/effect/landmark/epicentre in epicentreList)
-		for(var/obj/machinery/power/apc/apc in urange(lightsoutRange, epicentre))
-			apc.overload_lighting()
-=======
 /datum/round_event_control/electrical_storm
 	name = "Electrical Storm"
 	typepath = /datum/round_event/electrical_storm
@@ -72,4 +34,3 @@
 	for(var/obj/effect/landmark/epicentre in epicentreList)
 		for(var/obj/machinery/power/apc/apc in urange(lightsoutRange, epicentre))
 			apc.overload_lighting()
->>>>>>> 3358cbb... Cleans up some antag/event landmark checks (#31129)