diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 9a422e41904..b03f7ef275b 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/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 += "
"
+
world << text
return 1
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index 976ab5d719d..2ba796e294f 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/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 += "
Objective #[count]: [objective.explanation_text] Success!"
+ objectives += "
Objective #[count]: [objective.explanation_text] Success!"
feedback_add_details("traitor_objective","[objective.type]|SUCCESS")
else
- text += "
Objective #[count]: [objective.explanation_text] Fail."
+ objectives += "
Objective #[count]: [objective.explanation_text] Fail."
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 += "
"
+
+ 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("Radio Freq: [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
diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm
index 325e53cce16..394c736c3cc 100644
--- a/code/game/objects/items/weapons/implants/implantuplink.dm
+++ b/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, say *[src.activation_emote] to attempt to activate.", 0, 0)
source << "The implanted uplink implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate."
- hidden_uplink.uplink_owner="[source]"
+ hidden_uplink.uplink_owner="[source.key]"
return 1
diff --git a/icons/BadAss.dmi b/icons/BadAss.dmi
new file mode 100644
index 00000000000..fcf27d53e60
Binary files /dev/null and b/icons/BadAss.dmi differ