From 236effbc5bf1c67df7c288a01b145a623c982007 Mon Sep 17 00:00:00 2001
From: ExcessiveUseOfCobblestone
<11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
Date: Sat, 10 Mar 2018 15:52:37 -0500
Subject: [PATCH] Holy water is trivial against Eminence once Daddy arrives
(#36285)
* Update _eminence.dm
* cleanup daddio
* Xhuis if I see another spaced if...
---
.../clockcult/clock_mobs/_eminence.dm | 39 ++++++++++---------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
index 6f6dc69461..262910346e 100644
--- a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
+++ b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
@@ -27,26 +27,27 @@
var/OldLoc = loc
if(NewLoc && !istype(NewLoc, /turf/open/indestructible/reebe_void))
var/turf/T = get_turf(NewLoc)
- if (locate(/obj/effect/blessing, T))
- if(last_failed_turf != T)
- T.visible_message("[T] suddenly emits a ringing sound!", null, null, null, src)
- playsound(T, 'sound/machines/clockcult/ark_damage.ogg', 75, FALSE)
- last_failed_turf = T
- if ((world.time - lastWarning) >= 30)
- lastWarning = world.time
- to_chat(src, "This turf is consecrated and can't be crossed!")
- return
- if(!GLOB.ratvar_awakens && istype(get_area(T), /area/chapel))
- if ((world.time - lastWarning) >= 30)
- lastWarning = world.time
- to_chat(src, "The Chapel is hallowed ground under a heretical deity, and can't be accessed!")
- return
+ if(!GLOB.ratvar_awakens)
+ if(locate(/obj/effect/blessing, T))
+ if(last_failed_turf != T)
+ T.visible_message("[T] suddenly emits a ringing sound!", null, null, null, src)
+ playsound(T, 'sound/machines/clockcult/ark_damage.ogg', 75, FALSE)
+ last_failed_turf = T
+ if((world.time - lastWarning) >= 30)
+ lastWarning = world.time
+ to_chat(src, "This turf is consecrated and can't be crossed!")
+ return
+ if(istype(get_area(T), /area/chapel))
+ if((world.time - lastWarning) >= 30)
+ lastWarning = world.time
+ to_chat(src, "The Chapel is hallowed ground under a heretical deity, and can't be accessed!")
+ return
+ else
+ for(var/turf/TT in range(5, src))
+ if(prob(166 - (get_dist(src, TT) * 33)))
+ TT.ratvar_act() //Causes moving to leave a swath of proselytized area behind the Eminence
forceMove(T)
- Moved(OldLoc, direct)
- if(GLOB.ratvar_awakens)
- for(var/turf/T in range(5, src))
- if(prob(166 - (get_dist(src, T) * 33)))
- T.ratvar_act() //Causes moving to leave a swath of proselytized area behind the Eminence
+ Moved(OldLoc, direct)
/mob/camera/eminence/Process_Spacemove(movement_dir = 0)
return TRUE