From a9a94f7aedfc3b3ccfaf235249de642f49421351 Mon Sep 17 00:00:00 2001 From: Robustin Date: Thu, 28 Dec 2017 13:33:38 -0500 Subject: [PATCH 1/2] Dead cultists can now cross Reebe's "Servant Blocker" (#33558) * Dead Cultist Exception * Servant blocker update * Corpse balance * Lets corpses pass servant blocker * Lets cult corpses pass servant blocker * Update servant_blocker.dm * Update open.dm * Update servant_blocker.dm * Update open.dm --- code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm | 2 +- code/game/turfs/open.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm b/code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm index 194747cefc..47ef4bf476 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm @@ -14,7 +14,7 @@ /obj/effect/clockwork/servant_blocker/CanPass(atom/movable/M, turf/target) var/list/target_contents = M.GetAllContents() + M for(var/mob/living/L in target_contents) - if(is_servant_of_ratvar(L) && get_dir(M, src) != dir) //Unless we're on the side the arrow is pointing directly away from, no-go + if(is_servant_of_ratvar(L) && get_dir(M, src) != dir && L.stat != DEAD) //Unless we're on the side the arrow is pointing directly away from, no-go to_chat(L, "The space beyond here can't be accessed by you or other servants.") return return TRUE diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 0eddbc411e..c937a8a48f 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -88,7 +88,7 @@ /turf/open/indestructible/clock_spawn_room/proc/port_servants() . = FALSE for(var/mob/living/L in src) - if(is_servant_of_ratvar(L)) + if(is_servant_of_ratvar(L) && L.stat != DEAD) . = TRUE L.forceMove(get_turf(pick(GLOB.servant_spawns))) visible_message("[L] vanishes in a flash of red!")