From df4ae7ea18b93741c88fd2714182c4eeaea41404 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 16 Nov 2019 21:11:08 +0100 Subject: [PATCH] Just some fixes Fun fun fun --- .../antagonists/clockcult/clock_effects/clock_sigils.dm | 4 ++-- .../antagonists/clockcult/clock_helpers/slab_abilities.dm | 2 +- .../clock_items/clock_weapons/ratvarian_spear.dm | 2 +- code/modules/antagonists/cult/blood_magic.dm | 8 ++++---- code/modules/antagonists/cult/cult_items.dm | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm index 74885c7c7c..7c3c8ea105 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm @@ -79,14 +79,14 @@ M.flash_act() if(iscultist(L)) //No longer stuns cultists, instead sets them on fire and burns them to_chat(L, "\"Watch your step, wretch.\"") - L.adjustBurnLoss(10) + 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"] [L.iscultist ? "painfully bursts into flames!" : "holds you in place!"]") + "[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 7a387d933a..1b6b1b9cda 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm @@ -211,7 +211,7 @@ if(iscarbon(target)) var/mob/living/carbon/C = L C.stuttering = max(narsiandog_punish, C.stuttering) - C.drowsy = max(narsiandog_punish, C.drowsy) + C.drowsyness = max(narsiandog_punish, C.drowsyness) 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 809d1a86e6..f10479c331 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, "[src] 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 19cba09047..5f3856dda1 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -452,14 +452,14 @@ 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 + 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(ratvarscum_punish, C.stuttering) - C.drowsy = max(ratvarscum_punish, C.drowsy) - C.confused += ratvarscum.punish + C.drowsyness = max(ratvarscum_punish, C.drowsyness) + 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!"]") + 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 bacb3a96ef..6b37b33360 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -705,7 +705,7 @@ if(is_servant_of_ratvar(L)) to_chat(L, "\"Kneel for me, scum\"") L.confused += ratvarscum_confuse //confuses and lightly knockdowns + damages hostile cultists instead of hardstunning like before - L.knockdown(15) + L.Knockdown(15) L.adjustBruteLoss(10) else L.Knockdown(50)