From 1993b8a48ed57aa76560c42b0a40e288f36176eb Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Wed, 19 Apr 2017 06:04:32 -0500
Subject: [PATCH] Adds a link to individual logs on the player panel and moves
 the other one

---
 code/modules/admin/admin.dm        |  4 ++--
 code/modules/admin/player_panel.dm |  3 ++-
 tgstation.dme                      |  2 +-
 tgstation.dme.rej                  | 11 +++++++++++
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 tgstation.dme.rej

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 94cb8a4e95..37aeecadca 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -42,7 +42,8 @@
 	body += "<a href='?_src_=holder;traitor=\ref[M]'>TP</a> - "
 	body += "<a href='?priv_msg=[M.ckey]'>PM</a> - "
 	body += "<a href='?_src_=holder;subtlemessage=\ref[M]'>SM</a> - "
-	body += "<a href='?_src_=holder;adminplayerobservefollow=\ref[M]'>FLW</a>\] </b><br>"
+	body += "<a href='?_src_=holder;adminplayerobservefollow=\ref[M]'>FLW</a> - "
+	body += "<a href='?_src_=holder;individuallog=\ref[M]'>LOGS</a>\] <b><br>"
 
 	body += "<b>Mob type</b> = [M.type]<br><br>"
 
@@ -81,7 +82,6 @@
 	body += "<A href='?_src_=holder;traitor=\ref[M]'>Traitor panel</A> | "
 	body += "<A href='?_src_=holder;narrateto=\ref[M]'>Narrate to</A> | "
 	body += "<A href='?_src_=holder;subtlemessage=\ref[M]'>Subtle message</A> | "
-	body += "<A href='?_src_=holder;individuallog=\ref[M]'>Individual Round Logs</A> | "
 	body += "<A href='?_src_=holder;languagemenu=\ref[M]'>Language Menu</A>"
 
 	if (M.client)
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index d2630b5f31..bfa8553d52 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -81,7 +81,8 @@
 					body += "<a href='?_src_=holder;traitor="+ref+"'>TP</a> - "
 					body += "<a href='?priv_msg="+ckey+"'>PM</a> - "
 					body += "<a href='?_src_=holder;subtlemessage="+ref+"'>SM</a> - "
-					body += "<a href='?_src_=holder;adminplayerobservefollow="+ref+"'>FLW</a><br>"
+					body += "<a href='?_src_=holder;adminplayerobservefollow="+ref+"'>FLW</a> - "
+					body += "<a href='?_src_=holder;individuallog="+ref+"'>LOGS</a><br>"
 					if(antagonist > 0)
 						body += "<font size='2'><a href='?_src_=holder;secrets=check_antagonist'><font color='red'><b>Antagonist</b></font></a></font>";
 
diff --git a/tgstation.dme b/tgstation.dme
index a7c4fe7118..97e665b378 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -686,8 +686,8 @@
 #include "code\game\objects\effects\mines.dm"
 #include "code\game\objects\effects\misc.dm"
 #include "code\game\objects\effects\overlays.dm"
-#include "code\game\objects\effects\portals.dm"
 #include "code\game\objects\effects\proximity.dm"
+#include "code\game\objects\effects\portals.dm"
 #include "code\game\objects\effects\spiders.dm"
 #include "code\game\objects\effects\step_triggers.dm"
 #include "code\game\objects\effects\wanted_poster.dm"
diff --git a/tgstation.dme.rej b/tgstation.dme.rej
new file mode 100644
index 0000000000..0f6ea014d0
--- /dev/null
+++ b/tgstation.dme.rej
@@ -0,0 +1,11 @@
+diff a/tgstation.dme b/tgstation.dme	(rejected hunks)
+@@ -657,8 +657,8 @@
+ #include "code\game\objects\effects\mines.dm"
+ #include "code\game\objects\effects\misc.dm"
+ #include "code\game\objects\effects\overlays.dm"
+-#include "code\game\objects\effects\proximity.dm"
+ #include "code\game\objects\effects\portals.dm"
++#include "code\game\objects\effects\proximity.dm"
+ #include "code\game\objects\effects\spiders.dm"
+ #include "code\game\objects\effects\step_triggers.dm"
+ #include "code\game\objects\effects\wanted_poster.dm"