diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm index a879a488e57..4e44ff47be6 100644 --- a/code/modules/mob/living/carbon/human/human_mob.dm +++ b/code/modules/mob/living/carbon/human/human_mob.dm @@ -1466,7 +1466,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X rad_act(current_size * 3) /mob/living/carbon/human/narsie_act() - if(iswizard(src) && IS_CULTIST(src)) //Wizard cultists are immune to narsie because it would prematurely end the wiz round that's about to end by the automated shuttle call anyway + if(iswizard(src) || IS_CULTIST(src)) // Wizards are immune to the magic. Cultists also don't get transformed. return ..() diff --git a/code/modules/power/engines/singularity/narsie.dm b/code/modules/power/engines/singularity/narsie.dm index 9245d98fa7c..31897b936b9 100644 --- a/code/modules/power/engines/singularity/narsie.dm +++ b/code/modules/power/engines/singularity/narsie.dm @@ -112,7 +112,6 @@ return /obj/singularity/narsie/proc/pickcultist() //Narsie rewards his cultists with being devoured first, then picks a ghost to follow. --NEO - var/list/cultists = list() var/list/noncultists = list() for(var/mob/living/carbon/food in GLOB.alive_mob_list) //we don't care about constructs or cult-Ians or whatever. cult-monkeys are fair game i guess var/turf/pos = get_turf(food) @@ -121,18 +120,12 @@ if(pos.z != src.z) continue - if(IS_CULTIST(food)) - cultists += food - else + if(!IS_CULTIST(food)) noncultists += food - if(length(cultists)) //cultists get higher priority - acquire(pick(cultists)) - return - - if(length(noncultists)) - acquire(pick(noncultists)) - return + if(length(noncultists)) + acquire(pick(noncultists)) + return //no living humans, follow a ghost instead. for(var/mob/dead/observer/ghost in GLOB.player_list) @@ -141,10 +134,9 @@ var/turf/pos = get_turf(ghost) if(pos.z != src.z) continue - cultists += ghost - if(length(cultists)) - acquire(pick(cultists)) - return + noncultists += ghost + if(length(noncultists)) + acquire(pick(noncultists)) /obj/singularity/narsie/proc/acquire(mob/food)