Replaces antag intro text and objective announcement with a proc.

code/game/gamemodes/autotraitor/autotraitor.dm

@@ -136,14 +136,9 @@
 				newtraitor << "<B>You are now a traitor.</B>"
 				newtraitor.mind.special_role = "traitor"
 				newtraitor.hud_updateflag |= 1 << SPECIALROLE_HUD
-				var/obj_count = 1
-				newtraitor << "\blue Your current objectives:"
-				if(!config.objectives_disabled)
-					for(var/datum/objective/objective in newtraitor.mind.objectives)
-						newtraitor << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-						obj_count++
-				else
-					newtraitor << "<i>You have been selected this round as an antagonist- <font color=blue>Within the rules,</font> try to act as an opposing force to the crew- This can be via corporate payoff, personal motives, or maybe just being a dick. Further RP and try to make sure other players have </i>fun<i>! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! <b>Please remember all rules aside from those without explicit exceptions apply to antagonist.</i></b>"
+				newtraitor << "<i>You have been selected this round as an antagonist!</i>"
+				show_objectives(newtraitor.mind)
+
 			//else
 				//message_admins("No new traitor being added.")
 		//else
@@ -194,14 +189,9 @@
 				traitors += character.mind
 				character << "\red <B>You are the traitor.</B>"
 				character.mind.special_role = "traitor"
-				if (config.objectives_disabled)
-					character << "<i>You have been selected this round as an antagonist- <font color=blue>Within the rules,</font> try to act as an opposing force to the crew- This can be via corporate payoff, personal motives, or maybe just being a dick. Further RP and try to make sure other players have </i>fun<i>! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! <b>Please remember all rules aside from those without explicit exceptions apply to antagonist.</i></b>"
-				else
-					var/obj_count = 1
-					character << "\blue Your current objectives:"
-					for(var/datum/objective/objective in character.mind.objectives)
-						character << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-						obj_count++
+				character << "<i>You have been selected this round as an antagonist</i>!"
+				show_objectives(character.mind)
+
 			//else
 				//message_admins("New traitor roll failed.  No new traitor.")
 	//else

code/game/gamemodes/calamity/calamity.dm

@@ -7,7 +7,7 @@
  * ~ Zuhayr
  */
 
-//temp, move these somewhere appropriate and change all the other references to use it.
+//temp, move these somewhere appropriate
 /proc/show_generic_antag_text(var/datum/mind/player)
 	if(player.current)
 		player.current << \
@@ -19,7 +19,13 @@
 		rules aside from those without explicit exceptions apply to antagonists.</b>"
 
 /proc/show_objectives(var/datum/mind/player)
+
 	if(!player || !player.current) return
+
+	if(config.objectives_disabled)
+		show_generic_antag_text(player)
+		return
+
 	var/obj_count = 1
 	player.current << "\blue Your current objectives:"
 	for(var/datum/objective/objective in player.objectives)
@@ -262,11 +268,7 @@
 		spawn(0)
 			NukeNameAssign(player)
 
-		if(!config.objectives_disabled)
-			forge_syndicate_objectives(player)
-		else
-			show_generic_antag_text(player)
-
+		forge_syndicate_objectives(player)
 		greet_syndicate(player)
 		equip_syndicate(player.current)
 
@@ -296,9 +298,8 @@
 		if(!config.objectives_disabled)
 			player.objectives += new /datum/objective/escape()
 			player.objectives += new /datum/objective/survive()
-		else
-			show_generic_antag_text(player)
 
+		show_objectives(player)
 		greet_changeling(player)
 
 /datum/game_mode/calamity/proc/spawn_traitors(var/list/candidates)
@@ -309,8 +310,8 @@
 		if(!config.objectives_disabled)
 			player.objectives += new /datum/objective/escape()
 			player.objectives += new /datum/objective/survive()
-		else
-			show_generic_antag_text(player)
+
+		show_objectives(player)
 
 		finalize_traitor(player)
 		greet_traitor(player)
@@ -323,8 +324,8 @@
 		if(!config.objectives_disabled)
 			player.objectives += new /datum/objective/escape()
 			player.objectives += new /datum/objective/survive()
-		else
-			show_generic_antag_text(player)
+
+		show_objectives(player)
 
 		player.current.loc = pick(wizardstart)
 
@@ -353,8 +354,8 @@
 		if(!config.objectives_disabled)
 			player.objectives += new /datum/objective/ninja_highlander()
 			player.objectives += new /datum/objective/survive()
-		else
-			show_generic_antag_text(player)
+
+		show_objectives(player)
 
 		//Ninja objective announcement goes here.
 
@@ -435,9 +436,8 @@
 			player.objectives += new /datum/objective/borer_survive()
 			player.objectives += new /datum/objective/borer_reproduce()
 			player.objectives += new /datum/objective/escape()
-			show_objectives(player)
-		else
-			show_generic_antag_text(player)
+
+		show_objectives(player)
 
 /datum/game_mode/calamity/proc/spawn_cultists(var/list/candidates)
 
@@ -471,7 +471,6 @@
 
 			player.objectives += new /datum/objective/escape()
 			player.objectives += new /datum/objective/survive()
-			show_objectives(player)
-		else
-			show_generic_antag_text(player)
+
+		show_objectives(player)
 		player.special_role = "Cultist"

code/game/gamemodes/changeling/changeling.dm

@@ -125,23 +125,13 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 		changeling.current << "<B>\red You are a changeling!</B>"
 	changeling.current << "<b>\red Use say \":g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them.</b>"
 
-	if(config.objectives_disabled)
-		changeling.current << "<font color=blue>Within the rules,</font> try to act as an opposing force to the crew. Further RP and try to make sure other players have </i>fun<i>! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! <b>Please remember all rules aside from those without explicit exceptions apply to antagonists.</i></b>"
-
-	if (!config.objectives_disabled)
-		changeling.current << "<B>You must complete the following tasks:</B>"
+	show_objectives(changeling)
 
 	if (changeling.current.mind)
 		if (changeling.current.mind.assigned_role == "Clown")
 			changeling.current << "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself."
 			changeling.current.mutations.Remove(CLUMSY)
 
-	if (!config.objectives_disabled)
-		var/obj_count = 1
-		for(var/datum/objective/objective in changeling.objectives)
-			changeling.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-			obj_count++
-		return
 
 /*/datum/game_mode/changeling/check_finished()
 	var/changelings_alive = 0

code/game/gamemodes/cult/cult.dm

@@ -100,8 +100,7 @@
 		cult_mind.current << "\blue You are a member of the cult!"
 		if(!config.objectives_disabled)
 			memorize_cult_objectives(cult_mind)
-		else
-			cult_mind.current << "<font color=blue>Within the rules,</font> try to act as an opposing force to the crew. Further RP and try to make sure other players have </i>fun<i>! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! <b>Please remember all rules aside from those without explicit exceptions apply to antagonists.</i></b>"
+		show_objectives(cult_mind)
 		cult_mind.special_role = "Cultist"
 
 	spawn (rand(waittime_l, waittime_h))

code/game/gamemodes/events/space_ninja.dm

@@ -375,12 +375,7 @@ Malf AIs/silicons aren't added. Monkeys aren't added. Messes with objective comp
 			var/directive = generate_ninja_directive(side)
 			new_ninja << "\blue \nYou are an elite mercenary assassin of the Spider Clan, [new_ninja.real_name]. The dreaded \red <B>SPACE NINJA</B>!\blue You have a variety of abilities at your disposal, thanks to your nano-enhanced cyber armor. Remember your training (initialize your suit by right clicking on it)! \nYour current directive is: \red <B>[directive]</B>"
 			new_ninja.mind.store_memory("<B>Directive:</B> \red [directive]<br>")
-
-			var/obj_count = 1
-			new_ninja << "\blue Your current objectives:"
-			for(var/datum/objective/objective in ninja_mind.objectives)
-				new_ninja << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-				obj_count++
+			show_objectives(new_ninja.mind)
 
 		sent_ninja_to_station = 1//And we're done.
 		return new_ninja//Return the ninja in case we need to reference them later.

code/game/gamemodes/heist/heist.dm

@@ -177,14 +177,7 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
 	raider.current << "\blue Vox are cowardly and will flee from larger groups, but corner one or find them en masse and they are vicious."
 	raider.current << "\blue Use :V to voxtalk, :H to talk on your encrypted channel, and don't forget to turn on your nitrogen internals!"
 	raider.current << "\red IF YOU HAVE NOT PLAYED A VOX BEFORE, REVIEW THIS THREAD: http://baystation12.net/forums/viewtopic.php?f=6&t=8657."
-	var/obj_count = 1
-	if(!config.objectives_disabled)
-		for(var/datum/objective/objective in raider.objectives)
-			raider.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-			obj_count++
-	else
-		raider.current << "<font color=blue>Within the rules,</font> try to act as an opposing force to the crew or come up with other fun ideas. Further RP and try to make sure other players have </i>fun<i>! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! <b>Please remember all rules aside from those without explicit exceptions apply to antagonists.</i></b>"
-
+	show_objectives(raider)
 
 /datum/game_mode/heist/declare_completion()
 

code/game/gamemodes/meme/meme.dm

@@ -131,11 +131,7 @@
 /datum/game_mode/proc/greet_meme(var/datum/mind/meme, var/you_are=1)
 	if (you_are)
 		meme.current << "<B>\red You are a meme!</B>"
-
-	var/obj_count = 1
-	for(var/datum/objective/objective in meme.objectives)
-		meme.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-		obj_count++
+	show_objectives(meme)
 	return
 
 /datum/game_mode/meme/check_finished()

code/game/gamemodes/ninja/ninja.dm

@@ -56,8 +56,8 @@
 		if(ninja.current && !(istype(ninja.current,/mob/living/carbon/human))) return 0
 		if(!config.objectives_disabled)
 			forge_ninja_objectives(ninja)
-		else
-			ninja.current << "<font color=blue>Within the rules,</font> try to act as an opposing force to the crew. Further RP and try to make sure other players have </i>fun<i>! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! <b>Please remember all rules aside from those without explicit exceptions apply to antagonists.</i></b>"
+		show_objectives(ninja)
+
 		var/mob/living/carbon/human/N = ninja.current
 		N.internal = N.s_store
 		N.internals.icon_state = "internal1"
@@ -139,11 +139,7 @@
 	ninja.current << "You are an elite mercenary assassin of the Spider Clan, [ninja.current.real_name]. You have a variety of abilities at your disposal, thanks to your nano-enhanced cyber armor.\nYour current directive is: \red <B>[directive]</B>\n \blue Try your best to adhere to this."
 	ninja.store_memory("<B>Directive:</B> \red [directive]<br>")
 
-	var/obj_count = 1
-	ninja.current << "\blue Your current objectives:"
-	for(var/datum/objective/objective in ninja.objectives)
-		ninja.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-		obj_count++
+	show_objectives(ninja)
 
 /datum/game_mode/proc/auto_declare_completion_ninja()
 	if(ninjas.len)

code/game/gamemodes/nuclear/nuclear.dm

@@ -138,8 +138,8 @@ var/global/list/turf/synd_spawn = list()
 		synd_mind.current.real_name = "[syndicate_name()] Operative" // placeholder while we get their actual name
 		spawn(0)
 			NukeNameAssign(synd_mind)
-		if(!config.objectives_disabled)
-			forge_syndicate_objectives(synd_mind)
+
+		forge_syndicate_objectives(synd_mind)
 		greet_syndicate(synd_mind)
 		equip_syndicate(synd_mind.current)
 
@@ -187,25 +187,18 @@ var/global/list/turf/synd_spawn = list()
 
 
 /datum/game_mode/proc/forge_syndicate_objectives(var/datum/mind/syndicate)
+
 	if (config.objectives_disabled)
 		return
+
 	var/datum/objective/nuclear/syndobj = new
 	syndobj.owner = syndicate
 	syndicate.objectives += syndobj
 
-
 /datum/game_mode/proc/greet_syndicate(var/datum/mind/syndicate, var/you_are=1)
 	if (you_are)
 		syndicate.current << "\blue You are a [syndicate_name()] agent!"
-	var/obj_count = 1
-	if(!config.objectives_disabled)
-		for(var/datum/objective/objective in syndicate.objectives)
-			syndicate.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-			obj_count++
-	else
-		syndicate.current << "<font color=blue>Within the rules,</font> try to act as an opposing force to the crew. Further RP and try to make sure other players have </i>fun<i>! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! <b>Please remember all rules aside from those without explicit exceptions apply to antagonists.</i></b>"
-	return
-
+	show_objectives(syndicate)
 
 /datum/game_mode/proc/random_radio_frequency()
 	return 1337 // WHY??? -- Doohl

code/game/gamemodes/revolution/revolution.dm

@@ -118,16 +118,13 @@
 			rev_mind.objectives += rev_obj
 
 /datum/game_mode/proc/greet_revolutionary(var/datum/mind/rev_mind, var/you_are=1)
-	var/obj_count = 1
+
+	rev_mind.special_role = "Head Revolutionary"
+
 	if (you_are)
 		rev_mind.current << "\blue You are a member of the revolutionaries' leadership!"
-	if(!config.objectives_disabled)
-		for(var/datum/objective/objective in rev_mind.objectives)
-			rev_mind.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-			rev_mind.special_role = "Head Revolutionary"
-			obj_count++
-	else
-		rev_mind.current << "<font color=blue>Within the rules,</font> try to act as an opposing force to the crew. Further RP and try to make sure other players have </i>fun<i>! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! <b>Please remember all rules aside from those without explicit exceptions apply to antagonists.</i></b>"
+
+	show_objectives(rev_mind)
 
 /////////////////////////////////////////////////////////////////////////////////
 //This are equips the rev heads with their gear, and makes the clown not clumsy//
@@ -198,8 +195,7 @@
 	revolutionaries += rev_mind
 	rev_mind.current << "\red <FONT size = 3> You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!</FONT>"
 	rev_mind.special_role = "Revolutionary"
-	if(config.objectives_disabled)
-		rev_mind.current << "<font color=blue>Within the rules,</font> try to act as an opposing force to the crew. Further RP and try to make sure other players have </i>fun<i>! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! <b>Please remember all rules aside from those without explicit exceptions apply to antagonists.</i></b>"
+	show_objectives(rev_mind)
 	update_rev_icons_added(rev_mind)
 	return 1
 //////////////////////////////////////////////////////////////////////////////

code/game/gamemodes/revolution/rp-revolution.dm

@@ -87,11 +87,8 @@
 		update_rev_icons_added(rev_mind)
 
 	for(var/datum/mind/rev_mind in head_revolutionaries)
-		var/obj_count = 1
 		rev_mind.current << "\blue You are a member of the revolutionaries' leadership!"
-		for(var/datum/objective/objective in rev_mind.objectives)
-			rev_mind.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-			obj_count++
+		show_objectives(rev_mind)
 
 	spawn (rand(waittime_l, waittime_h))
 		send_intercept()

code/game/gamemodes/revolution/rp_revolution.dm

@@ -78,16 +78,10 @@
 		send_intercept()
 
 /datum/game_mode/revolution/rp_revolution/greet_revolutionary(var/datum/mind/rev_mind, var/you_are=1)
-	var/obj_count = 1
+	rev_mind.special_role = "Head Revolutionary"
 	if (you_are)
 		rev_mind.current << "\blue You are a member of the revolutionaries' leadership!"
-	if(!config.objectives_disabled)
-		for(var/datum/objective/objective in rev_mind.objectives)
-			rev_mind.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-			rev_mind.special_role = "Head Revolutionary"
-			obj_count++
-	else
-		rev_mind.current << "<font color=blue>Within the rules,</font> try to act as an opposing force to the crew. Further RP and try to make sure other players have </i>fun<i>! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! <b>Please remember all rules aside from those without explicit exceptions apply to antagonists.</i></b>"
+	show_objectives(rev_mind)
 
 	// Show each head revolutionary up to 3 candidates
 	var/list/already_considered = list()
@@ -113,8 +107,7 @@
 	revolutionaries += rev_mind
 	rev_mind.current << "\red <FONT size = 3> You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill, capture or convert the heads to win the revolution!</FONT>"
 	rev_mind.special_role = "Revolutionary"
-	if(config.objectives_disabled)
-		rev_mind.current << "<font color=blue>Within the rules,</font> try to act as an opposing force to the crew. Further RP and try to make sure other players have </i>fun<i>! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! <b>Please remember all rules aside from those without explicit exceptions apply to antagonists.</i></b>"
+	show_objectives(rev_mind)
 	update_rev_icons_added(rev_mind)
 	H.hud_updateflag |= 1 << SPECIALROLE_HUD
 	return 1

code/game/gamemodes/traitor/traitor.dm

@@ -135,14 +135,7 @@
 
 /datum/game_mode/proc/greet_traitor(var/datum/mind/traitor)
 	traitor.current << "<B><font size=3 color=red>You are the traitor.</font></B>"
-	if (!config.objectives_disabled)
-		var/obj_count = 1
-		for(var/datum/objective/objective in traitor.objectives)
-			traitor.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-			obj_count++
-	else
-		traitor.current << "<i>You have been selected this round as an antagonist- <font color=blue>Within the rules,</font> try to act as an opposing force to the crew- This can be via corporate payoff, personal motives, or maybe just being a dick. Further RP and try to make sure other players have </i>fun<i>! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! <b>Please remember all rules aside from those without explicit exceptions apply to antagonist.</i></b>"
-	return
+	show_objectives(traitor)
 
 
 /datum/game_mode/proc/finalize_traitor(var/datum/mind/traitor)

code/game/gamemodes/wizard/rightandwrong.dm

@@ -13,10 +13,8 @@
 			survive.owner = H.mind
 			H.mind.objectives += survive
 			H << "<B>You are the survivor! Your own safety matters above all else, trust no one and kill anyone who gets in your way. However, armed as you are, now would be the perfect time to settle that score or grab that pair of yellow gloves you've been eyeing...</B>"
-			var/obj_count = 1
-			for(var/datum/objective/OBJ in H.mind.objectives)
-				H << "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]"
-				obj_count++
+			show_objectives(H.mind)
+
 		var/randomize = pick("taser","egun","laser","revolver","detective","smg","nuclear","deagle","gyrojet","pulse","silenced","cannon","doublebarrel","shotgun","combatshotgun","mateba","smg","uzi","crossbow","saw")
 		switch (randomize)
 			if("taser")

code/game/gamemodes/wizard/wizard.dm

@@ -135,16 +135,7 @@
 /datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1)
 	if (you_are)
 		wizard.current << "<B>\red You are the Space Wizard!</B>"
-	wizard.current << "<B>The Space Wizards Federation has given you the following tasks:</B>"
-	if(!config.objectives_disabled)
-		var/obj_count = 1
-		for(var/datum/objective/objective in wizard.objectives)
-			wizard.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-			obj_count++
-	else
-		wizard.current << "<font color=blue>Within the rules,</font> try to act as an opposing force to the crew. Further RP and try to make sure other players have </i>fun<i>! If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! Think through your actions and make the roleplay immersive! <b>Please remember all rules aside from those without explicit exceptions apply to antagonists.</i></b>"
-	return
-
+	show_objectives(wizard)
 
 /*/datum/game_mode/proc/learn_basic_spells(mob/living/carbon/human/wizard_mob)
 	if (!istype(wizard_mob))

code/game/machinery/syndicatebeacon.dm

@@ -86,11 +86,7 @@
 				M << "<B>You have joined the ranks of the Syndicate and become a traitor to the station!</B>"
 
 				message_admins("[N]/([N.ckey]) has accepted a traitor objective from a syndicate beacon.")
-
-				var/obj_count = 1
-				for(var/datum/objective/OBJ in M.mind.objectives)
-					M << "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]"
-					obj_count++
+				show_objectives(M.mind)
 
 		src.add_fingerprint(usr)
 		src.updateUsrDialog()

code/game/machinery/wishgranter.dm

@@ -66,11 +66,7 @@
 		silence.owner = user.mind
 		user.mind.objectives += silence
 
-		var/obj_count = 1
-		for(var/datum/objective/OBJ in user.mind.objectives)
-			user << "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]"
-			obj_count++
-
+		show_objectives(user.mind)
 		user << "You have a very bad feeling about this."
 
 	return