From f4e2d30749254af82945e8b7be625a3f3cb5d351 Mon Sep 17 00:00:00 2001 From: ChuckTheSheep Date: Tue, 4 Mar 2014 14:55:03 -0500 Subject: [PATCH] Made uplink_owner key rather than name Had issues with clowns/mimes/nuke ops due to name changes. --- code/game/gamemodes/nuclear/nuclear.dm | 4 ++-- code/game/gamemodes/traitor/traitor.dm | 6 +++--- code/game/objects/items/weapons/implants/implantuplink.dm | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index f3939bee819..448947cda82 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -210,7 +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]" + U.hidden_uplink.uplink_owner="[synd_mob.key]" U.hidden_uplink.uses = 10 synd_mob.equip_to_slot_or_del(U, slot_in_backpack) @@ -324,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 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 976ab5d719d..345dfa1943c 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -198,7 +198,7 @@ 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 @@ -272,7 +272,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 +282,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