From 505925d767da6828cfb9da069e5cf34f3b3c0529 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 12 Sep 2017 02:59:58 -0500
Subject: [PATCH] Update atmos_alert.dm

---
 code/game/machinery/computer/atmos_alert.dm | 154 +++++++++-----------
 1 file changed, 67 insertions(+), 87 deletions(-)

diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm
index 399fb1908b..b433791ffd 100644
--- a/code/game/machinery/computer/atmos_alert.dm
+++ b/code/game/machinery/computer/atmos_alert.dm
@@ -1,23 +1,4 @@
-<<<<<<< HEAD
-/obj/machinery/computer/atmos_alert
-	name = "atmospheric alert console"
-	desc = "Used to monitor the station's air alarms."
-	circuit = /obj/item/circuitboard/computer/atmos_alert
-	icon_screen = "alert:0"
-	icon_keyboard = "atmos_key"
-	var/list/priority_alarms = list()
-	var/list/minor_alarms = list()
-	var/receive_frequency = 1437
-	var/datum/radio_frequency/radio_connection
-
-	light_color = LIGHT_COLOR_CYAN
-
-/obj/machinery/computer/atmos_alert/Initialize()
-	..()
-	set_frequency(receive_frequency)
-
-/obj/machinery/computer/atmos_alert/Destroy()
-=======
+<<<<<<< HEAD
 /obj/machinery/computer/atmos_alert
 	name = "atmospheric alert console"
 	desc = "Used to monitor the station's air alarms."
@@ -36,72 +17,71 @@
 	set_frequency(receive_frequency)
 
 /obj/machinery/computer/atmos_alert/Destroy()
->>>>>>> f2c5657... Fixes initialize hints for a fair number of mobs and items (#30583)
 	SSradio.remove_object(src, receive_frequency)
-	return ..()
-
+	return ..()
+
 /obj/machinery/computer/atmos_alert/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "atmos_alert", name, 350, 300, master_ui, state)
-		ui.open()
-
-/obj/machinery/computer/atmos_alert/ui_data(mob/user)
-	var/list/data = list()
-
-	data["priority"] = list()
-	for(var/zone in priority_alarms)
-		data["priority"] += zone
-	data["minor"] = list()
-	for(var/zone in minor_alarms)
-		data["minor"] += zone
-
-	return data
-
-/obj/machinery/computer/atmos_alert/ui_act(action, params)
-	if(..())
-		return
-	switch(action)
-		if("clear")
-			var/zone = params["zone"]
-			if(zone in priority_alarms)
-				to_chat(usr, "Priority alarm for [zone] cleared.")
-				priority_alarms -= zone
-				. = TRUE
-			if(zone in minor_alarms)
-				to_chat(usr, "Minor alarm for [zone] cleared.")
-				minor_alarms -= zone
-				. = TRUE
-	update_icon()
-
-/obj/machinery/computer/atmos_alert/proc/set_frequency(new_frequency)
-	SSradio.remove_object(src, receive_frequency)
-	receive_frequency = new_frequency
-	radio_connection = SSradio.add_object(src, receive_frequency, GLOB.RADIO_ATMOSIA)
-
-/obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal)
-	if(!signal || signal.encryption) return
-
-	var/zone = signal.data["zone"]
-	var/severity = signal.data["alert"]
-
-	if(!zone || !severity) return
-
-	minor_alarms -= zone
-	priority_alarms -= zone
-	if(severity == "severe")
-		priority_alarms += zone
-	else if (severity == "minor")
-		minor_alarms += zone
-	update_icon()
-	return
-
-/obj/machinery/computer/atmos_alert/update_icon()
-	..()
-	if(stat & (NOPOWER|BROKEN))
-		return
-	if(priority_alarms.len)
-		add_overlay("alert:2")
-	else if(minor_alarms.len)
-		add_overlay("alert:1")
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "atmos_alert", name, 350, 300, master_ui, state)
+		ui.open()
+
+/obj/machinery/computer/atmos_alert/ui_data(mob/user)
+	var/list/data = list()
+
+	data["priority"] = list()
+	for(var/zone in priority_alarms)
+		data["priority"] += zone
+	data["minor"] = list()
+	for(var/zone in minor_alarms)
+		data["minor"] += zone
+
+	return data
+
+/obj/machinery/computer/atmos_alert/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("clear")
+			var/zone = params["zone"]
+			if(zone in priority_alarms)
+				to_chat(usr, "Priority alarm for [zone] cleared.")
+				priority_alarms -= zone
+				. = TRUE
+			if(zone in minor_alarms)
+				to_chat(usr, "Minor alarm for [zone] cleared.")
+				minor_alarms -= zone
+				. = TRUE
+	update_icon()
+
+/obj/machinery/computer/atmos_alert/proc/set_frequency(new_frequency)
+	SSradio.remove_object(src, receive_frequency)
+	receive_frequency = new_frequency
+	radio_connection = SSradio.add_object(src, receive_frequency, GLOB.RADIO_ATMOSIA)
+
+/obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal)
+	if(!signal || signal.encryption) return
+
+	var/zone = signal.data["zone"]
+	var/severity = signal.data["alert"]
+
+	if(!zone || !severity) return
+
+	minor_alarms -= zone
+	priority_alarms -= zone
+	if(severity == "severe")
+		priority_alarms += zone
+	else if (severity == "minor")
+		minor_alarms += zone
+	update_icon()
+	return
+
+/obj/machinery/computer/atmos_alert/update_icon()
+	..()
+	if(stat & (NOPOWER|BROKEN))
+		return
+	if(priority_alarms.len)
+		add_overlay("alert:2")
+	else if(minor_alarms.len)
+		add_overlay("alert:1")