From f7b1304d5727721685108f8f28ac9b1befec98bb Mon Sep 17 00:00:00 2001 From: Coolgat3 <47329085+Coolgat3@users.noreply.github.com> Date: Thu, 14 Feb 2019 05:47:57 +0100 Subject: [PATCH] Fixes clockcult to be actually playable on citadel. (#7982) * Some fixes * Buffed vanguard to grant infinite stamina to actually make you immune to stuns * Fixed the comment to not say infinite stun immunity cause that looked scary and bugged me lmao * Revert "Buffed vanguard, infinite stam" This reverts commit 8290e5bc4050f7c6476cde3dafb327bf93d49ef3 and 105d6c1cf74b84b182b26683dcad985fbe7ead4a. * Revert "Buffed vanguard to grant infinite stamina to actually make you immune to stuns" This reverts commit 105d6c1cf74b84b182b26683dcad985fbe7ead4a. * Fixed vanguard and trying to fix reebe getting the reebe ztrait * Git is hard. Fix. * Vanguard buffs * Git ate the credits --- code/datums/status_effects/buffs.dm | 3 ++- code/game/gamemodes/clock_cult/clock_cult.dm | 3 ++- .../clockcult/clock_helpers/slab_abilities.dm | 3 ++- .../clockcult/clock_scriptures/scripture_drivers.dm | 10 +++++----- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index d41cf4381c..dd8ee1b166 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -51,7 +51,7 @@ /obj/screen/alert/status_effect/vanguard name = "Vanguard" - desc = "You're absorbing stuns! 25% of all stuns taken will affect you after this effect ends." + desc = "You're absorbing stuns! Your stamina is greatly increased, but not infinite. 25% of all stuns taken will affect you after this effect ends." icon_state = "vanguard" alerttooltipstyle = "clockcult" @@ -75,6 +75,7 @@ owner.visible_message("[owner] begins to faintly glow!", "You will absorb all stuns for the next twenty seconds.") owner.SetStun(0, FALSE) owner.SetKnockdown(0) + owner.setStaminaLoss(0, FALSE) progbar = new(owner, duration, owner) progbar.bar.color = list("#FAE48C", "#FAE48C", "#FAE48C", rgb(0,0,0)) progbar.update(duration - world.time) diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index f0ccf235ae..1478079d37 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -37,6 +37,7 @@ Credit where due: 4. PJB3005 from /vg/ for the failed continuation PR 5. Xhuis from /tg/ for coding the first iteration of the mode, and the new, reworked version 6. ChangelingRain from /tg/ for maintaining the gamemode for months after its release prior to its rework +7. Clockwork cult code as of now, at least the one being pulled from Citadel Station's master branch, is being, or already is, fixed by Coolgat3 and Avunia. */ @@ -267,7 +268,7 @@ Credit where due: //Servant of Ratvar outfit /datum/outfit/servant_of_ratvar name = "Servant of Ratvar" - uniform = /obj/item/clothing/under/chameleon/ratvar + uniform = /obj/item/clothing/under/rank/engineer //no more chameleon suit for them, as requested shoes = /obj/item/clothing/shoes/sneakers/black back = /obj/item/storage/backpack ears = /obj/item/radio/headset diff --git a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm index ad83d5f4d2..41f501e346 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm @@ -194,7 +194,8 @@ else L.visible_message("[L]'s eyes blaze with brilliant light!", \ "Your vision suddenly screams with white-hot light!") - L.Knockdown(15) + L.Knockdown(160) + L.adjustStaminaLoss(140) // now kindle works pretty much like bloodcult stun knockdown and stamcrit wise L.apply_status_effect(STATUS_EFFECT_KINDLE) L.flash_act(1, 1) if(iscultist(L)) diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm index e78a6e4623..6415d9f91a 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm @@ -71,7 +71,7 @@ desc = "Charges your slab with divine energy, allowing you to overwhelm a target with Ratvar's light." invocations = list("Divinity, show them your light!") whispered = TRUE - channel_time = 30 + channel_time = 20 // I think making kindle channel a third of the time less is a good make up for the fact that it silences people for such a little amount of time. power_cost = 125 usage_tip = "The light can be used from up to two tiles away. Damage taken will GREATLY REDUCE the stun's duration." tier = SCRIPTURE_DRIVER @@ -112,21 +112,21 @@ quickbind_desc = "Applies handcuffs to a struck target." -//Vanguard: Provides twenty seconds of stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed are applied to the invoker. +//Vanguard: Provides twenty seconds of greatly increased stamina and stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed are applied to the invoker. /datum/clockwork_scripture/vanguard descname = "Self Stun Immunity" name = "Vanguard" - desc = "Provides twenty seconds of stun immunity. At the end of the twenty seconds, the invoker is knocked down for the equivalent of 25% of all stuns they absorbed. \ + desc = "Provides twenty seconds of greatly increased stamina and stun immunity. At the end of the twenty seconds, the invoker is knocked down for the equivalent of 25% of all stuns they absorbed. \ Excessive absorption will cause unconsciousness." invocations = list("Shield me...", "...from darkness!") channel_time = 30 - power_cost = 25 + power_cost = 75 usage_tip = "You cannot reactivate Vanguard while still shielded by it." tier = SCRIPTURE_DRIVER primary_component = VANGUARD_COGWHEEL sort_priority = 6 quickbind = TRUE - quickbind_desc = "Allows you to temporarily absorb stuns. All stuns absorbed will affect you when disabled." + quickbind_desc = "Allows you to temporarily have quickly regenerating stamina and absorb stuns. All stuns absorbed will affect you when disabled." /datum/clockwork_scripture/vanguard/check_special_requirements() if(!GLOB.ratvar_awakens && islist(invoker.stun_absorption) && invoker.stun_absorption["vanguard"] && invoker.stun_absorption["vanguard"]["end_time"] > world.time)