This commit is contained in:
Fox McCloud
2020-07-01 21:09:33 -04:00
parent 86cc4b49ae
commit 2019e3bfbb
4 changed files with 13 additions and 12 deletions
+5 -5
View File
@@ -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)
+6 -4
View File
@@ -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//
+1 -1
View File
@@ -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)
+1 -2
View File
@@ -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()