From 01bececd55a8ddf673f1428dd23a801b96ec1fdd Mon Sep 17 00:00:00 2001 From: skull132 Date: Mon, 4 Jan 2016 15:30:30 +0200 Subject: [PATCH] Loyalty Implant Fixes Fixes the duplicate definition of the implanted() proc. Head revolutionaries can no longer be implanted, normal revolutionaries will actually lose their rev status when implanted, and lings will be informed of the fact that they can avoid the implant's effects. --- .../objects/items/weapons/implants/implant.dm | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index eb98d587..7e4ab4c2 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -333,22 +333,20 @@ the implant may become unstable and either pre-maturely inject the subject or si implanted(mob/M) - if(!istype(M, /mob/living/carbon/human)) return 0 + if(!istype(M, /mob/living/carbon/human)) + return 0 var/mob/living/carbon/human/H = M - if(H.mind in ticker.mode.head_revolutionaries) + 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!") return 0 - else if(H.mind in ticker.mode:revolutionaries) + else if (H.mind in ticker.mode:revolutionaries) ticker.mode:remove_revolutionary(H.mind) - H << "\blue You feel a surge of loyalty towards Nanotrasen." - return 1 - - implanted(mob/M) - if(!istype(M, /mob/living/carbon/human)) return 0 - var/mob/living/carbon/human/H = M - if(H.mind in ticker.mode:cult) + else if (H.mind in ticker.mode:cult) ticker.mode:remove_cultist(M.mind) - H << "\blue The implant robs you of your faith in Nar-Sie, leaving only obedience to NanoTrasen." + H << "\blue The implant robs you of your faith in Nar-Sie, leaving only obedience to NanoTrasen." + else if (H.mind in ticker.mode:changelings) + H << "\blue We have weaved our flesh around and isolated the simple chip. It has no effect on us. But they do not know it yet..." + H << "\blue You feel a surge of loyalty towards Nanotrasen." return 1 //Alternatively! This is the null-rod deconversion, if the above doesn't work. There's two things down there and I don't know if that's okay.