From 3bf0f4dcf0bb3f7cbe8b49728efbfcc60afc0034 Mon Sep 17 00:00:00 2001
From: ShizCalev <ShizCalev@gmail.com>
Date: Fri, 19 Jan 2018 19:37:45 -0500
Subject: [PATCH] Fixes get_area_name runtime

---
 code/__HELPERS/game.dm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index c4e3e2d81de..7fff97e8dc4 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -15,10 +15,12 @@
 	return T ? T.loc : null
 
 /proc/get_area_name(atom/X, format_text = FALSE)
-	var/area/Y = get_area(X)
-	if(format_text)
-		return format_text(Y.name)
-	return Y.name
+	if(isarea(X))
+		return format_text ? format_text(X.name) : X.name
+	var/area/A = get_area(X)
+	if(!A)
+		return null
+	return format_text ? format_text(A.name) : A.name
 
 /proc/get_area_by_name(N) //get area by its name
 	for(var/area/A in world)