diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 32541587e28..fd41c77e985 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -291,6 +291,9 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha src << "\blue You have accumulated [src.mind.vampire.bloodtotal] [src.mind.vampire.bloodtotal > 1 ? "units" : "unit"] of blood[src.mind.vampire.bloodusable != bloodusable ?", and have [src.mind.vampire.bloodusable] left to use" : "."]" check_vampire_upgrade(mind) H.vessel.remove_reagent("blood",25) + if(ishuman(src)) + var/mob/living/carbon/human/V = src + V.nutrition += blood src.mind.vampire.draining = null src << "\blue You stop draining [H.name] of blood." diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 0a3f2c40dd3..d9b0b2b626d 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -463,7 +463,7 @@ datum reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) // Vampires have their powers weakened by holy water applied to the skin. if(ishuman(M)) - if((M.mind in ticker.mode.vampires)) + if((M.mind in ticker.mode.vampires) && !(VAMP_FULL in M.mind.vampire.powers)) var/mob/living/carbon/human/H=M if(method == TOUCH) if(H.wear_mask) @@ -1474,7 +1474,8 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(prob(50)) M.heal_organ_damage(1,0) - M.nutrition += nutriment_factor // For hunger and fatness + if(!(M.mind in ticker.mode.vampires)) + M.nutrition += nutriment_factor // For hunger and fatness ..() return