From 65daec8f75eddbb88a2d8591d18d8e7f1b2a16fb Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 12 Nov 2017 08:12:32 -0600
Subject: [PATCH] Update prison_break.dm

---
 code/modules/events/prison_break.dm | 65 ++++-------------------------
 1 file changed, 8 insertions(+), 57 deletions(-)

diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm
index ab92b4f528..ebcade74a3 100644
--- a/code/modules/events/prison_break.dm
+++ b/code/modules/events/prison_break.dm
@@ -1,51 +1,3 @@
-<<<<<<< HEAD
-/datum/round_event_control/grey_tide
-	name = "Grey Tide"
-	typepath = /datum/round_event/grey_tide
-	max_occurrences = 2
-	min_players = 5
-
-/datum/round_event/grey_tide
-	announceWhen = 50
-	endWhen = 20
-	var/list/area/areasToOpen = list()
-	var/list/potential_areas = list(/area/bridge,
-									/area/engine,
-									/area/medical,
-									/area/security,
-									/area/quartermaster,
-									/area/science)
-	var/severity = 1
-
-
-/datum/round_event/grey_tide/setup()
-	announceWhen = rand(50, 60)
-	endWhen = rand(20, 30)
-	severity = rand(1,3)
-	for(var/i in 1 to severity)
-		var/picked_area = pick_n_take(potential_areas)
-		for(var/area/A in world)
-			if(istype(A, picked_area))
-				areasToOpen += A
-
-
-/datum/round_event/grey_tide/announce()
-	if(areasToOpen && areasToOpen.len > 0)
-		priority_announce("Gr3y.T1d3 virus detected in [station_name()] door subroutines. Severity level of [severity]. Recommend station AI involvement.", "Security Alert")
-	else
-		log_world("ERROR: Could not initate grey-tide. No areas in the list!")
-		kill()
-
-
-/datum/round_event/grey_tide/start()
-	for(var/area/A in areasToOpen)
-		for(var/obj/machinery/light/L in A)
-			L.flicker(10)
-
-/datum/round_event/grey_tide/end()
-	for(var/area/A in areasToOpen)
-		for(var/obj/O in A)
-=======
 /datum/round_event_control/grey_tide
 	name = "Grey Tide"
 	typepath = /datum/round_event/grey_tide
@@ -92,17 +44,16 @@
 /datum/round_event/grey_tide/end()
 	for(var/area/A in areasToOpen)
 		for(var/obj/O in A)
->>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559)
 			if(istype(O, /obj/machinery/power/apc))
-				var/obj/machinery/power/apc/temp = O
-				temp.overload_lighting()
+				var/obj/machinery/power/apc/temp = O
+				temp.overload_lighting()
 			else if(istype(O, /obj/structure/closet/secure_closet))
-				var/obj/structure/closet/secure_closet/temp = O
+				var/obj/structure/closet/secure_closet/temp = O
 				temp.locked = FALSE
-				temp.update_icon()
+				temp.update_icon()
 			else if(istype(O, /obj/machinery/door/airlock))
-				var/obj/machinery/door/airlock/temp = O
-				temp.prison_open()
+				var/obj/machinery/door/airlock/temp = O
+				temp.prison_open()
 			else if(istype(O, /obj/machinery/door_timer))
-				var/obj/machinery/door_timer/temp = O
-				temp.timer_end(forced = TRUE)
\ No newline at end of file
+				var/obj/machinery/door_timer/temp = O
+				temp.timer_end(forced = TRUE)