diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index b8ddbb7d003..58bc2c26f63 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -913,16 +913,22 @@ to_chat(T, SPAN_NOTICE("
You are currently being turned into a vampire. You will die in the course of this, but you will be revived by the end. Please do not ghost out of your body until the process is complete.")) + var/drained_all_blood = FALSE while(do_mob(src, T, 50)) if(!mind.vampire) to_chat(src, SPAN_WARNING("Your fangs have disappeared!")) return if(!T.vessel.get_reagent_amount(/datum/reagent/blood)) to_chat(src, SPAN_NOTICE("[T] is now drained of blood. You begin forcing your own blood into their body, spreading the corruption of the Veil to their body.")) + drained_all_blood = TRUE break T.vessel.remove_reagent(/datum/reagent/blood, 50) + if(!drained_all_blood) + vampire.status &= ~VAMP_DRAINING + return + T.revive() // You ain't goin' anywhere, bud. diff --git a/html/changelogs/geeves-vampire_embrace_fix.yml b/html/changelogs/geeves-vampire_embrace_fix.yml new file mode 100644 index 00000000000..e3caf610aec --- /dev/null +++ b/html/changelogs/geeves-vampire_embrace_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Cancelling a vampire embrace by moving will no longer cause the target to instantly become a vampire." \ No newline at end of file