From 3beab07be282419b4849b4cfe89ebca357aa030b Mon Sep 17 00:00:00 2001 From: oranges Date: Mon, 9 Oct 2017 09:32:32 +1300 Subject: [PATCH] Merge pull request #31421 from Xhuis/wardens_vs_revenants Prevents ocular wardens from targeting dead revenants --- .../gamemodes/clock_cult/clock_structures/ocular_warden.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm index 364c967ae9..79e5be6d44 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm @@ -120,6 +120,10 @@ continue if(("ratvar" in H.faction) || ("neutral" in H.faction)) continue + else if(isrevenant(L)) + var/mob/living/simple_animal/revenant/R = L + if(R.stasis) //Don't target any revenants that are respawning + continue else if(!L.mind) continue . += L