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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

bugfix: Exotix Blood Check #3887

Merged
merged 1 commit into from
Dec 18, 2023
Merged

bugfix: Exotix Blood Check #3887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,11 @@
return FALSE
if(only_human && !ishuman(victim))
return FALSE
if(ismachineperson(victim) && !include_IPC)
if(!include_IPC && ismachineperson(victim))
return FALSE
if(victim.stat == DEAD && !include_dead)
if(!include_dead && victim.stat == DEAD)
return FALSE
if((ishuman(victim) && (NO_BLOOD in victim.dna?.species?.species_traits)) && blood_required)
if(blood_required && ishuman(victim) && ((NO_BLOOD in victim.dna?.species?.species_traits) || victim.dna?.species?.exotic_blood))
return FALSE
if(issilicon(victim) || isbot(victim) || isswarmer(victim) || isguardian(victim))
return FALSE
Expand Down Expand Up @@ -824,16 +824,17 @@ GLOBAL_LIST_INIT(vampire_dissect_organs, list(

if(t_kidneys > 0 && ishuman(victim))
var/mob/living/carbon/human/h_victim = victim
if(NO_BLOOD in h_victim.dna?.species?.species_traits)
if((NO_BLOOD in h_victim.dna?.species?.species_traits))
continue

h_victim.bleed(actual_blood_loss)
h_victim.Confused(confusion_amt)
h_victim.emote("moan")
if(h_victim.mind && h_victim.ckey)
to_chat(h_victim, span_userdanger("You sense a sharp pain inside your body and suddenly feel very weak!"))

if(h_victim.mind && h_victim.ckey && !h_victim.dna.species.exotic_blood)
blood_gained += blood_vamp_get
vampire.adjust_blood(h_victim, blood_vamp_get)
to_chat(h_victim, span_userdanger("You sense a sharp pain inside your body and suddenly feel very weak!"))

if(blood_gained)
to_chat(user, span_notice("You pinch arteries on fly and absorb <b>[blood_gained]</b> amount of blood!"))
Expand Down Expand Up @@ -1794,9 +1795,10 @@ GLOBAL_LIST_INIT(vampire_dissect_organs, list(

if(!(NO_BLOOD in user.dna?.species?.species_traits))
user.bleed(100)
vampire.bloodusable += 50 // only usable blood, will not affect abilities
human_vampire.set_nutrition(min(NUTRITION_LEVEL_WELL_FED, human_vampire.nutrition + 50))
to_chat(human_vampire, span_notice("<i>... [span_userdanger("You feel strange feel of joy and power")] ...</i>"))
if(!user.dna.species.exotic_blood)
vampire.bloodusable += 50 // only usable blood, will not affect abilities
human_vampire.set_nutrition(min(NUTRITION_LEVEL_WELL_FED, human_vampire.nutrition + 50))

return FALSE

Expand Down
5 changes: 3 additions & 2 deletions code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,13 @@
if(iscarbon(target))
var/mob/living/carbon/C = target
// no parameter in [affects_vampire()] so holy always protects
if(C.ckey && C.stat != DEAD && C.affects_vampire() && !(NO_BLOOD in C.dna.species.species_traits))
if(C.ckey && C.stat != DEAD && C.affects_vampire() && !(NO_BLOOD in C.dna?.species?.species_traits))
C.bleed(blood_drain_amount)
V.adjust_blood(C, blood_absorbed_amount)
attacker.adjustStaminaLoss(-20) // security is dead
attacker.heal_overall_damage(4, 4) // the station is full
attacker.AdjustWeakened(-1 SECONDS) // blood is fuel
if(!C.dna.species.exotic_blood)
V.adjust_blood(C, blood_absorbed_amount)

if(!V.get_ability(/datum/vampire_passive/blood_spill))
durability--
Expand Down