From 1392b4ddb33237f56e72a4f792f2b8f2122f6334 Mon Sep 17 00:00:00 2001 From: tralezab Date: Sun, 9 Dec 2018 12:13:34 -0800 Subject: [PATCH] defines and soultapping doesn't damage you if you have missing health --- code/modules/spells/spell_types/soultap.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/spells/spell_types/soultap.dm b/code/modules/spells/spell_types/soultap.dm index 4405e1d0e94..e9cc7acdd21 100644 --- a/code/modules/spells/spell_types/soultap.dm +++ b/code/modules/spells/spell_types/soultap.dm @@ -1,7 +1,8 @@ +#define HEALTH_LOST_PER_SOUL_TAP 20 //SOUL TAP!// //Trades 20 max health for a refresh on all of your spells. I was considering making it depend on the cooldowns of your spells, but I want to support "Big spell wizard" with this loadout. -//the two spells that sound most problematic with this is mindswap and lichdom, but soul tap requires clothes for mindswap and lichdom takes your soul, so you wouldn't be able to tap at all. +//the two spells that sound most problematic with this is mindswap and lichdom, but soul tap requires clothes for mindswap and lichdom takes your soul. /obj/effect/proc_holder/spell/self/tap name = "Soul Tap" @@ -21,12 +22,12 @@ to_chat(user, "You do not possess a soul to tap into!") return to_chat(user, "Your body feels drained and there is a burning pain in your chest.") - user.maxHealth -= 20 - user.health = min(user.health - 20, user.maxHealth) + user.maxHealth -= HEALTH_LOST_PER_SOUL_TAP + user.health = min(user.health, user.maxHealth) if(user.maxHealth <= 0) to_chat(user, "Your weakened soul is completely consumed by the tap!") user.mind.hasSoul = FALSE for(var/obj/effect/proc_holder/spell/spell in user.mind.spell_list) spell.charge_counter = spell.charge_max spell.recharging = FALSE - spell.update_icon() + spell.update_icon() \ No newline at end of file