Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lillith's pact refunds blood when it fails #8818

Merged
merged 1 commit into from Jun 7, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions yogstation/code/game/gamemodes/vampire/vampire_powers.dm
Expand Up @@ -326,9 +326,11 @@
for(var/mob/living/carbon/target in targets)
if(is_vampire(target))
to_chat(user, "<span class='warning'>They're already a vampire!</span>")
vamp.usable_blood += blood_used // Refund cost
continue
if(HAS_TRAIT(target, TRAIT_MINDSHIELD))
to_chat(user, "<span class='warning'>[target]'s mind is too strong!</span>")
vamp.usable_blood += blood_used // Refund cost
continue
user.visible_message("<span class='warning'>[user] latches onto [target]'s neck, pure dread eminating from them.</span>", "<span class='warning'>You latch onto [target]'s neck, preparing to transfer your unholy blood to them.</span>", "<span class='warning'>A dreadful feeling overcomes you</span>")
target.reagents.add_reagent(/datum/reagent/medicine/salbutamol, 10) //incase you're choking the victim
Expand All @@ -345,6 +347,7 @@
if(!do_mob(user, target, 70))
to_chat(user, "<span class='danger'>The pact has failed! [target] has not became a vampire.</span>")
to_chat(target, "<span class='notice'>The visions stop, and you relax.</span>")
vamp.usable_blood += blood_used / 2 // Refund half the cost
return
if(!QDELETED(user) && !QDELETED(target))
to_chat(user, "<span class='notice'>. . .</span>")
Expand Down