From 343ed264c0848e96cedcd2d9cfafb1cdd482ff9a Mon Sep 17 00:00:00 2001 From: Waterpig <49160555+Maia-J@users.noreply.github.com> Date: Sat, 8 Aug 2026 23:08:08 +0200 Subject: [PATCH] Various bloodsucker fixes (#6068) ## About The Pull Request Adjusts the description of thaumaturgy to actually describe what's happening. closes #2475 Fixes runtimes in casting the veil of the many faces that was probably responsible for #5301 as I can no longer reproduce it closes #5301 ## Why It's Good For The Game Bugfix good ## Proof Of Testing N/A ## Changelog :cl: fix: Thaumaturgy description now actually describes what thaumaturgy does. fix: Veil of the many faces no longer borks itself with runtimes upon casting. /:cl: --------- Co-authored-by: Maia --- .../bloodsucker/powers/tremere/thaumaturgy.dm | 4 ++-- .../modules/antagonists/bloodsucker/powers/veil.dm | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm index 0e530244187..72d48963ba7 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm @@ -61,7 +61,7 @@ . = "
Projectile can seek for [get_shot_range()] tiles.
" . += "Fire a slow seeking blood bolt at your enemy.
" if(level_current >= THAUMATURGY_SHIELD_LEVEL) - . += "Right click the button to create a blood shield
" + . += "Click the button to create a blood shield
" if(level_current >= THAUMATURGY_DOOR_BREAK_LEVEL) . += "The projectile will open doors/lockers" if(level_current >= THAUMATURGY_BLOOD_STEAL_LEVEL) @@ -74,7 +74,7 @@ . += "If the Blood blast hits a person, it will deal [get_blood_bolt_damage()] [initial(magic_9ball.damage_type)] damage, and is blocked by [initial(magic_9ball.armor_flag)] armor." . += "You can use Blood blast [get_max_charges()] times before needing to recast Thaumaturgy. After each shot you will have to wait [DisplayTimeText(get_shot_cooldown())]." . += "At level [THAUMATURGY_SHIELD_LEVEL] it will grant you a shield that will block [BLOOD_SHIELD_BLOCK_CHANCE]% of incoming damage, costing you [THAUMATURGY_BLOOD_COST_PER_CHARGE] blood each time." - . += "To activate the shield, right click the action button." + . += "To activate the shield, simply click the action button. You can then fire projectiles by rightclicking." . += "At level [THAUMATURGY_DOOR_BREAK_LEVEL], it will also break open lockers and doors." . += "At level [THAUMATURGY_BLOOD_STEAL_LEVEL], it will also steal blood to feed yourself, just as much as each charge costs." . += "The cooldown increases by [DisplayTimeText(THAUMATURGY_COOLDOWN_PER_CHARGE)] per charge used, and each blast costs [THAUMATURGY_BLOOD_COST_PER_CHARGE] blood." diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm index 7090f041645..9bbcfaaed02 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm @@ -145,14 +145,16 @@ // CAST EFFECT // General effect (poof, splat, etc) when you cast. Doesn't happen automatically! /datum/action/cooldown/bloodsucker/veil/proc/cast_effect() - // Effect playsound(get_turf(owner), 'sound/effects/magic/smoke.ogg', 20, 1) - do_smoke(3, FALSE, get_turf(owner), smoke_type = /obj/effect/particle_effect/fluid/smoke/vampsmoke) - owner.spin(8, 1) //Spin around like a loon. + do_smoke(1, FALSE, get_turf(owner), smoke_type = /datum/effect_system/fluid_spread/smoke/vamp) + owner.spin(8, 1) + +/datum/effect_system/fluid_spread/smoke/vamp + effect_type = /obj/effect/particle_effect/fluid/smoke/vampsmoke /obj/effect/particle_effect/fluid/smoke/vampsmoke opacity = FALSE lifetime = 0 /obj/effect/particle_effect/fluid/smoke/vampsmoke/fade_out(frames = 0.8 SECONDS) - ..(frames) + . = ..()