From 7a8480b1a5100a234ca9ff98c61d306848b4966a Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 25 Jun 2016 18:59:10 -0700 Subject: [PATCH] more text changes --- code/datums/mind.dm | 18 +++++++++--------- .../shadowling/shadowling_abilities.dm | 6 +++--- .../weapons/implants/implant_mindshield.dm | 6 +++--- code/modules/mob/living/carbon/superheroes.dm | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 5d018d7b172..8fd0fe1358b 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -653,27 +653,27 @@ if(I && I.implanted) I.removed(H) qdel(I) - to_chat(H, "\blue Your loyalty implant has been deactivated.") - log_admin("[key_name(usr)] has deactivated [key_name(current)]'s loyalty implant") - message_admins("[key_name_admin(usr)] has deactivated [key_name_admin(current)]'s loyalty implant") + to_chat(H, "\blue Your mindshield implant has been deactivated.") + log_admin("[key_name(usr)] has deactivated [key_name(current)]'s mindshield implant") + message_admins("[key_name_admin(usr)] has deactivated [key_name_admin(current)]'s mindshield implant") if("add") var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 H.sec_hud_set_implants() - log_admin("[key_name(usr)] has given [key_name(current)] a loyalty implant") - message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] a loyalty implant") + log_admin("[key_name(usr)] has given [key_name(current)] a mindshield implant") + message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] a mindshield implant") - to_chat(H, "\red You somehow have become the recepient of a loyalty transplant, and it just activated!") + to_chat(H, "\red You somehow have become the recepient of a mindshield transplant, and it just activated!") if(src in ticker.mode.revolutionaries) special_role = null ticker.mode.revolutionaries -= src - to_chat(src, "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!") + to_chat(src, "\red The nanobots in the mindshield implant remove all thoughts about being a revolutionary. Get back to work!") if(src in ticker.mode.head_revolutionaries) special_role = null ticker.mode.head_revolutionaries -=src - to_chat(src, "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!") + to_chat(src, "\red The nanobots in the mindshield implant remove all thoughts about being a revolutionary. Get back to work!") if(src in ticker.mode.cult) ticker.mode.cult -= src ticker.mode.update_cult_icons_removed(src) @@ -681,7 +681,7 @@ var/datum/game_mode/cult/cult = ticker.mode if (istype(cult)) cult.memorize_cult_objectives(src) - to_chat(current, "\red The nanobots in the loyalty implant remove all thoughts about being in a cult. Have a productive day!") + to_chat(current, "\red The nanobots in the mindshield implant remove all thoughts about being in a cult. Have a productive day!") memory = "" else if (href_list["revolution"]) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index b350a0556d3..014262dfd01 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -346,17 +346,17 @@ usr.visible_message("[usr] pauses, then dips their head in concentration!") to_chat(target, "You feel your loyalties begin to weaken!") sleep(100) //10 seconds - not spawn() so the enthralling takes longer - to_chat(usr, "The nanobots composing the loyalty implant have been rendered inert. Now to continue.") + to_chat(usr, "The nanobots composing the mindshield implant have been rendered inert. Now to continue.") usr.visible_message("[usr] relaxes again.") for(var/obj/item/weapon/implant/loyalty/L in target) if(L && L.implanted) qdel(L) - to_chat(target, "Your unwavering loyalty to Nanotrasen unexpectedly falters, dims, dies.") + to_chat(target, "Your mental protection implant unexpectedly falters, dims, dies.") if(3) to_chat(usr, "You begin planting the tumor that will control the new thrall...") usr.visible_message("A strange energy passes from [usr]'s hands into [target]'s head!") to_chat(target, "You feel your memories twisting, morphing. A sense of horror dominates your mind.") - if(!do_mob(usr, target, 70)) //around 21 seconds total for enthralling, 31 for someone with a loyalty implant + if(!do_mob(usr, target, 70)) //around 21 seconds total for enthralling, 31 for someone with a mindshield implant to_chat(usr, "The enthralling has been interrupted - your target's mind returns to its previous state.") to_chat(target, "You wrest yourself away from [usr]'s hands and compose yourself") enthralling = 0 diff --git a/code/game/objects/items/weapons/implants/implant_mindshield.dm b/code/game/objects/items/weapons/implants/implant_mindshield.dm index 07e74ae2509..bbd62c4af88 100644 --- a/code/game/objects/items/weapons/implants/implant_mindshield.dm +++ b/code/game/objects/items/weapons/implants/implant_mindshield.dm @@ -29,7 +29,7 @@ if(target.mind in ticker.mode.cult) to_chat(target, "You feel the corporate tendrils of Nanotrasen try to invade your mind!") else - to_chat(target, "You mind feels hardened somehow.") + to_chat(target, "Your mind feels hardened - more resistant to brainwashing.") return 1 return 0 @@ -42,7 +42,7 @@ /obj/item/weapon/implanter/loyalty - name = "implanter (loyalty)" + name = "implanter (mindshield)" /obj/item/weapon/implanter/loyalty/New() imp = new /obj/item/weapon/implant/loyalty(src) @@ -51,7 +51,7 @@ /obj/item/weapon/implantcase/loyalty - name = "implant case - 'Loyalty'" + name = "implant case - 'mindshield'" desc = "A glass case containing a loyalty implant." /obj/item/weapon/implantcase/loyalty/New() diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm index 35a39293361..ab12c584259 100644 --- a/code/modules/mob/living/carbon/superheroes.dm +++ b/code/modules/mob/living/carbon/superheroes.dm @@ -191,14 +191,14 @@ if(isloyal(target)) to_chat(usr, "They are enslaved by Nanotrasen. You feel their interest in your cause wane and disappear.") usr.visible_message("[usr] stops talking for a moment, then moves back away from [target].") - to_chat(target, "Your mindshield implant activates and a sharp pain reminds you of your loyalties to Nanotrasen.") + to_chat(target, "Your mindshield implant activates, protecting you from conversion.") return if(3) to_chat(usr, "You begin filling out the application form with [target].") usr.visible_message("[usr] pulls out a pen and paper and begins filling an application form with [target].") to_chat(target, "You are being convinced by [usr] to fill out an application form to become a henchman.")//Ow the edge - if(!do_mob(usr, target, 100)) //around 30 seconds total for enthralling, 45 for someone with a loyalty implant + if(!do_mob(usr, target, 100)) //around 30 seconds total for enthralling, 45 for someone with a mindshield implant to_chat(usr, "The enrollment process has been interrupted - you have lost the attention of [target].") to_chat(target, "You move away and are no longer under the charm of [usr]. The application form is null and void.") recruiting = 0