diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm index 0125dc7cf5..a27f911163 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm @@ -77,13 +77,16 @@ for(var/mob/living/M in viewers(5, src)) if(!is_servant_of_ratvar(M) && M != L) M.flash_act() - if(iscultist(L)) + if(iscultist(L)) //No longer stuns cultists, instead sets them on fire and burns them to_chat(L, "\"Watch your step, wretch.\"") - L.adjustBruteLoss(10) - L.Knockdown(80, FALSE) + L.adjustFireLoss(10) + L.Knockdown(20, FALSE) + L.adjust_fire_stacks(5) //Burn! + L.IgniteMob() + else + L.Stun(40) L.visible_message("[src] appears around [L] in a burst of light!", \ - "[target_flashed ? "An unseen force":"The glowing sigil around you"] holds you in place!") - L.Stun(40) + "[target_flashed ? "An unseen force":"The glowing sigil around you"] [iscultist(L) ? "painfully bursts into flames!" : "holds you in place!"]") L.apply_status_effect(STATUS_EFFECT_BELLIGERENT) new /obj/effect/temp_visual/ratvar/sigil/transgression(get_turf(src)) qdel(src) diff --git a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm index 23caa788d4..1f616b7dbc 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm @@ -193,15 +193,26 @@ L.visible_message("[L]'s eyes flare with dim light!") playsound(L, 'sound/weapons/sear.ogg', 50, TRUE) else - L.visible_message("[L]'s eyes blaze with brilliant light!", \ - "Your vision suddenly screams with white-hot light!") - L.Knockdown(15, TRUE, FALSE, 15) - L.apply_status_effect(STATUS_EFFECT_KINDLE) - L.flash_act(1, 1) - if(issilicon(target)) - var/mob/living/silicon/S = L - S.emp_act(EMP_HEAVY) - if(iscultist(L)) + if(!iscultist(L)) + L.visible_message("[L]'s eyes blaze with brilliant light!", \ + "Your vision suddenly screams with white-hot light!") + L.Knockdown(15, TRUE, FALSE, 15) + L.apply_status_effect(STATUS_EFFECT_KINDLE) + L.flash_act(1, 1) + if(issilicon(target)) + var/mob/living/silicon/S = L + S.emp_act(EMP_HEAVY) + else //for Nar'sian weaklings + to_chat(L, "\"How does it feel to see the light, dog?\"") + L.visible_message("[L]'s eyes flare with burning light!", \ + "Your vision suddenly screams with a flash of burning hot light!") //Debuffs Narsian cultists hard + deals some burn instead of just hardstunning them; Only the confusion part can stack + L.flash_act(1,1) + if(iscarbon(target)) + var/mob/living/carbon/C = L + C.stuttering = max(8, C.stuttering) + C.drowsyness = max(8, C.drowsyness) + C.confused += CLAMP(16 - C.confused, 0, 8) + C.apply_status_effect(STATUS_EFFECT_BELLIGERENT) L.adjustFireLoss(15) ..() diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm index a7fcf0a3b0..7534f7c043 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm @@ -56,8 +56,14 @@ L.visible_message("[src] bounces off of [L], as if repelled by an unseen force!") else if(!..()) if(!L.anti_magic_check()) - if(issilicon(L) || iscultist(L)) + if(issilicon(L)) L.Knockdown(100) + else if(iscultist(L)) + L.confused += CLAMP(10 - L.confused, 0, 5) // Spearthrow now confuses enemy cultists + just deals extra damage / sets on fire instead of hardstunning + damage + to_chat(L, "[src] crashes into you with burning force, sending you reeling!") + L.adjust_fire_stacks(2) + L.Knockdown(1) + L.IgniteMob() else L.Knockdown(40) GLOB.clockwork_vitality += L.adjustFireLoss(bonus_burn * 3) //normally a total of 40 damage, 70 with ratvar diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index beea67e596..a833aa8a94 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -438,21 +438,27 @@ target.visible_message("[L] starts to glow in a halo of light!", \ "A feeling of warmth washes over you, rays of holy light surround your body and protect you from the flash of light!") else - to_chat(user, "In an brilliant flash of red, [L] falls to the ground!") - L.Knockdown(160) - L.adjustStaminaLoss(140) //Ensures hard stamcrit - L.flash_act(1,1) - if(issilicon(target)) - var/mob/living/silicon/S = L - S.emp_act(EMP_HEAVY) - else if(iscarbon(target)) - var/mob/living/carbon/C = L - C.silent += 6 - C.stuttering += 15 - C.cultslurring += 15 - C.Jitter(15) - if(is_servant_of_ratvar(L)) + if(!iscultist(L)) + L.Knockdown(160) + L.adjustStaminaLoss(140) //Ensures hard stamcrit + L.flash_act(1,1) + if(issilicon(target)) + var/mob/living/silicon/S = L + S.emp_act(EMP_HEAVY) + else if(iscarbon(target)) + var/mob/living/carbon/C = L + C.silent += CLAMP(12 - C.silent, 0, 6) + C.stuttering += CLAMP(30 - C.stuttering, 0, 15) + C.cultslurring += CLAMP(30 - C.cultslurring, 0, 15) + C.Jitter(15) + else // cultstun no longer hardstuns + damages hostile cultists, instead debuffs them hard + deals some damage; debuffs for a bit longer since they don't add the clockie belligerent debuff + if(iscarbon(target)) + var/mob/living/carbon/C = L + C.stuttering = max(10, C.stuttering) + C.drowsyness = max(10, C.drowsyness) + C.confused += CLAMP(20 - C.confused, 0, 10) L.adjustBruteLoss(15) + to_chat(user, "In an brilliant flash of red, [L] [iscultist(L) ? "writhes in pain" : "falls to the ground!"]") uses-- ..() diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 5fe941d32f..b4ddb9dbff 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -703,7 +703,10 @@ else if(!..()) if(!L.anti_magic_check()) if(is_servant_of_ratvar(L)) - L.Knockdown(100) + to_chat(L, "\"Kneel for me, scum\"") + L.confused += CLAMP(10 - L.confused, 0, 5) //confuses and lightly knockdowns + damages hostile cultists instead of hardstunning like before + L.Knockdown(15) + L.adjustBruteLoss(10) else L.Knockdown(50) break_spear(T)