Merge pull request #12142 from Fox-McCloud/blood-drunk

Fixes Blooddrunk Buff
This commit is contained in:
variableundefined
2019-08-29 22:30:24 -04:00
committed by GitHub
4 changed files with 24 additions and 96 deletions
@@ -209,7 +209,7 @@
if(istype(T, denied_type) || istype(src, T.denied_type))
to_chat(user, "<span class='warning'>You can't seem to attach [src] to [H]. Maybe remove a few trophies?</span>")
return FALSE
if(!user.drop_item())
if(!user.unEquip(src))
return
forceMove(H)
H.trophies += src
@@ -202,6 +202,16 @@
amount = amount * dna.species.tox_mod
. = ..()
/mob/living/carbon/human/adjustStaminaLoss(amount, updating = TRUE)
if(dna.species && amount > 0)
amount = amount * dna.species.stamina_mod
. = ..()
/mob/living/carbon/human/setStaminaLoss(amount, updating = TRUE)
if(dna.species && amount > 0)
amount = amount * dna.species.stamina_mod
. = ..()
////////////////////////////////////////////
//Returns a list of damaged organs
@@ -50,6 +50,7 @@
var/oxy_mod = 1 // Oxy damage reduction/amplification
var/clone_mod = 1 // Clone damage reduction/amplification
var/brain_mod = 1 // Brain damage damage reduction/amplification
var/stamina_mod = 1
var/stun_mod = 1 // If a species is more/less impacated by stuns/weakens/paralysis
var/blood_damage_type = OXY //What type of damage does this species take if it's low on blood?