Fixes get_area_name runtime

2018-01-20 11:28:04 -05:00
parent 7ec2a4230d
commit f59a365c23
1 changed files with 7 additions and 0 deletions
@@ -15,10 +15,17 @@
 	return T ? T.loc : null

 /proc/get_area_name(atom/X, format_text = FALSE)
+<<<<<<< HEAD
 	var/area/Y = get_area(X)
 	if(format_text)
 		return format_text(Y.name)
 	return Y.name
+=======
+	var/area/A = isarea(X) ? X : get_area(X)
+	if(!A)
+		return null
+	return format_text ? format_text(A.name) : A.name
+>>>>>>> f46dcd7... honk

 /proc/get_area_by_name(N) //get area by its name
 	for(var/area/A in world)