From c3712f5be5df3d8c2b226babf7c7e15bfc086a79 Mon Sep 17 00:00:00 2001 From: Ashe Higgs Date: Sun, 7 Jan 2018 21:18:14 -0500 Subject: [PATCH 1/2] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog (#33645) * Objects touched by servants now warp to the Ark * Check by servant * Replaces with a baselock * Updates the 'log --- .../ark_of_the_clockwork_justicar.dm | 16 +++++++++++++++- code/game/machinery/computer/camera_advanced.dm | 3 +++ strings/clockwork_cult_changelog.txt | 13 ++++++------- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm index 63fea1eeb6..a7be470aac 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -1,5 +1,11 @@ #define ARK_GRACE_PERIOD 300 //In seconds, how long the crew has before the Ark truly "begins" +/proc/clockwork_ark_active() //A helper proc so the Ark doesn't have to be typecast every time it's checked; returns null if there is no Ark and its active var otherwise + var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar + if(!G) + return + return G.active + //The gateway to Reebe, from which Ratvar emerges. /obj/structure/destructible/clockwork/massive/celestial_gateway name = "\improper Ark of the Clockwork Justicar" @@ -63,7 +69,7 @@ /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/cry_havoc() visible_message("[src] shudders and roars to life, its parts beginning to whirr and screech!") - hierophant_message("The Ark is activating! Get back to the base!") + hierophant_message("The Ark is activating! You will be transported there soon!") for(var/mob/M in GLOB.player_list) if(is_servant_of_ratvar(M) || isobserver(M) || M.z == z) M.playsound_local(M, 'sound/magic/clockwork/ark_activation_sequence.ogg', 30, FALSE, pressure_affected = FALSE) @@ -86,6 +92,8 @@ var/datum/stack_recipe/R = V if(R.title == "wall gear") R.time *= 2 //Building walls becomes slower when the Ark activates + mass_recall() + recalls_remaining++ //So it doesn't use up a charge /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/open_portal(turf/T) new/obj/effect/clockwork/city_of_cogs_rift(T) @@ -261,6 +269,12 @@ if(!step_away(O, src, 2) || get_dist(O, src) < 2) O.take_damage(50, BURN, "bomb") O.update_icon() + for(var/V in GLOB.player_list) + var/mob/M = V + if(is_servant_of_ratvar(M) && M.z != z) + M.forceMove(get_step(src, SOUTH)) + M.overlay_fullscreen("flash", /obj/screen/fullscreen/flash) + M.clear_fullscreen("flash", 5) if(grace_period) grace_period-- return diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index a8199190fd..8ad0860633 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -283,6 +283,9 @@ if(!is_servant_of_ratvar(user)) to_chat(user, "[src]'s keys are in a language foreign to you, and you don't understand anything on its screen.") return + if(clockwork_ark_active()) + to_chat(user, "The Ark is active, and [src] has shut down.") + return . = ..() /datum/action/innate/servant_warp diff --git a/strings/clockwork_cult_changelog.txt b/strings/clockwork_cult_changelog.txt index b5d2ca10e3..5e6beedf2e 100644 --- a/strings/clockwork_cult_changelog.txt +++ b/strings/clockwork_cult_changelog.txt @@ -1,7 +1,6 @@ -Added the Eminence, a leader role that servants can become by interacting with the new eminence spire structure in Reebe. -Scripture has been re-colored in the slab interface to show its niche at a glance. -Added traps, including the brass skewer and steam vent. -Added trap triggers, including the pressure sensor, lever, and repeater. -Traps and trap triggers can be linked by using your clockwork slab on them. Traps chained to each other will cause those traps to activate as well. -You can instantly remove traps you misplace by using a wrench on them. -Mending Mantra has been removed. \ No newline at end of file +When revived by a vitality matrix, servants will gain a 1-minute debuff that prevents revival again. +Vitality matrices must now be placed at least one tile apart. +Servants are now teleported to and locked on Reebe once the Ark starts. +Cyborgs are now damaged by brass skewers. +Vitality matrices no longer work on buckled mobs (including skewered ones.) +Pressure sensors have much less health. \ No newline at end of file