From 3b5d55260a1b3aced1060887c0b4d00e73f0b1b4 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 15 Jun 2017 19:55:41 -0500 Subject: [PATCH] Fixes Geis counting dead servants --- .../clock_cult/clock_helpers/scripture_checks.dm | 4 ++-- .../clock_cult/clock_scriptures/scripture_drivers.dm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm b/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm index 3862791f8c..5faf3ee832 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm @@ -64,5 +64,5 @@ /proc/change_construction_value(amount) GLOB.clockwork_construction_value += amount -/proc/can_recite_scripture(mob/living/L) - return (is_servant_of_ratvar(L) && L.stat == CONSCIOUS && L.can_speak_vocal() && (GLOB.ratvar_awakens || (ishuman(L) || issilicon(L)))) +/proc/can_recite_scripture(mob/living/L, can_potentially) + return (is_servant_of_ratvar(L) && (can_potentially || (L.stat == CONSCIOUS && L.can_speak_vocal())) && (GLOB.ratvar_awakens || (ishuman(L) || issilicon(L)))) diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm index b49b0c5819..2560e36cd4 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm @@ -122,8 +122,8 @@ /datum/clockwork_scripture/ranged_ability/geis_prep/run_scripture() var/servants = 0 if(!GLOB.ratvar_awakens) - for(var/mob/living/M in GLOB.all_clockwork_mobs) - if(ishuman(M) || issilicon(M)) + for(var/mob/living/M in GLOB.living_mob_list) + if(can_recite_scripture(M, TRUE)) servants++ if(servants > SCRIPT_SERVANT_REQ) whispered = FALSE @@ -153,8 +153,8 @@ /datum/clockwork_scripture/geis/run_scripture() var/servants = 0 if(!GLOB.ratvar_awakens) - for(var/mob/living/M in GLOB.all_clockwork_mobs) - if(ishuman(M) || issilicon(M)) + for(var/mob/living/M in GLOB.living_mob_list) + if(can_recite_scripture(M, TRUE)) servants++ if(target.buckled) target.buckled.unbuckle_mob(target, TRUE)