From cd13cfcfe7d28b78212721988acb202646633967 Mon Sep 17 00:00:00 2001 From: Ashe Higgs Date: Wed, 1 Nov 2017 16:52:14 -0400 Subject: [PATCH] Abscond and rifts return servants directly to the Ark (#32257) :cl: Xhuis tweak: Abscond and Reebe rifts now place servants directly at the Ark instead of below the "base" area. /:cl: A few times, I've seen players unwittingly build defenses on top of the spawn points for themselves! While that's not too much of a problem in of itself, I feel that this way makes more sense and lets servants have a consistent area they know they will emerge from. --- .../gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm | 5 ++++- .../clock_cult/clock_scriptures/scripture_drivers.dm | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm b/code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm index 8c6e1d1a35..e41acb421a 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm @@ -38,8 +38,11 @@ beckon(AM) /obj/effect/clockwork/city_of_cogs_rift/proc/beckon(atom/movable/AM) + var/turf/T = get_turf(pick(GLOB.city_of_cogs_spawns)) + if(is_servant_of_ratvar(AM)) + T = GLOB.ark_of_the_clockwork_justiciar ? get_step(GLOB.ark_of_the_clockwork_justiciar, SOUTH) : get_turf(pick(GLOB.servant_spawns)) AM.visible_message("[AM] passes through [src]!", ignored_mob = AM) - AM.forceMove(pick(!is_servant_of_ratvar(AM) ? GLOB.city_of_cogs_spawns : GLOB.servant_spawns)) + AM.forceMove(T) AM.visible_message("[AM] materializes from the air!", \ "You pass through [src] and appear [is_servant_of_ratvar(AM) ? "back at the City of Cogs" : "somewhere unfamiliar. Looks like it was a one-way trip.."].") do_sparks(5, TRUE, src) 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 a282ac3067..93d203aba0 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm @@ -129,7 +129,11 @@ /datum/clockwork_scripture/abscond/scripture_effects() var/take_pulling = invoker.pulling && isliving(invoker.pulling) && get_clockwork_power(ABSCOND_ABDUCTION_COST) - var/turf/T = get_turf(pick(GLOB.servant_spawns)) + var/turf/T + if(GLOB.ark_of_the_clockwork_justiciar) + T = get_step(GLOB.ark_of_the_clockwork_justiciar, SOUTH) + else + T = get_turf(pick(GLOB.servant_spawns)) invoker.visible_message("[invoker] flickers and phases out of existence!", \ "You feel a dizzying sense of vertigo as you're yanked back to Reebe!") T.visible_message("[invoker] flickers and phases into existence!")