Merge pull request #5707 from Citadel-Station-13/upstream-merge-35840

[MIRROR] Removes liver unfailure and makes alcohol do the killing thing sometimes
This commit is contained in:
deathride58
2018-02-25 21:42:21 +00:00
committed by GitHub
3 changed files with 8 additions and 9 deletions
@@ -39,7 +39,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
if(H.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
H.drunkenness = max((H.drunkenness + (sqrt(volume) * boozepwr * ALCOHOL_RATE)), 0) //Volume, power, and server alcohol rate effect how quickly one gets drunk
var/obj/item/organ/liver/L = H.getorganslot(ORGAN_SLOT_LIVER)
H.applyLiverDamage((max(sqrt(volume) * boozepwr * L.alcohol_tolerance, 0))/10)
H.applyLiverDamage((max(sqrt(volume) * boozepwr * L.alcohol_tolerance, 0))/4)
return ..() || .
/datum/reagent/consumable/ethanol/reaction_obj(obj/O, reac_volume)