From 42372b8d04a95f7b2e6df274d7913e8b017a129c Mon Sep 17 00:00:00 2001
From: YPOQ <30683121+YPOQ@users.noreply.github.com>
Date: Tue, 10 Apr 2018 19:21:26 -0600
Subject: [PATCH] Fixes eminences not being recognized as servants of ratvar
(#37070)
* Fixes eminences not being recognized as servants of ratvar
* Readds istype check
---
code/game/gamemodes/clock_cult/clock_cult.dm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm
index 603829a2d0..f403908f67 100644
--- a/code/game/gamemodes/clock_cult/clock_cult.dm
+++ b/code/game/gamemodes/clock_cult/clock_cult.dm
@@ -45,7 +45,7 @@ Credit where due:
///////////
/proc/is_servant_of_ratvar(mob/M)
- return isliving(M) && M.mind && M.mind.has_antag_datum(/datum/antagonist/clockcult)
+ return istype(M) && !isobserver(M) && M.mind && M.mind.has_antag_datum(/datum/antagonist/clockcult)
/proc/is_eligible_servant(mob/M)
if(!istype(M))
@@ -74,14 +74,14 @@ Credit where due:
var/datum/antagonist/clockcult/C = new update_type(L.mind)
C.make_team = create_team
C.show_in_roundend = create_team //tutorial scarabs begone
-
+
if(iscyborg(L))
var/mob/living/silicon/robot/R = L
if(R.deployed)
var/mob/living/silicon/ai/AI = R.mainframe
R.undeploy()
to_chat(AI, "Anomaly Detected. Returned to core!") //The AI needs to be in its core to properly be converted
-
+
. = L.mind.add_antag_datum(C)
if(!silent && L)
@@ -99,7 +99,7 @@ Credit where due:
" in an endless grey void.
It cannot be allowed to escape"].")
L.playsound_local(get_turf(L), 'sound/ambience/antag/clockcultalr.ogg', 40, TRUE, frequency = 100000, pressure_affected = FALSE)
flash_color(L, flash_color = list("#BE8700", "#BE8700", "#BE8700", rgb(0,0,0)), flash_time = 5)
-
+