diff --git a/code/game/gamemodes/clock_cult/clock_scripture.dm b/code/game/gamemodes/clock_cult/clock_scripture.dm index a7153c90063..b4b639e3b92 100644 --- a/code/game/gamemodes/clock_cult/clock_scripture.dm +++ b/code/game/gamemodes/clock_cult/clock_scripture.dm @@ -92,7 +92,7 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or return FALSE if(multiple_invokers_used && !multiple_invokers_optional && !ratvar_awakens && !slab.no_cost) var/nearby_servants = 0 - for(var/mob/living/L in range(1, invoker)) + for(var/mob/living/L in range(1, get_turf(invoker))) if(is_servant_of_ratvar(L) && L.stat == CONSCIOUS && L.can_speak_vocal()) nearby_servants++ if(nearby_servants < invokers_required) @@ -121,7 +121,7 @@ Judgement: 12 servants, 5 caches, 300 CV, and any existing AIs are converted or slab.busy = null return FALSE if(multiple_invokers_used) - for(var/mob/living/L in range(1, invoker)) + for(var/mob/living/L in range(1, get_turf(invoker))) if(is_servant_of_ratvar(L) && L.stat == CONSCIOUS && L.can_speak_vocal()) clockwork_say(L, text2ratvar(invocation), whispered) else diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm index 8c628c9e8ae..411702a3bcb 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm @@ -46,7 +46,7 @@ descname = "Guardian" name = "Memory Allocation" desc = "Allocates part of your consciousness to a Clockwork Marauder, a vigilent fighter that lives within you, able to be \ - called forth by Speaking its True Name or if you become exceptionally low on health.
\ + called forth by Speaking its True Name or if you become exceptionally low on health.
\ It gains Fatigue as it is attacked, weakening it. Marauders cannot move too far from their hosts, \ and will gain Fatigue at an increasing rate as they grow farther away. At maximum Fatigue, the marauder is forced to return to you and will be unable to manifest until its Fatigue is at zero." invocations = list("Fright's will...", "...call forth...") @@ -71,7 +71,7 @@ invoker.visible_message("A yellow tendril appears from [invoker]'s [slab.name] and impales itself in [invoker.p_their()] forehead!", \ "A tendril flies from [slab] into your forehead. You begin waiting while it painfully rearranges your thought pattern...") invoker.notransform = TRUE //Vulnerable during the process - slab.busy = "Thought modification in process" + slab.busy = "Thought Modification in progress" if(!do_after(invoker, 50, target = invoker)) invoker.visible_message("The tendril, covered in blood, retracts from [invoker]'s head and back into the [slab.name]!", \ "Total agony overcomes you as the tendril is forced out early!") @@ -83,7 +83,7 @@ return FALSE clockwork_say(invoker, text2ratvar("...the mind made...")) invoker.notransform = FALSE - slab.busy = null + slab.busy = "Marauder Selection in progress" if(!check_special_requirements()) return FALSE invoker << "The tendril shivers slightly as it selects a marauder..." diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm index fe3a1664a82..c831fe8cc50 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_revenant.dm @@ -14,7 +14,6 @@ usage_tip = "Those affected by this scripture are only weak to things that outright destroy bodies, such as bombs or the singularity." tier = SCRIPTURE_REVENANT sort_priority = 2 - var/total_duration = 150 /datum/clockwork_scripture/invoke_inathneq/check_special_requirements() if(!slab.no_cost && clockwork_generals_invoked["inath-neq"] > world.time) @@ -25,7 +24,7 @@ /datum/clockwork_scripture/invoke_inathneq/scripture_effects() new/obj/effect/clockwork/general_marker/inathneq(get_turf(invoker)) - hierophant_message("[text2ratvar("Vanguard: \"I lend you my aid, champions! Let glory guide your blows!")]\"", FALSE, invoker) + hierophant_message("[text2ratvar("Vanguard: \"I lend you my aid, champions! Let glory guide your blows!")]\"", FALSE, invoker) clockwork_generals_invoked["inath-neq"] = world.time + CLOCKWORK_GENERAL_COOLDOWN playsound(invoker, 'sound/magic/clockwork/invoke_general.ogg', 50, 0) if(invoker.real_name == "Lucio") @@ -67,7 +66,7 @@ /datum/clockwork_scripture/invoke_nezbere/scripture_effects() new/obj/effect/clockwork/general_marker/nezbere(get_turf(invoker)) - hierophant_message("[text2ratvar("Armorer: \"I heed your call, champions. May your artifacts bring ruin upon the heathens that oppose our master!")]\"", FALSE, invoker) + hierophant_message("[text2ratvar("Armorer: \"I heed your call, champions. May your artifacts bring ruin upon the heathens that oppose our master!")]\"", FALSE, invoker) clockwork_generals_invoked["nezbere"] = world.time + CLOCKWORK_GENERAL_COOLDOWN playsound(invoker, 'sound/magic/clockwork/invoke_general.ogg', 50, 0) for(var/obj/structure/destructible/clockwork/ocular_warden/W in all_clockwork_objects) //Ocular wardens have increased damage and radius @@ -126,7 +125,7 @@ /datum/clockwork_scripture/invoke_sevtug/scripture_effects() new/obj/effect/clockwork/general_marker/sevtug(get_turf(invoker)) - hierophant_message("[text2ratvar("Fright: \"I heed your call, idiots. Get going and use this chance while it lasts!")]\"", FALSE, invoker) + hierophant_message("[text2ratvar("Fright: \"I heed your call, idiots. Get going and use this chance while it lasts!")]\"", FALSE, invoker) clockwork_generals_invoked["sevtug"] = world.time + CLOCKWORK_GENERAL_COOLDOWN playsound(invoker, 'sound/magic/clockwork/invoke_general.ogg', 50, 0) var/hum = get_sfx('sound/effects/screech.ogg') //like playsound, same sound for everyone affected @@ -182,14 +181,14 @@ /datum/clockwork_scripture/invoke_nzcrentr/check_special_requirements() if(!slab.no_cost && clockwork_generals_invoked["nzcrentr"] > world.time) invoker << "\"[text2ratvar("The boss says you have to wait. Hey, do you think he would mind if I killed you? ...He would? Ok.")]\"\n\ - Nzcrentr has already been invoked recently! You must wait several minutes before calling upon the Forgotten Arbiter." + Nzcrentr has already been invoked recently! You must wait several minutes before calling upon the Eternal Thunderbolt." return FALSE return TRUE /datum/clockwork_scripture/invoke_nzcrentr/scripture_effects() new/obj/effect/clockwork/general_marker/nzcrentr(get_turf(invoker)) clockwork_generals_invoked["nzcrentr"] = world.time + CLOCKWORK_GENERAL_COOLDOWN - hierophant_message("[text2ratvar("Amperage: \"[invoker.real_name] has called forth my power. Hope they do not shatter under it!")]\"", FALSE, invoker) + hierophant_message("[text2ratvar("Amperage: \"[invoker.real_name] has called forth my power. Hope they do not shatter under it!")]\"", FALSE, invoker) invoker.visible_message("[invoker] begins to radiate a blinding light!", \ "\"[text2ratvar("The boss says it's okay to do this. Don't blame me if you die from it.")]\"\n \ You feel limitless power surging through you!") diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm index b48260d4ace..bc62c7b1157 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm @@ -61,7 +61,7 @@ sort_priority = 4 /datum/clockwork_scripture/fellowship_armory/run_scripture() - for(var/mob/living/L in orange(1, invoker)) + for(var/mob/living/L in orange(1, get_turf(invoker))) if(is_servant_of_ratvar(L) && L.can_speak_vocal()) channel_time = max(channel_time - 10, 0) return ..() @@ -264,11 +264,11 @@ for(var/atom/movable/A in view(7, invoker)) power_drained += A.power_drain(TRUE) var/obj/effect/clockwork/sigil/transmission/ST = locate(/obj/effect/clockwork/sigil/transmission) in get_turf(invoker) - if(ST && power_drained >= 50) + if(ST && power_drained >= MIN_CLOCKCULT_POWER) var/sigil_drain = 0 - while(power_drained >= 50) - ST.modify_charge(-50) - power_drained -= 50 + while(power_drained >= MIN_CLOCKCULT_POWER) + ST.modify_charge(-MIN_CLOCKCULT_POWER) + power_drained -= MIN_CLOCKCULT_POWER sigil_drain += 10 power_drained += sigil_drain //readd part of the power given to the sigil to the power drained this cycle ST.visible_message("[ST] flares a brilliant orange!")