diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index a61f3956171..34d078e0497 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -335,11 +335,11 @@ the implant may become unstable and either pre-maturely inject the subject or si if(!istype(M, /mob/living/carbon/human)) return 0 var/mob/living/carbon/human/H = M if(H.mind in ticker.mode.head_revolutionaries) - H.visible_message("[H] seems to resist the implant!", "You feel the corporate tendrils of Nanotrasen try to invade your mind!") + H.visible_message("[H] seems to resist the implant!", "You feel the corporate tendrils of Nanotrasen try to invade your mind!") return 0 else if(H.mind in ticker.mode:revolutionaries) ticker.mode:remove_revolutionary(H.mind) - H << "\blue You feel a surge of loyalty towards Nanotrasen." + H << "You feel a surge of loyalty towards Nanotrasen." return 1 /obj/item/weapon/implant/traitor @@ -367,18 +367,18 @@ the implant may become unstable and either pre-maturely inject the subject or si if(!M.mind) return 0 var/mob/living/carbon/human/H = M if(M == user) - user << "Making yourself loyal to yourself was a great idea! Perhaps the best idea, ever! Actually, you just feel like an idiot." + user << "Making yourself loyal to yourself was a great idea! Perhaps even the best idea ever! Actually, you just feel like an idiot." if(isliving(user)) user:brainloss += 20 return - if(locate(/obj/item/weapon/implant/traitor) in H.contents || locate(/obj/item/weapon/implant/loyalty) in H.contents) - H.visible_message("[H] seems to resist the implant!", "You feel a strange sensation in your head that quickly dissipates.") + if(locate(/obj/item/weapon/implant/loyalty) in H.contents) + H.visible_message("[H] seems to resist the implant!", "You feel a strange sensation in your head that quickly dissipates.") return 0 - else if(H.mind in ticker.mode.traitors) - H.visible_message("[H] seems to resist the implant!", "You feel a familiar sensation in your head that quickly dissipates.") + if(locate(/obj/item/weapon/implant/traitor) in H.contents) + H.visible_message("[H] seems to resist the implant!", "You feel a strange sensation in your head that quickly dissipates.") return 0 H.implanting = 1 - H << "\blue You feel a surge of loyalty towards [user.name]." + H << "You feel completely loyal to [user.name]." if(!(user.mind in ticker.mode:implanter)) ticker.mode:implanter[ref] = list() implanters = ticker.mode:implanter[ref] @@ -389,11 +389,11 @@ the implant may become unstable and either pre-maturely inject the subject or si ticker.mode:implanter[ref] = implanters ticker.mode.traitors += H.mind H.mind.special_role = "traitor" - H << "\red You're now completely loyal to [user.name]! You now must lay down your life to protect them and assist in their goals at any cost." + H << "You're now completely loyal to [user.name]! You now must lay down your life to protect them and assist in their goals at any cost." var/datum/objective/protect/p = new p.owner = H.mind p.target = user:mind - p.explanation_text = "Protect [user:real_name], the [user:mind:assigned_role=="MODE" ? (user:mind:special_role) : (user:mind:assigned_role)]." + p.explanation_text = "Obey every order from and protect [user:real_name], the [user:mind:assigned_role=="MODE" ? (user:mind:special_role) : (user:mind:assigned_role)]." H.mind.objectives += p for(var/datum/objective/objective in H.mind.objectives) H << "Objective #1: [objective.explanation_text]" diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index e5145332701..bc74c3b34ec 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -287,11 +287,11 @@ emp_act switch(hit_area) if("head")//Harder to score a stun but if you do it lasts a bit longer - if(prob(I.force)) - apply_effect(5, WEAKEN, armor) - confused += 15 + if(stat == CONSCIOUS && prob(I.force) && armor < 50) visible_message("[src] has been knocked down!", \ "[src] has been knocked down!") + apply_effect(5, WEAKEN, armor) + confused += 15 if(src != user && I.damtype == BRUTE) ticker.mode.remove_revolutionary(mind) @@ -307,9 +307,10 @@ emp_act update_inv_glasses(0) if("chest")//Easier to score a stun but lasts less time - if(prob((I.force + 10))) + if(stat == CONSCIOUS && I.force && prob(I.force + 10)) + visible_message("[src] has been knocked down!", \ + "[src] has been knocked down!") apply_effect(5, WEAKEN, armor) - visible_message("\red [src] has been knocked down!") if(bloody) bloody_body(src)