From e97bc1028e085b8592efa8a3b501f2126699e420 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 12 Nov 2017 14:09:20 -0600 Subject: [PATCH] Update examine.dm --- code/modules/mob/living/carbon/human/examine.dm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index c42327d632..dd101bbb8c 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -336,23 +336,11 @@ R = find_record("name", perpname, GLOB.data_core.security) if(R) criminal = R.fields["criminal"] - -<<<<<<< HEAD - msg += "Criminal status: \[[criminal]\]\n" - msg += "Security record: \[View\] " - msg += "\[Add crime\] " - msg += "\[View comment log\] " - msg += "\[Add comment\]\n" - if(print_flavor_text() && get_visible_name() != "Unknown")//Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation. - msg += "[print_flavor_text()]\n" - -======= msg += "Criminal status: \[[criminal]\]\n" msg += "Security record: \[View\] " msg += "\[Add crime\] " msg += "\[View comment log\] " msg += "\[Add comment\]\n" ->>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental msg += "*---------*" to_chat(user, msg)