From 6ec929c14dbdc33cc6ef4366f1141091e745ff1e Mon Sep 17 00:00:00 2001
From: Kearel <grantkrahling@gmail.com>
Date: Wed, 6 Jan 2016 15:12:05 -0600
Subject: [PATCH] should realistically fix merge conflicts

I don't know actually if it will.
---
 code/modules/games/boardgame.dm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/code/modules/games/boardgame.dm b/code/modules/games/boardgame.dm
index 62abc1daa49..54a9866ea4d 100644
--- a/code/modules/games/boardgame.dm
+++ b/code/modules/games/boardgame.dm
@@ -89,19 +89,22 @@ obj/item/weapon/board/attackby(obj/item/I as obj, mob/user as mob)
 			dat += "'#66CCFF'>"
 		else
 			dat += "'#252536'>"
-		dat += "<A href='?src=\ref[src];select=[i];person=\ref[user]'"
+		if(!isobserver(user))
+			dat += "<A href='?src=\ref[src];select=[i]' style='display:block;text-decoration:none;'>"
 		if(board["[i]"])
 			var/obj/item/I = board["[i]"]
 			user << browse_rsc(board_icons["[I.icon] [I.icon_state]"],"[I.icon_state].png")
-			dat += "><image src='[I.icon_state].png' style='border-style: none'>"
+			dat += "<image src='[I.icon_state].png' style='border-style: none'>"
 		else
-			dat += "style='display:block;text-decoration:none;'>&nbsp;"
+			dat += "&nbsp;"
 
-		dat += "</A></td>"
+		if(!isobserver(user))
+			dat += "</A>"
+		dat += "</td>"
 
 	dat += "</table><br>"
 
-	if(selected >= 0)
+	if(selected >= 0 && !isobserver(user))
 		dat += "<br><A href='?src=\ref[src];remove=0'>Remove Selected Piece</A>"
 	user << browse(dat,"window=boardgame;size=500x500")
 	onclose(usr, "boardgame")