From e4dc160cefad7ca99dab16f0bd170aa0ec4fdf57 Mon Sep 17 00:00:00 2001
From: Razgriz <razgriz1032@gmail.com>
Date: Thu, 21 May 2020 03:45:47 -0700
Subject: [PATCH] Update examine.dm

---
 code/modules/mob/living/carbon/human/examine.dm | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 5965b70b76..5130060738 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -278,24 +278,13 @@
 			msg += "<span class='warning'>[T.He] [T.has] \a [o.splinted] on [T.his] [o.name]!</span>"
 
 	if(suiciding)
-<<<<<<< HEAD
-		msg += "<span class='warning'>[T.He] appears to have commited suicide... there is no hope of recovery.</span><br>"
-
-	msg += attempt_vr(src,"examine_weight",args) //VOREStation Code
-	msg += attempt_vr(src,"examine_nutrition",args) //VOREStation Code
-	msg += attempt_vr(src,"examine_reagent_bellies",args) //CHOMP reagent bellies
-	msg += attempt_vr(src,"examine_bellies",args) //VOREStation Code
-	msg += attempt_vr(src,"examine_pickup_size",args) //VOREStation Code
-	msg += attempt_vr(src,"examine_step_size",args) //VOREStation Code
-	msg += attempt_vr(src,"examine_nif",args) //VOREStation Code
-	msg += attempt_vr(src,"examine_chimera",args) //VOREStation Code
-=======
 		msg += "<span class='warning'>[T.He] appears to have commited suicide... there is no hope of recovery.</span>"
 
 	//VOREStation Add
 	var/list/vorestrings = list()
 	vorestrings += examine_weight()
 	vorestrings += examine_nutrition()
+	vorestrings += examine_reagent_bellies() //CHOMP reagent bellies
 	vorestrings += examine_bellies()
 	vorestrings += examine_pickup_size()
 	vorestrings += examine_step_size()
@@ -306,7 +295,6 @@
 			vorestrings -= entry
 	msg += vorestrings
 	//VOREStation Add End
->>>>>>> e791692aea59a96b1b45c20d61974aa10493a7f6
 
 	if(mSmallsize in mutations)
 		msg += "[T.He] [T.is] very short!"