From b83369be421fdf3aa36780c3cf2fdcdf6105f4cc Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Mon, 24 Jun 2019 13:40:15 +0200
Subject: [PATCH] Fixes ambitions to actually appear at roundend (#6608)

The issue emerged that Aurora doesn't actually give antagonists objectives, so the if statement was never fulfilled. This places ambitions outside the if statement. If an ambition is set now, it will display like this (minus the objectives of course):
---
 code/game/antagonist/antagonist_print.dm |  6 ++--
 code/game/antagonist/outsider/wizard.dm  |  3 ++
 html/changelogs/geeves-ambitionfix.yml   | 41 ++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/geeves-ambitionfix.yml

diff --git a/code/game/antagonist/antagonist_print.dm b/code/game/antagonist/antagonist_print.dm
index dfd0ef9b8f1..542597c5e6e 100644
--- a/code/game/antagonist/antagonist_print.dm
+++ b/code/game/antagonist/antagonist_print.dm
@@ -7,12 +7,12 @@
 	for(var/datum/mind/P in current_antagonists)
 		text += print_player_full(P)
 		text += get_special_objective_text(P)
+		if(P.ambitions)
+			text += "<br><font color='purple'><b>Their goals for today were:</b></font>"
+			text += "<br>  '[P.ambitions]'"
 		if(!global_objectives.len && P.objectives && P.objectives.len)
 			var/failed
 			var/num = 1
-			if(P.ambitions)
-				text += "<br>Their goals for today were..."
-				text += "<br><b>[P.ambitions]</b>"
 
 			for(var/datum/objective/O in P.objectives)
 				text += print_objective(O, num)
diff --git a/code/game/antagonist/outsider/wizard.dm b/code/game/antagonist/outsider/wizard.dm
index e29a1e26e4a..afdac9ea5b8 100644
--- a/code/game/antagonist/outsider/wizard.dm
+++ b/code/game/antagonist/outsider/wizard.dm
@@ -115,6 +115,9 @@ var/datum/antagonist/wizard/wizards
 				var/spell/spell = s
 				text += "<br><b>[spell.name]</b> - "
 				text += "Speed: [spell.spell_levels["speed"]] Power: [spell.spell_levels["power"]]"
+		if(player.ambitions)
+			text += "<br><font color='purple'><b>Their goals for today were:</b></font>"
+			text += "<br>  '[player.ambitions]'"
 		text += "<br>"
 		to_world(text)
 
diff --git a/html/changelogs/geeves-ambitionfix.yml b/html/changelogs/geeves-ambitionfix.yml
new file mode 100644
index 00000000000..d008a092634
--- /dev/null
+++ b/html/changelogs/geeves-ambitionfix.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Geeves
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Fixed antagonist ambitions to actually appear at round end. Remember to set them in the IC tab!"