From 7b244b40fb16e832fee7e8bd3c3093f47d65d676 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Fri, 17 Nov 2017 23:25:20 -0500
Subject: [PATCH] Update changeling.dm

---
 code/game/gamemodes/changeling/changeling.dm | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index 914937e9e3..57c871b8ae 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -113,31 +113,21 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
 			if(changeling.objectives.len)
 				var/count = 1
 				for(var/datum/objective/objective in changeling.objectives)
-<<<<<<< HEAD
 					if(istype(objective, /datum/objective/crew))
 						if(objective.check_completion())
 							text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <font color='green'><b>Success!</b></font> <font color='grey'>(Optional)</font>"
-							SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS")
+							SSblackbox.record_feedback("nested tally", "changeling_objective", 1, list("[objective.type]", "SUCCESS"))
 						else
 							text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='danger'>Fail.</span> <font color='grey'>(Optional)</font>"
-							SSblackbox.add_details("changeling_objective","[objective.type]|FAIL")
+							SSblackbox.record_feedback("nested tally", "changeling_objective", 1, list("[objective.type]", "FAIL"))
 					else
 						if(objective.check_completion())
 							text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <font color='green'><b>Success!</b></font>"
-							SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS")
+							SSblackbox.record_feedback("nested tally", "changeling_objective", 1, list("[objective.type]", "SUCCESS"))
 						else
 							text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='danger'>Fail.</span>"
-							SSblackbox.add_details("changeling_objective","[objective.type]|FAIL")
+							SSblackbox.record_feedback("nested tally", "changeling_objective", 1, list("[objective.type]", "FAIL"))
 							changelingwin = 0
-=======
-					if(objective.check_completion())
-						text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <font color='green'><b>Success!</b></font>"
-						SSblackbox.record_feedback("nested tally", "changeling_objective", 1, list("[objective.type]", "SUCCESS"))
-					else
-						text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='danger'>Fail.</span>"
-						SSblackbox.record_feedback("nested tally", "changeling_objective", 1, list("[objective.type]", "FAIL"))
-						changelingwin = 0
->>>>>>> 8b19b49... JSON feedback (#32188)
 					count++
 
 			if(changelingwin)
@@ -191,4 +181,4 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
 		if(equip)
 			user.equip_to_slot_or_del(C, GLOB.slot2slot[slot])
 
-	user.regenerate_icons()
\ No newline at end of file
+	user.regenerate_icons()