diff --git a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm index ac2a64a8d2..7a387d933a 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm @@ -208,10 +208,12 @@ 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) - L.stuttering = max(narsiandog_punish, L.stuttering) - L.drowsy = max(narsiandog_punish, L.drowsy) - L.confused += narsiandog_punish - L.apply_status_effect(STATUS_EFFECT_BELLIGERENT) + if(iscarbon(target)) + var/mob/living/carbon/C = L + C.stuttering = max(narsiandog_punish, C.stuttering) + C.drowsy = max(narsiandog_punish, C.drowsy) + C.confused += narsiandog_punish + 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 50c8d3a9f9..809d1a86e6 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 @@ -61,7 +61,7 @@ L.Knockdown(100) else if(iscultist(L)) L.confused += narsiandog_confuse // Spearthrow now confuses enemy cultists + just deals extra damage / sets on fire instead of hardstunning + damage - to_chat(L, "[scr] crashes into you with burning force, sending you reeling") + to_chat(L, "[scr] crashes into you with burning force, sending you reeling!") L.adjust_fire_stacks(2) L.IgniteMob() else diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index fc4d945d51..100b05ea75 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -409,6 +409,7 @@ name = "Stunning Aura" color = RUNE_COLOR_RED invocation = "Fuu ma'jin." + var/ratvarscum_punish = 10 /obj/item/melee/blood_magic/stun/afterattack(atom/target, mob/living/carbon/user, proximity) if(!isliving(target) || !proximity) @@ -438,21 +439,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 += 6 + C.stuttering += 15 + C.cultslurring += 15 + C.Jitter(15) + else // cultstun no longer hardstuns + damages hostile culsts, 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(ratvarscum_punish, C.stuttering) + C.drowsy = max(ratvarscum_punish, C.drowsy) + C.confused += ratvarscum.punish L.adjustBruteLoss(15) + to_chat(user, "In an brilliant flash of red, [L] [L.iscultist ? "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 ef1862949e..1789255ef8 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -676,6 +676,7 @@ sharpness = IS_SHARP hitsound = 'sound/weapons/bladeslice.ogg' var/datum/action/innate/cult/spear/spear_act + var/ratvarscum_confuse = 5 /obj/item/twohanded/cult_spear/Initialize() . = ..() @@ -690,7 +691,6 @@ icon_state = "bloodspear[wielded]" /obj/item/twohanded/cult_spear/throw_impact(atom/target) - var/ratvarscum_punish = 5 var/turf/T = get_turf(target) if(isliving(target)) var/mob/living/L = target @@ -704,7 +704,7 @@ if(!L.anti_magic_check()) if(is_servant_of_ratvar(L)) to_chat(L, "\"Kneel for me, scum\"") - L.confused += ratvarscum_punish //confuses and lightly knockdowns + damages hostile cultists instead of hardstunning like before + L.confused += ratvarscum_confuse //confuses and lightly knockdowns + damages hostile cultists instead of hardstunning like before L.knockdown(15) L.adjustBruteLoss(10) else