Merge pull request #2983 from ChuckTheSheep/TC-Green-Text

Fix  for Nuker's TC Green Text.

code/game/gamemodes/nuclear/nuclear.dm

@@ -210,6 +210,7 @@
 	synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(synd_mob.back), slot_in_backpack)
 
 	var/obj/item/device/radio/uplink/U = new /obj/item/device/radio/uplink(synd_mob)
+	U.hidden_uplink.uplink_owner="[synd_mob.key]"
 	U.hidden_uplink.uses = 10
 	synd_mob.equip_to_slot_or_del(U, slot_in_backpack)
 
@@ -323,7 +324,7 @@
 			text += ")"
 
 			for(var/obj/item/device/uplink/H in world_uplinks)
-				if(H && H.uplink_owner && H.uplink_owner==syndicate.name)
+				if(H && H.uplink_owner && H.uplink_owner==syndicate.key)
 					TC_uses += H.used_TC
 					purchases += H.purchase_log
 
@@ -331,6 +332,9 @@
 
 		text += "(Syndicates used [TC_uses] TC) [purchases]"
 
+		if(TC_uses==0 && station_was_nuked && !is_operatives_are_dead())
+			text += "<IMG CLASS=icon SRC=\ref['icons/BadAss.dmi'] ICONSTATE='badass'>"
+
 		world << text
 	return 1
 

code/game/gamemodes/traitor/traitor.dm

@@ -198,26 +198,31 @@
 			var/uplink_true = 0
 			var/purchases = ""
 			for(var/obj/item/device/uplink/H in world_uplinks)
-				if(H && H.uplink_owner && H.uplink_owner==traitor.name)
+				if(H && H.uplink_owner && H.uplink_owner==traitor.key)
 					TC_uses += H.used_TC
 					uplink_true=1
 					purchases += H.purchase_log
 
-			if(uplink_true) text += " (used [TC_uses] TC) [purchases]"
-
-
+			var/objectives = ""
 			if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this.
 				var/count = 1
 				for(var/datum/objective/objective in traitor.objectives)
 					if(objective.check_completion())
-						text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
+						objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
 						feedback_add_details("traitor_objective","[objective.type]|SUCCESS")
 					else
-						text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
+						objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
 						feedback_add_details("traitor_objective","[objective.type]|FAIL")
 						traitorwin = 0
 					count++
 
+			if(uplink_true)
+				text += " (used [TC_uses] TC) [purchases]"
+				if(TC_uses==0 && traitorwin)
+					text += "<IMG CLASS=icon SRC=\ref['icons/BadAss.dmi'] ICONSTATE='badass'>"
+
+			text += objectives
+
 			var/special_role_text
 			if(traitor.special_role)
 				special_role_text = lowertext(traitor.special_role)
@@ -272,7 +277,7 @@
 
 			var/obj/item/device/uplink/hidden/T = new(R)
 			target_radio.hidden_uplink = T
-			T.uplink_owner = "[traitor_mob]"
+			T.uplink_owner = "[traitor_mob.key]"
 			target_radio.traitor_frequency = freq
 			traitor_mob << "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features."
 			traitor_mob.mind.store_memory("<B>Radio Freq:</B> [format_frequency(freq)] ([R.name] [loc]).")
@@ -282,7 +287,7 @@
 
 			var/obj/item/device/uplink/hidden/T = new(R)
 			R.hidden_uplink = T
-			T.uplink_owner = "[traitor_mob]"
+			T.uplink_owner = "[traitor_mob.key]"
 			var/obj/item/device/pda/P = R
 			P.lock_code = pda_pass
 

code/game/objects/items/weapons/implants/implantuplink.dm

@@ -14,7 +14,7 @@
 	activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
 	source.mind.store_memory("Uplink implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
 	source << "The implanted uplink implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate."
-	hidden_uplink.uplink_owner="[source]"
+	hidden_uplink.uplink_owner="[source.key]"
 	return 1