From f59a365c230d22e5a0273ebc73f8501e2729d8d3 Mon Sep 17 00:00:00 2001
From: ShizCalev <ShizCalev@gmail.com>
Date: Sat, 20 Jan 2018 11:28:04 -0500
Subject: [PATCH 1/2] Fixes get_area_name runtime

---
 code/__HELPERS/game.dm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 67ec38bdcf..0f8860bfc9 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -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)

From c158d2f6dda5fc2577286aa98cb12322100bbc98 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 21 Jan 2018 11:56:09 -0600
Subject: [PATCH 2/2] Update game.dm

---
 code/__HELPERS/game.dm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 0f8860bfc9..2d200438ef 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -15,17 +15,10 @@
 	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)