From f55ac03315fa285033d85784d59f84ea455c5df8 Mon Sep 17 00:00:00 2001 From: skull132 Date: Tue, 18 Mar 2014 16:03:09 +0200 Subject: [PATCH] Deculting Loyalty implants and the heaviest of anti-depressants will now decult someone. --- .../objects/items/weapons/implants/implant.dm | 3 +- .../Chemistry-Reagents-Antidepressants.dm | 32 +++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 9ad5c1d8..0a7e2a51 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -341,7 +341,7 @@ the implant may become unstable and either pre-maturely inject the subject or si 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 @@ -363,7 +363,6 @@ the implant may become unstable and either pre-maturely inject the subject or si -*/ diff --git a/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm b/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm index 53373c33..fb29a9c3 100644 --- a/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm +++ b/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm @@ -20,7 +20,7 @@ M << "\blue Your mind feels focused and undivided." ..() return - + /* on_mob_life(var/mob/living/M as mob) if(ishuman(M)) if((M.mind in ticker.mode.cult)) @@ -28,9 +28,9 @@ ticker.mode.remove_cultist(M.mind) for(var/mob/O in viewers(M, null)) O.show_message(text("\blue []'s eyes blink and become clearer.", M), 1) // So observers know it worked. - + return - + */ /datum/chemical_reaction/methylphenidate @@ -69,9 +69,9 @@ ticker.mode.remove_cultist(M.mind) for(var/mob/O in viewers(M, null)) O.show_message(text("\blue []'s eyes blink and become clearer.", M), 1) // So observers know it worked. - + return - + */ /datum/chemical_reaction/citalopram @@ -107,17 +107,17 @@ ..() return -/* on_mob_life(var/mob/living/M as mob) - if(ishuman(M)) - if((M.mind in ticker.mode.cult)) - M << "\red The drugs burn your thoughts...the visions stop...and the voices are no more. You are now deaf to the commands of Nar-Sie." - ticker.mode.remove_cultist(M.mind) - for(var/mob/O in viewers(M, null)) - O.show_message(text("\blue []'s eyes blink and become clearer.", M), 1) // So observers know it worked. - - return - -*/ + on_mob_life(var/mob/living/M as mob) + if(ishuman(M)) + if((M.mind in ticker.mode.cult)) + M << "\red The drugs burn your thoughts...the visions stop...and the voices are no more. You are now deaf to the commands of Nar-Sie." + ticker.mode.remove_cultist(M.mind) + for(var/mob/O in viewers(M, null)) + O.show_message(text("\blue []'s eyes blink and become clearer.", M), 1) // So observers know it worked. + + return + +