From 2019e3bfbb95997b84c9a0df89116aacc741814e Mon Sep 17 00:00:00 2001
From: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date: Wed, 1 Jul 2020 21:09:33 -0400
Subject: [PATCH] fixes

---
 code/__HELPERS/game.dm                      | 10 +++++-----
 code/game/machinery/alarm.dm                | 10 ++++++----
 code/game/machinery/computer/atmos_alert.dm |  2 +-
 code/modules/power/apc.dm                   |  3 +--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index d30db22e3f7..8cbcc291d99 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -5,11 +5,11 @@
 	var/turf/T = get_turf(A)
 	return T ? T.loc : null
 
-/proc/get_area_name(N) //get area by its name
-	for(var/area/A in world)
-		if(A.name == N)
-			return A
-	return 0
+/proc/get_area_name(atom/X, format_text = FALSE)
+	var/area/A = isarea(X) ? X : get_area(X)
+	if(!A)
+		return null
+	return format_text ? format_text(A.name) : A.name
 
 /proc/get_location_name(atom/X, format_text = FALSE)
 	var/area/A = isarea(X) ? X : get_area(X)
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 4dac9bce1dd..81c98409041 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -550,9 +550,11 @@
 	if(!frequency)
 		return
 
-	var/datum/signal/alert_signal = new(list(
-		"zone" = get_area_name(src),
-		"type" = "Atmospheric"))
+	var/datum/signal/alert_signal = new
+	alert_signal.source = src
+	alert_signal.transmission_method = 1
+	alert_signal.data["zone"] = get_area_name(src)
+	alert_signal.data["type"] = "Atmospheric"
 
 	if(alert_level == 2)
 		alert_signal.data["alert"] = "severe"
@@ -561,7 +563,7 @@
 	else if(alert_level == 0)
 		alert_signal.data["alert"] = "clear"
 
-	frequency.post_signal(src, alert_signal, range = -1)
+	frequency.post_signal(src, alert_signal)
 
 ///////////////
 //END HACKING//
diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm
index ea47d19a7e2..896b2b42a1d 100644
--- a/code/game/machinery/computer/atmos_alert.dm
+++ b/code/game/machinery/computer/atmos_alert.dm
@@ -60,7 +60,7 @@
 /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, filter = RADIO_ATMOSIA)
+	radio_connection = SSradio.add_object(src, receive_frequency, RADIO_ATMOSIA)
 
 /obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal)
 	if(!signal)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index fde884d0a85..c19d0418dca 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -220,8 +220,7 @@
 		area = A
 		name = "\improper [area.name] APC"
 	else
-		area = get_area_name(areastring)
-		name = "\improper [area.name] APC"
+		name = "\improper [get_area_name(area, TRUE)] APC"
 	area.apc |= src
 
 	update_icon()